From 2d29ce8bb3dbbd8c9766f31a3e26b03992e77bc1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 17 八月 2023 15:54:02 +0800
Subject: [PATCH] 1.开报工不良数量需求修改

---
 src/views/reportManager/defectDetailList.vue   |   18 ++
 src/views/produceManager/produceStartOrder.vue |  392 ++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 314 insertions(+), 96 deletions(-)

diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index 4715ee8..8cfae53 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -533,7 +533,7 @@
       :visible.sync="dialogVisible"
       width="850px"
       class="dialogVisible"
-      :top="dialogTitle==='鑷埗鎶ュ伐'?'15vh':'15vh'"
+      :top="dialogTitle==='鑷埗鎶ュ伐'?'10vh':'15vh'"
       :close-on-click-modal="false"
       @close="handleClose"
       @closed="handleClose"
@@ -674,26 +674,101 @@
           <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
           <!--          <el-input v-model="dialogForm.noreportqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />-->
         </el-form-item>
+
         <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
-          <el-input v-model="dialogForm.noputqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+          <!--          <el-input-->
+          <!--            v-model="dialogForm.noputqty"-->
+          <!--            readonly-->
+          <!--            oninput="value=value.replace(/[^0-9.]/g,'')"-->
+          <!--            style="width: 200px;"-->
+          <!--          />-->
+
+          {{ dialogForm.noputqty }}
         </el-form-item>
-        <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">
-          <el-select
-            v-model="dialogForm.badcode"
-            style="width: 200px;"
-            placeholder="璇烽�夋嫨"
-            :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
-            multiple
-            collapse-tags
+
+        <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="澶囨敞锛�">
+          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
+        </el-form-item>
+
+        <!--        <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">-->
+        <!--          <el-select-->
+        <!--            v-model="dialogForm.badcode"-->
+        <!--            style="width: 200px;"-->
+        <!--            placeholder="璇烽�夋嫨"-->
+        <!--            :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"-->
+        <!--            multiple-->
+        <!--            collapse-tags-->
+        <!--          >-->
+        <!--            <el-option-->
+        <!--              v-for="item in badArr"-->
+        <!--              :key="item.code"-->
+        <!--              :label="item.name"-->
+        <!--              :value="item.code"-->
+        <!--            />-->
+        <!--          </el-select>-->
+        <!--        </el-form-item>-->
+
+        <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
+          <el-input
+            v-model="badInput"
+            placeholder="璇疯緭鍏ユ暟閲�"
+            class="input-with-select"
+            style="width: 300px;"
+            oninput="value=value.replace(/[^0-9]/g,'')"
           >
-            <el-option
-              v-for="item in badArr"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
+            <el-select
+              slot="prepend"
+              v-model="badSelected"
+              multiple
+              placeholder="璇烽�夋嫨"
+              clearable
+              style="width: 150px"
+              collapse-tags
+            >
+              <el-option
+                v-for="item in badArr"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <el-button
+              slot="append"
+              icon="el-icon-plus"
+              @click="plusClick"
             />
-          </el-select>
+          </el-input>
         </el-form-item>
+
+        <div
+          v-for="(item,index) in BADNAME"
+          v-if="dialogTitle==='鑷埗鎶ュ伐'"
+          :key="item+index"
+          style="margin-left: 25px;display: flex;  line-height: 24px;"
+        >
+          <div
+            style="
+                   width: 22px;height: 22px;background: #42b983;
+                   display: flex;
+                   justify-content: center;
+                   align-content: center;
+                   color: #fff;
+                   line-height: 22px;
+                   border-radius: 50%;
+                   "
+          >{{ index+1 }}</div>
+          <div style="margin: 0 20px">{{ item.name }}</div>
+          <div>{{ item.badqty }}</div>
+          <div style="margin-left: 20px">
+            <i
+              class="el-icon-delete"
+              style="color:#42b983;cursor: pointer"
+              @click="deleteClick(item,index)"
+            />
+          </div>
+
+        </div>
+
         <!--        <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐浜哄憳锛�">-->
         <!--          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />-->
         <!--        </el-form-item>-->
@@ -712,9 +787,7 @@
         <!--            />-->
         <!--          </el-select>-->
         <!--        </el-form-item>-->
-        <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="澶囨敞锛�">
-          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
-        </el-form-item>
+
         <div v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.reckway==='group'">
           <div style="display: flex;align-items:center;height: 40px;margin-bottom: 10px">
             <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" />
