bug修改

src/api/manufacture/spreadWorkOrder.js

@@ -39,6 +39,18 @@ export const getPutMeshWorkOrderByGwPage = (params) => {
     },
   })
 }
+//组网排程表
+export const ListPageBG = (params) => {
+  return request({
+    url: '/aps/team_networking_task/ListPageBG',
+    method: 'post',
+    data: params,
+    params: {
+      pageNum: params.current,
+      pageSize: params.size,
+    },
+  })
+}
 //小车编组
 export const ListEnter = (params) => {
   return request({

src/views/oneClickWorkReporting/index.vue

@@ -684,9 +684,7 @@
                 </div>
                 <div v-else>{{ scope.row.cutRepairReason }}</div>
               </div>
-              <!-- <el-input
-                class="table-input"
-                v-model.number="scope.row.cutRepairReason"></el-input> -->
+             
             </template>
           </el-table-column>
         </el-table-column>
@@ -963,7 +961,7 @@
       <span slot="footer" class="dialog-footer">
         <el-button @click="editVisible = false">关闭</el-button>
         <el-button
-          v-if="isEaLingKiln != 1"
+          v-if="isEaLingKiln != 1&&seat=='当前窑'"
           type="primary"
           @click="ealingKilnFun"
           >封窑</el-button
@@ -2108,11 +2106,6 @@ export default {
       // debugger
       for (let i = 0; i < this.addModelsList.length; i++) {
         modulusSums += Number(this.addModelsList[i].addModulus);
-        // if (modulusSums > 3 && this.addModelsList[0].addModulus == 3) {
-        //   // this.addModelsList[1].addModulus = null;
-        //   // this.addModelsList[2].addModulus = null;
-        //   return this.$alert('小车编组总模数不能大于3！');
-        // }
         if (modulusSums > 3) {
           item.addModulus = null;
           return this.$alert('小车编组总模数不能大于3！');
@@ -2487,16 +2480,16 @@ export default {
       // 判断如果输入了数量就校验原因是否选择
       for (let i = 0; i < this.qualityTestingData.length; i++) {
         let item = this.qualityTestingData[i];
-        // console.log(item)
-        // if (Number(item.correctNumber) > 0 && !item.correctReason) {
-        //   return this.$message.warning('请选择降品/修正原因');
-        // }
-        // if (Number(item.cutRepairNumber) > 0 && !item.cutRepairReason) {
-        //   return this.$message.warning('请选择待切补原因');
-        // }
-        // if (Number(item.scrapNumber) > 0 && !item.scrapReason) {
-        //   return this.$message.warning('请选择报废原因');
-        // }
+        console.log(item)
+        if (Number(item.correctNumber) > 0 && !item.correctReason) {
+          return this.$message.warning('请选择降品/修正原因');
+        }
+        if (Number(item.cutRepairNumber) > 0 && !item.cutRepairReason) {
+          return this.$message.warning('请选择待切补原因');
+        }
+        if (Number(item.scrapNumber) > 0 && !item.scrapReason) {
+          return this.$message.warning('请选择报废原因');
+        }
       }
 
       var list = [];

src/views/spreadNetWork/index.vue

@@ -506,7 +506,7 @@ import {
   saddleMarginDie,
   workFallback,
   getOnekeyWorkReportByPage,
-  getPutMeshWorkOrderByGwPage
+  getPutMeshWorkOrderByGwPage,ListPageBG
 } from '@/api/manufacture/spreadWorkOrder';
 import { mapState } from 'vuex';
 import basicContainer from '@/components/basic-container/main';
@@ -676,7 +676,7 @@ export default {
     async getProductSchedule() {
       this.pageLoading = true;
       this.heightFilterArr2 = [];
-      const res = await getPutMeshWorkOrderByPage({
+      const res = await ListPageBG({
         listStatus: [3]
         // materialName: '板材',
         // pageSize: 1000,

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 ? '报废' : '试销品';

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)