一体机最终提交测试

src/components/my-modal-form/my-modal-material.vue

@@ -25,6 +25,7 @@
                   @event-handle="eventHandle"
                   @on-change="changePage"
                   @on-select-all="selectAll"
+                  @on-row-click="rowCk"
               ></my-table>
             </div>
           </div>
@@ -50,6 +51,7 @@
                 @event-handle="eventHandle"
                 @on-change="changePage"
                 @on-select-all="selectAll"
+                :is-show-page="false"
               ></my-table>
             </div>
           </div>
@@ -99,6 +101,7 @@ import {
 import MyTable from '@/components/my-table/my-table'
 import MyNumberBoardInput from '@/components/my-number-board-input/my-number-board-input'
 import axios from 'axios'
+import { json } from 'body-parser'
 
 export default {
   name: 'material_maintenance',
@@ -217,18 +220,25 @@ export default {
           key: 'name',
           minWidth: 200,
           render:(h,p)=>{
-            return h('div',[
-              h('span',{
-                style:{
-                  padding:'5px',
-                  background:"red",
-                  margin:"0 5px",
-                  borderRadius:"5px",
-                  color:"#fff"
-                },
-              },'限'),
+            if(p.row.icon == 'xian'){
+              return h('div',[
+                h('span',{
+                  style:{
+                    padding:'5px',
+                    background:"red",
+                    margin:"0 5px",
+                    borderRadius:"5px",
+                    color:"#fff"
+                  },
+                },'限'),
+                h('span',{},p.row.name)
+              ])
+            }else{
+              return h('div',[
               h('span',{},p.row.name)
             ])
+            }
+            
           }
         },
         {
@@ -298,6 +308,23 @@ export default {
     }
   },
   methods: {
+    rowCk(row){
+      const v = this
+      console.log(row)
+      if(row == false){
+        v.data = v.dataCopy
+      }else{
+        const msg = []
+        for (let i = 0; i < v.dataCopy.length; i++) {
+          const element = v.dataCopy[i];
+          if(element.name.indexOf(row.name) != -1){
+            msg.push(element)
+          }
+        }
+        v.data = msg
+      }
+      
+    },
     //查询限定领料
     getRestrictedPicking(){
       const v = this
@@ -321,8 +348,8 @@ export default {
         }
 
         v.restrictedPickingData = res.data.data
-        
-        console.log(res)
+        this.dataCopy = JSON.parse(JSON.stringify(this.data))
+        console.log(this.dataCopy)
       })
     },
     handlePageChange () {

src/components/my-table/my-table.vue

@@ -179,10 +179,18 @@ export default {
       
     },
     rowClick (row, index) {
-      this.selectRow = index
+      console.log(this.selectRow)
+      if(this.selectRow === index){
+        
+        this.$emit('on-row-click',false)
+      }else{
+        this.$emit('on-row-click',row)
+        this.selectRow = index
+      }
       
       if(row._disabled) return
       this.$refs.table.toggleSelect(index)
+      
     },
     /* 给检索框设置绑定一个值 */
     setModel (key, value) {

src/views/store-out-list.vue

@@ -44,10 +44,12 @@ export default {
       }
       for (let i = 0; i < newData.length; i++) {
         const element = newData[i];
-        materialList.push({
-          materialCode: element.materialCode,
-          takeQty: element.quantity
-        })
+        if(element.quantity != undefined && element.quantity != ''){
+          materialList.push({
+            materialCode: element.materialCode,
+            takeQty: element.quantity
+          })
+        }
       }
       ApplyTakeAdd({
         materialList: materialList

src/views/store-out.vue

@@ -398,17 +398,18 @@ export default {
 				if (res.code === 0) {
 					this.$Message.info('出库成功！')
 					const actual = []
-					for (let i = 0; i < scanData.rfidTagItems.length; i++) {
-						const element = scanData.rfidTagItems[i];
+					for (let i = 0; i < v.scanData.rfidTagItems.length; i++) {
+						const element = v.scanData.rfidTagItems[i];
 						actual.push({
 							materialCode:element.materialCode,
 							materialRfid:element.rfidCode,
 							quantity:element.quantity
 						})
 					}
-					axios.post('/cloudApi/stockDetail/restrictedPicking',{
+					axios.post('/cloudApi/stockDetail/submitRestrictedPicking',{
 						appointInfo:v.newData,
 						actual:actual,
+						jobNo:window.localStorage.getItem('jobNo')
 					}).then(res=>{
 						
 					})
@@ -466,6 +467,7 @@ export default {
 				})
 			} else if (type === 1) {
 				// 出库
+				console.log('pass口子')
 				PlcStorageOut({
 					inOutStorageNo: '',
 					storageDoor: sessionStorage.getItem('door'),