@@ -801,15 +874,15 @@
             </el-table-column>
           </el-table>
           <!--鍒嗛〉-->
-          <pagination
-            :total="UserTotal"
-            :page.sync="Userform.page"
-            :limit.sync="Userform.rows"
-            align="right"
-            layout="total,prev, pager, next,sizes"
-            popper-class="select_bottom"
-            @pagination="getMesOrderStepSearch"
-          />
+          <!--          <pagination-->
+          <!--            :total="UserTotal"-->
+          <!--            :page.sync="Userform.page"-->
+          <!--            :limit.sync="Userform.rows"-->
+          <!--            align="right"-->
+          <!--            layout="total,prev, pager, next,sizes"-->
+          <!--            popper-class="select_bottom"-->
+          <!--            @pagination="getMesOrderStepSearch"-->
+          <!--          />-->
         </div>
         <!--     澶栧崗鍙戞枡-->
         <el-form-item
@@ -912,38 +985,77 @@
             oninput="value=value.replace(/[^0-9.]/g,'')"
           />
         </el-form-item>
+
         <el-form-item
           v-if="dialogTitle==='澶栧崗鏀舵枡'"
           label="涓嶈壇鏁伴噺锛�"
           prop="noputqty"
         >
+          {{ dialogForm.noputqty }}
+          <!--                  <el-input-->
+          <!--                    v-model="dialogForm.noputqty"-->
+          <!--                    style="width: 200px"-->
+          <!--                    oninput="value=value.replace(/[^0-9.]/g,'')"-->
+          <!--                  />-->
+        </el-form-item>
+
+        <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="澶囨敞锛�">
+          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
+        </el-form-item>
+
+        <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="涓嶈壇鏁伴噺锛�">
           <el-input
-            v-model="dialogForm.noputqty"
-            style="width: 200px"
-            oninput="value=value.replace(/[^0-9.]/g,'')"
-          />
-        </el-form-item>
-        <el-form-item
-          v-if="dialogTitle==='澶栧崗鏀舵枡'"
-          label="涓嶈壇鍘熷洜锛�"
-        >
-          <!--          prop="badcode"-->
-          <el-select
-            v-model="dialogForm.badcode"
-            style="width: 200px;"
-            multiple
-            collapse-tags
-            :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
-            placeholder="璇烽�夋嫨"
+            v-model="badInput"
+            placeholder="璇疯緭鍏ユ暟閲�"
+            class="input-with-select"
+            style="width: 300px;"
+            oninput="value=value.replace(/[^0-9]/g,'')"
           >
-            <el-option
-              v-for="item in badArr"
-              :key="item.code"
-              :label="item.name"
-              :value="item.code"
+            <el-select
+              slot="prepend"
+              v-model="badSelected"
+              multiple
+              placeholder="璇烽�夋嫨"
+              clearable
+              style="width: 150px"
+              collapse-tags
+            >
+              <el-option
+                v-for="item in badArr"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <el-button
+              slot="append"
+              icon="el-icon-plus"
+              @click="plusClick"
             />
-          </el-select>
+          </el-input>
         </el-form-item>
+
+        <!--        <el-form-item-->
+        <!--          v-if="dialogTitle==='澶栧崗鏀舵枡'"-->
+        <!--          label="涓嶈壇鍘熷洜锛�"-->
+        <!--        >-->
+        <!--          <el-select-->
+        <!--            v-model="dialogForm.badcode"-->
+        <!--            style="width: 200px;"-->
+        <!--            multiple-->
+        <!--            collapse-tags-->
+        <!--            :disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"-->
+        <!--            placeholder="璇烽�夋嫨"-->
+        <!--          >-->
+        <!--            <el-option-->
+        <!--              v-for="item in badArr"-->
+        <!--              :key="item.code"-->
+        <!--              :label="item.name"-->
+        <!--              :value="item.code"-->
+        <!--            />-->
+        <!--          </el-select>-->
+        <!--        </el-form-item>-->
+
         <!--        <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡浜猴細">-->
         <!--          <el-select-->
         <!--            v-model="dialogForm.operation"-->
@@ -958,12 +1070,46 @@
         <!--            />-->
         <!--          </el-select>-->
         <!--        </el-form-item>-->
-        <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="澶囨敞锛�">
-          <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
-        </el-form-item>
+
       </el-form>
