Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/unacceptedProduct/components/edit.vue

@@ -142,6 +142,7 @@ export default {
   },
   methods: {
     open(row, type) {
+      console.log(row,'row')
       this.visible = true;
       this.poList = row;
       this.title = type == 1 ? '返工返修' : type == 2 ? '报废' : '试销品';
@@ -230,8 +231,8 @@ export default {
     // 输入块数计算规格体积是否超出原规格体积
     inputNumber(row) {
       if (
-        !row.productName.includes('板材') &&
-        !row.productName.includes('砌块')
+        !row.productNameNew.includes('板材') &&
+        !row.productNameNew.includes('砌块')
       ) {
         return;
       }

src/views/unacceptedProduct/detail.vue

@@ -257,6 +257,7 @@ export default {
     },
     close() {
       this.all = false;
+      this.disposeType=''
     },
     // // 处置
     disposeList(type, row) {
@@ -273,7 +274,7 @@ export default {
         return;
       }
       this.dialogVisible = false;
-      this.$refs.edit.open([this.current], this.disposeType);
+      this.$refs.edit.open(this.all?this.selection:[this.current], this.disposeType);
     },
     async save(data) {
       // console.log(data)