限制

src/components/SalesDialog/SalesDialog.vue

@@ -33,7 +33,8 @@ export default {
     dialogVisible: false,
     func: Function,
     customerNumber:String,
-    returnId:String
+    returnId:String,
+    itemId:String
   },
   data() {
     return {
@@ -165,6 +166,7 @@ export default {
       }else if(this.returnId){
         if (row.id == this.returnId && row.disabled){
           return true
+
         }else{
           return  false
         }

src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -209,15 +209,7 @@ export default {
       })
     },
     handelSigning() {
-      this.$confirm('请确定，订单产品客户已完成签收，一旦签收则不能撤销', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(res => {
 
-      }).catch(err => {
-
-      })
     },
     handleInform(status = 2) {
       sbumitFrontOrder({ id: this.$refs.header.screenForm.id, status }).then(res => {
@@ -227,11 +219,20 @@ export default {
       })
     },
     handleSignIn(status) {
-      signIn({ id: this.$refs.header.screenForm.id, status }).then(res => {
-        this.$successMsg('签收')
-        this.$parent.pageType = 0
+      this.$confirm('请确定，订单产品客户已完成签收，一旦签收则不能撤销', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(res => {
+        signIn({ id: this.$refs.header.screenForm.id, status }).then(res => {
+          this.$successMsg('签收')
+          this.$parent.pageType = 0
+
+        })
+      }).catch(err => {
 
       })
+
     }
 
   }

src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -40,7 +40,7 @@
         </el-popconfirm>
       </template>
     </sales-table>
-    <sales-dialog ref="dia" :dialogVisible="dialogVisible" :returnId="returnId" :func="getDialogList"
+    <sales-dialog ref="dia" :dialogVisible="dialogVisible" :returnId="returnId" :itemId="itemId" :func="getDialogList"
                   @confirm="confirm"
     />
   </div>
@@ -73,6 +73,7 @@ export default {
     return {
       dialogVisible: false,
       returnId: '',
+      itemId:"",
       dataList: [],
       selection: [],
       flag: 1,
@@ -144,7 +145,7 @@ export default {
 
         })
         this.details.customerOrderNo =  res.data.customerOrderNo
-        this.returnId = res.data.id
+        this.returnId = res.data.id + this.dataList[0].materialCode
       })
     } else {
       Object.assign(this.$data, this.$options.data())
@@ -168,12 +169,17 @@ export default {
       for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {
         for (let j = 0; j < this.dataList.length; j++) {
           if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.dataList[j].id || this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].disabled ===false){
-            this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',false)
+            if (this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].itemId == this.dataList[j].itemId  || this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].disabled ===false){
+              this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',false)
+            }else {
+              this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
+            }
           }else{
             this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
           }
         }
       }
+      console.log(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData)
       selected.forEach(k => {
         k.diffQty = Number(k.qty) - Number(k.refundQty)
       })
@@ -183,6 +189,7 @@ export default {
       }
       this.detailsId = this.detailsId
       this.returnId = this.dataList[0].id
+      this.itemId = this.dataList[0].itemId
       this.dialogVisible = false
       this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.$refs.tableView.clearSelection()
 
@@ -191,7 +198,13 @@ export default {
       this.dataList.splice(index, 1)
       this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.find(k=>{
         if (k.id==item.id){
-          this.$set(k,'disabled',true)
+          if (k.itemId ==item.itemId ){
+            this.$set(k,'disabled',true)
+
+          }else {
+            this.$set(k,'disabled',false)
+
+          }
           return
         }
       })
@@ -213,12 +226,16 @@ export default {
       if (this.dataList.length) {
         this.dataList = this.resArr(this.dataList, this.selection)
         for (let i = 0; i <this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length ; i++) {
-          for (let j = 0; j < this.selected.length; j++) {
-            if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.selected[j].id || this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].disabled ===true){
-              // k.disabled = true
+          for (let j = 0; j < this.dataList.length; j++) {
+            if ( this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].id == this.dataList[j].id || this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].disabled ===false){
+              if (this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].itemId == this.dataList[j].itemId  || this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i].disabled ===false){
+                this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',false)
+              }else {
+                this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
+              }
+            }else{
               this.$set(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData[i],'disabled',true)
             }
-
           }
         }
         if (!this.dataList.length) {