-      <div v-if="dialogTitle==='澶栧崗鏀舵枡'" style="display: flex;flex-direction: column">
-        <!--鏄庡ぉ鎺ョ潃鍐欏鍗忔敹鏂欙紝渚涘簲鍟嗗搴旂殑宸叉敹鏈敹璇︽儏-->
+
+      <div
+        v-if="dialogTitle==='澶栧崗鏀舵枡'&&BADNAME.length>0"
+        style="height: 30px;margin-left:30px;"
+      >
+        涓嶈壇鏁伴噺鏄庣粏锛�
+      </div>
+      <div
+        v-for="(item,index) in BADNAME"
+        v-if="dialogTitle==='澶栧崗鏀舵枡'"
+        :key="item+index"
+        style="margin-left: 30px;display: flex;  line-height: 24px;"
+      >
+        <div
+          style="
+                   width: 22px;height: 22px;background: #42b983;
+                   display: flex;
+                   justify-content: center;
+                   align-content: center;
+                   color: #fff;
+                   line-height: 22px;
+                   border-radius: 50%;
+                   "
+        >{{ index+1 }}</div>
+        <div style="margin: 0 20px">{{ item.name }}</div>
+        <div>{{ item.badqty }}</div>
+        <div style="margin-left: 20px">
+          <i
+            class="el-icon-delete"
+            style="color:#42b983;cursor: pointer"
+            @click="deleteClick(item,index)"
+          />
+        </div>
+
+      </div>
+
+      <div v-if="dialogTitle==='澶栧崗鏀舵枡'" style="margin-top: 20px;;display: flex;flex-direction: column">
+
         <div style="height: 30px;margin-left:30px;">
           鍙敹鏂欎緵搴斿晢锛�
         </div>
@@ -1006,7 +1152,8 @@
             :disabled="$store.state.app.buttonIsDisabled"
             type="primary"
             @click="dialogVisibleConfirm"
-          >鎻愪氦/鎵撳嵃</el-button>
+          >鎻� 浜�</el-button>
+          <!--          /鎵撳嵃-->
           <el-button
             v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.nextstepname!==''"
             v-waves
@@ -1014,7 +1161,7 @@
             :disabled="$store.state.app.buttonIsDisabled"
             type="primary"
             @click="dialogVisibleConfirm"
-          >鎻愪氦</el-button>
+          >鎻� 浜�</el-button>
           <el-button
             v-if="dialogTitle==='澶栧崗鍙戞枡'"
             v-waves
@@ -1022,7 +1169,7 @@
             :disabled="$store.state.app.buttonIsDisabled"
             type="primary"
             @click="dialogVisibleConfirm"
-          >鍙戞枡</el-button>
+          >鍙� 鏂�</el-button>
           <el-button
             v-if="dialogTitle==='澶栧崗鏀舵枡'&&dialogForm.nextstepname===''"
             v-waves
@@ -1030,7 +1177,8 @@
             :disabled="$store.state.app.buttonIsDisabled"
             type="primary"
             @click="dialogVisibleConfirm"
-          >鏀舵枡/鎵撳嵃</el-button>
+          >鏀� 鏂�</el-button>
+          <!--          /鎵撳嵃-->
           <el-button
             v-if="dialogTitle==='澶栧崗鏀舵枡'&&dialogForm.nextstepname!==''"
             v-waves
@@ -1038,7 +1186,7 @@
             :disabled="$store.state.app.buttonIsDisabled"
             type="primary"
             @click="dialogVisibleConfirm"
-          >鏀舵枡</el-button>
+          >鏀� 鏂�</el-button>
         </div>
       </span>
     </el-dialog>
@@ -1287,7 +1435,8 @@
             :loading="$store.state.app.buttonIsDisabled"
             :disabled="$store.state.app.buttonIsDisabled||badTableDataDialog.length===0||badTableDataDialog.find(i=>i.isVisible===1)"
             @click="badDialogVisibleConfirm"
-          >淇� 瀛�/鎵� 鍗�</el-button>
+          >淇� 瀛�</el-button>
+          <!--          /鎵� 鍗�-->
         </div>
       </span>
     </el-dialog>
@@ -1425,6 +1574,12 @@
         inbarcode: ''// 鏈亾宸ュ簭鏃� 鎵撳嵃鐨勫叆搴撶爜
 
       },
+
+      badSelected: [], // 宸查�夌殑涓嶈壇鍘熷洜鏁扮粍
+      badInput: '',
+      BAD: [],
+      BADNAME: [],
+
       ZZuserArr: [], // 鑷埗鐢ㄦ埛鎵�鏈�
       ZZtreams: [], // 鑷埗鐢熶骇鐝粍鏁扮粍
       ZZeqpArr: [], // 鑷埗璁惧鍚嶇О
