chagne

src/pages/proj/Check.vue

@@ -1,6 +1,6 @@
 <template>
   <section>
-    <nav-bar title="拣货"></nav-bar>
+    <nav-bar title="盘点"></nav-bar>
     <section class="content">
       <div class="filter-wraper">
         <search-box
@@ -33,19 +33,21 @@
               <th>物料名称</th>
               <th>批次</th>
               <th>库存数量</th>
+              <th>盘点数量</th>
             </tr>
             <tr v-for="(e, i) in dataList" :key="i">
               <td>{{e.MatCode}}</td>
               <td>{{e.MatName}}</td>
               <td>{{e.BatchNumber}}</td>
               <td>{{e.MatNum}}</td>
+              <td>{{e.FactNumOut}}</td>
             </tr>
           </table>
         </div>
       </div>
     </section>
     <section class="submit-bar">
-      <button class="btn submit-button" :class="{'btn-disabled' : !val1 || !val2}" :disabled="disabled" @click="_rfTrayPackage">组盘</button>
+      <button class="btn submit-button" :class="{'btn-disabled' : !val1 || !val2}" :disabled="disabled" @click="_RFStorageInventory">盘点</button>
       <button class="btn submit-button" @click="toCancle">取消</button>
     </section>
   </section>
@@ -54,9 +56,9 @@
 <script>
 import NavBar from '@components/NavBar.vue'
 import SearchBox from '@components/SearchBox.vue'