@@ -1941,7 +2096,7 @@
         }
       })
 
-      console.log(this.WXouterprovide2, 2)
+      // console.log(this.WXouterprovide2, 2)
 
       this.dialogTitle = '澶栧崗鏀舵枡'
       this.dialogVisible = true
@@ -1981,7 +2136,7 @@
     // 鑾峰彇鑷埗鎶ュ伐鐢熶骇鐝粍涓嬫媺鍒楄〃
     async getMesOrderStepReportSelectUserGroup() {
       // this.dialogForm.wkshopcode
-      console.log(this.dialogForm.wkshopcode, 8)
+
       const { data: res } = await MesOrderStepReportSelectUserGroup({ wkshopcode: this.dialogForm.wkshopcode })
       this.ZZtreams = res
     },
@@ -2024,7 +2179,7 @@
     },
 
     // 寮�宸ラ�夋嫨璁惧鏀瑰彉鏃�
-    async selectTypeChange(val) {
+    selectTypeChange(val) {
       this.form.SelectType = val
       const orderstepqrcode = this.form.orderstepqrcode
       const data = {
@@ -2033,14 +2188,18 @@
         SelectType: this.form.SelectType,
         stu_torgcode: getCookie('stu_torgcode')
       }
-      const res = await MesOrderStepStart(data)
-      if (res.code === '200' && res.count === 0) {
-        await this.ZZstart(res.data)
-      }
+      MesOrderStepStart(data).then(res => {
+        if (res.code === '200' && res.count === 0) {
+          this.ZZstart(res.data)
+        }
 
-      if (res.code === '200' && res.count === 1) {
-        await this.ZZreport(res.data)
-      }
+        if (res.code === '200' && res.count === 1) {
+          this.ZZreport(res.data)
+        }
+      }).catch(e => {
+        this.form.orderstepqrcode = ''
+        this.form.SelectType = ''
+      })
     },
 
     // 鎶ュ伐鏌ヨ鐢ㄦ埛琛�
@@ -2067,11 +2226,12 @@
     calculatedValue() {
       const total = 100
       let value = 0
+
       this.userTableData.forEach(item => {
         item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
         value += item.ratio
       })
-      console.log(value, 1)
+
       this.UserTotal = this.userTableData.length
       if (value !== total) {
         // let temp = this.userTableData
@@ -2098,6 +2258,43 @@
       })
     },
 
+    plusClick() {
+      // console.log(this.badSelected, this.badInput)
+      if (this.badSelected.length < 1) {
+        return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
+      }
+      if (this.badInput.toString().trim().length < 1) {
+        return this.$message.info('璇疯緭鍏ヤ笉鑹暟閲忥紒')
+      }
+      this.BAD.push({
+        defect_code: this.badSelected.sort().join(','),
+        badqty: this.badInput
+      })
+
+      const NAME = []
+      this.badSelected.forEach(item => {
+        const name = this.badArr.find(it => it.code === item).name
+        NAME.push(name)
+      })
+
+      this.BADNAME.push({
+        name: NAME.join(','), badqty: this.badInput
+      })
+
+      // console.log(typeof this.dialogForm.noputqty)
+
+      this.dialogForm.noputqty += parseFloat(this.badInput)
+
+      this.badSelected = []
+      this.badInput = ''
+    },
+
+    deleteClick(val, index) {
+      console.log(val, 2)
+      this.dialogForm.noputqty -= parseFloat(val.badqty)
+      this.BADNAME.splice(index, 1)
+      this.BAD.splice(index, 1)
+    },
     // 鐢ㄦ埛娣诲姞
     userAdd() {
       if (this.userTableData.find(i => i.isVisible === 1)) {
@@ -2105,7 +2302,6 @@
       }
       let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
       number = number === 0 ? (10 + Math.random()) : number
-      console.log(this.userTableData, 6)
       this.userTableData.unshift({ usercode: '', username: '', isVisible: 1, number: number, ratio: 0 })
       this.calculatedValue()
     },
@@ -2171,6 +2367,11 @@
     },
     // 瀵硅瘽妗嗗叧闂簨浠�
     handleClose() {
+      this.BAD = []
+      this.BADNAME = []
+      this.badSelected = []
+      this.badInput = ''
+
       this.judgeIsScanningArr = []
       this.form.orderstepqrcode = ''
       this.WXform.orderstepqrcode = ''
@@ -2271,11 +2472,11 @@
               return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庤渚涘簲鍟嗗彲鏀舵暟閲�!')
             }
 
-            if (parseFloat(this.dialogForm.noputqty) > 0) {
-              if (this.dialogForm.badcode.length < 1) {
-                return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
-              }
-            }
+            // if (parseFloat(this.dialogForm.noputqty) > 0) {
+            //   if (this.dialogForm.badcode.length < 1) {
+            //     return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
+            //   }
+            // }
 
             this.dialogForm.inbarcode = ''
             // 褰撲负鏈亾鐨勬椂鍊�
@@ -2303,9 +2504,11 @@
               sqty: this.dialogForm.sqty, // 鏀舵枡鏁伴噺
               remarks: this.dialogForm.remarks, // 澶囨敞
               inbarcode: this.dialogForm.inbarcode, // 鐢熶骇鍏ュ簱鏉$爜
-              ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
-              badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
+              defectlist: this.BAD
+              // ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+              // badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
             }
+            // console.log(JSON.stringify(data), 2)
             this.$store.state.app.buttonIsDisabled = true
             SavaMesOrderStepIn(data).then(res => {
               if (res.code === '200') {
@@ -2365,16 +2568,17 @@
               this.userTableData.forEach(item => {
                 sum += parseFloat(item.ratio)
               })
+              console.log(sum, 4)
               if (Math.round(sum * 100) / 100 !== 100) {
                 return this.$message.info('鍒嗛厤姣斾緥鎬诲拰蹇呴』涓�100锛�')
               }
             }
 
-            if (parseFloat(this.dialogForm.noputqty) > 0) {
-              if (this.dialogForm.badcode.length < 1) {
-                return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
-              }
-            }
+            // if (parseFloat(this.dialogForm.noputqty) > 0) {
+            //   if (this.dialogForm.badcode.length < 1) {
+            //     return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
+            //   }
+            // }
 
             // console.log(this.userTableData, 1)
             // const reportuser = this.userTableData.map(item => item.usercode).join(';')// 涓昏鏀圭殑鏄繖閲岀殑鏍煎紡
@@ -2417,13 +2621,15 @@
 
               inbarcode: this.dialogForm.inbarcode, // 鐢熶骇鍏ュ簱鏉$爜
 
-              ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
-              badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
+              defectlist: this.BAD
+              // ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
+              // badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
             }
 
-            // console.log(JSON.stringify(data), 'data')
-            console.log(data, 'data')
-            this.$store.state.app.buttonIsDisabled = true
+            console.log(JSON.parse(JSON.stringify(data)), 'data')
+            console.log(JSON.stringify(data), 'data')
+
+            // this.$store.state.app.buttonIsDisabled = true
 
             SavaMesOrderStepReport(data).then(res => {
               if (res.code === '200') {
@@ -2536,8 +2742,8 @@
         if (res.code === '200' || res.code === '301') {
           this.getBadList()
           this.badDialogVisible = false
-          this.badPrint(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
-          this.dialogVisible2 = true
+          // this.badPrint(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
+          // this.dialogVisible2 = true
           this.$message.success('淇濆瓨鎴愬姛锛�')
 
           this.$store.state.app.buttonIsDisabled = false
diff --git a/src/views/reportManager/defectDetailList.vue b/src/views/reportManager/defectDetailList.vue
index cf9de0c..f4c3159 100644
--- a/src/views/reportManager/defectDetailList.vue
+++ b/src/views/reportManager/defectDetailList.vue
@@ -121,21 +121,21 @@
           <el-table-column
             prop="partcode"
             label="浜у搧缂栫爜"
-            width="160"
+            width="110"
             show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="partname"
             label="浜у搧鍚嶇О"
-            width="160"
+            width="110"
             show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="partspec"
             label="浜у搧瑙勬牸"
-            width="160"
+            width="110"
             show-tooltip-when-overflow
             sortable="custom"
           >
@@ -183,6 +183,18 @@
             sortable="custom"
           />
           <el-table-column
+            prop="defect_pendqty"
+            label="涓嶈壇寰呭鐞�"
+            width="120"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="bad_qty"
+            label="鎶ュ簾鏁伴噺"
+            width="110"
+            sortable="custom"
+          />
+          <el-table-column
             prop="defect_code"
             label="缂洪櫡浠g爜"
             width="110"

--
Gitblit v1.9.3