-import {rfReadTrayStatePackage, rfReadTrayStoragePackage, rfReadMatBarCodeStatePackage, rfTrayPackage} from '@config/getData2'
+import {RFReadTrayStateInventory, RFReadTrayStorageInventory, RFReadMatBarCodeStateInventory, RFStorageInventory} from '@config/getData1'
 export default {
-  name: 'GroupDisk',
+  name: 'PickGoods',
   components: {
     NavBar,
     SearchBox
@@ -71,11 +73,11 @@ export default {
   },
   methods: {
     /** 读取托盘码 */
-    async _rfReadTrayStatePackage (val) {
+    async _RFReadTrayStateInventory (val) {
       try {
-        let res = await rfReadTrayStatePackage(val)
+        let res = await RFReadTrayStateInventory(val)
         if (res.ErrNO === '1') {
-          this._rfReadTrayStoragePackage()
+          this._RFReadTrayStorageInventory()
         } else {
           this.toast(res.ErrMsg)
           this.val1 = ''
@@ -84,9 +86,9 @@ export default {
         this.val1 = ''
       }
     },
-    /** 托盘库存信息 */
+    /** 托盘待盘点信息 */
-    async _rfReadTrayStoragePackage () {
+    async _RFReadTrayStorageInventory () {
-      let res = await rfReadTrayStoragePackage(this.val1)
+      let res = await RFReadTrayStorageInventory(this.val1)
       if (res.ErrNO === '1') {
         this.dataList = [...res.StorageList]
       } else {
@@ -94,9 +96,9 @@ export default {
       }
     },
     /** 读取物料条码 */
-    async _rfReadMatBarCodeStatePackage (val) {
+    async _RFReadMatBarCodeStateInventory (val) {
       try {
-        let res = await rfReadMatBarCodeStatePackage(val)
+        let res = await RFReadMatBarCodeStateInventory(this.val1, val)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
         } else {
@@ -109,16 +111,16 @@ export default {
     },
     handleChange1 (e, type) {
       if (type) {
-        this._rfReadTrayStatePackage(e)
+        this._RFReadTrayStateInventory(e)
       }
     },
     handleChange2 (e, type) {
       if (type) {
-        this._rfReadMatBarCodeStatePackage(e)
+        this._RFReadMatBarCodeStateInventory(e)
       }
     },
-    /** 组盘 */
+    /** 盘点 */
-    async _rfTrayPackage () {
+    async _RFStorageInventory () {
       this.disabled = true
       if (!this.val1 || !this.val2) {
         this.disabled = false
@@ -126,7 +128,7 @@ export default {
       }
       try {
         let uid = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).UserPID : ''
-        let res = await rfTrayPackage(this.val1, this.val2, '', uid)
+        let res = await RFStorageInventory(this.val1, this.val2, uid)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
         } else {

src/pages/proj/PickGoods.vue

@@ -32,20 +32,22 @@
               <th>物料编码</th>
               <th>物料名称</th>
               <th>批次</th>
-              <th>库存数量</th>
+              <th>应拣货数量</th>
+              <th>已拣货数量</th>
             </tr>
             <tr v-for="(e, i) in dataList" :key="i">
               <td>{{e.MatCode}}</td>
               <td>{{e.MatName}}</td>
               <td>{{e.BatchNumber}}</td>
               <td>{{e.MatNum}}</td>
+              <td>{{e.FactNumOut}}</td>
             </tr>
           </table>
         </div>
       </div>
     </section>
     <section class="submit-bar">
-      <button class="btn submit-button" :class="{'btn-disabled' : !val1 || !val2}" :disabled="disabled" @click="_rfTrayPackage">组盘</button>
+      <button class="btn submit-button" :class="{'btn-disabled' : !val1 || !val2}" :disabled="disabled" @click="_RFStoragePick">拣货</button>
       <button class="btn submit-button" @click="toCancle">取消</button>
     </section>
   </section>
@@ -54,9 +56,9 @@
 <script>
 import NavBar from '@components/NavBar.vue'
 import SearchBox from '@components/SearchBox.vue'
-import {rfReadTrayStatePackage, rfReadTrayStoragePackage, rfReadMatBarCodeStatePackage, rfTrayPackage} from '@config/getData2'
+import {RFReadTrayStatePick, RFReadTrayStoragePick, RFReadMatBarCodeStatePick, RFStoragePick} from '@config/getData1'
 export default {
-  name: 'GroupDisk',
+  name: 'PickGoods',
   components: {
     NavBar,
     SearchBox
@@ -71,11 +73,11 @@ export default {
   },
   methods: {
     /** 读取托盘码 */
-    async _rfReadTrayStatePackage (val) {
+    async _RFReadTrayStatePick (val) {
       try {
-        let res = await rfReadTrayStatePackage(val)
+        let res = await RFReadTrayStatePick(val)
         if (res.ErrNO === '1') {
-          this._rfReadTrayStoragePackage()
+          this._RFReadTrayStoragePick()
         } else {
           this.toast(res.ErrMsg)
           this.val1 = ''
@@ -85,8 +87,8 @@ export default {
       }
     },
     /** 托盘库存信息 */
-    async _rfReadTrayStoragePackage () {
+    async _RFReadTrayStoragePick () {
-      let res = await rfReadTrayStoragePackage(this.val1)
+      let res = await RFReadTrayStoragePick(this.val1)
       if (res.ErrNO === '1') {
         this.dataList = [...res.StorageList]
       } else {
@@ -94,9 +96,9 @@ export default {
       }
     },
     /** 读取物料条码 */
-    async _rfReadMatBarCodeStatePackage (val) {
+    async _RFReadMatBarCodeStatePick (val) {
       try {
-        let res = await rfReadMatBarCodeStatePackage(val)
+        let res = await RFReadMatBarCodeStatePick(this.val1, val)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
         } else {
@@ -109,16 +111,16 @@ export default {
     },
     handleChange1 (e, type) {
       if (type) {
-        this._rfReadTrayStatePackage(e)
+        this._RFReadTrayStatePick(e)
       }
     },
     handleChange2 (e, type) {
       if (type) {
-        this._rfReadMatBarCodeStatePackage(e)
+        this._RFReadMatBarCodeStatePick(e)
       }
     },
     /** 组盘 */
-    async _rfTrayPackage () {
+    async _RFStoragePick () {
       this.disabled = true
       if (!this.val1 || !this.val2) {
         this.disabled = false
@@ -126,7 +128,7 @@ export default {
       }
       try {
         let uid = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).UserPID : ''
-        let res = await rfTrayPackage(this.val1, this.val2, '', uid)
+        let res = await RFStoragePick(this.val1, this.val2, uid)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
         } else {