From 392f9468875a8721c17c4e15c288333017cac4a1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 16 七月 2022 15:11:44 +0800
Subject: [PATCH] 1.修改bug2.工序检验实现部分3.缺陷定义实现部分

---
 src/views/zzmx/gxdy.vue |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index be4ed1b..f6aef7c 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -17,7 +17,7 @@
               <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="鍚敤鐘舵��" style=" display: flex;">
-              <el-select v-model="form.enable" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+              <el-select v-model="form.enable" filterable :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in enableArr"
                   :key="item.code"
@@ -29,6 +29,7 @@
             <el-form-item label="宸ュ簭绫诲瀷" style=" display: flex;">
               <el-select
                 v-model="form.steptypecode"
+                filterable
                 :popper-append-to-body="false"
                 style="width: 200px"
                 placeholder="璇烽�夋嫨"
@@ -54,7 +55,7 @@
       <el-divider />
       <div style="margin-left: 10px;display: flex">
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
-        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
       </div>
       <el-divider />
       <div class="elTableDiv">
@@ -122,23 +123,28 @@
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
+            width="160"
             sortable="custom"
           />
           <el-table-column
             label="鍏宠仈宸ヤ綔绔�"
+            prop="is_eqp"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <i class="el-icon-share" @click="workClick(row)" />
+                <i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
+                <i v-if="row.is_eqp==='N'" class="el-icon-share" style="color: #E4E7ED" @click="workClick(row)" />
               </div>
             </template>
           </el-table-column>
           <el-table-column
             label="鍏宠仈缂洪櫡"
+            prop="is_defect"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <i class="el-icon-share" @click="defectClick(row)" />
+                <i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
+                <i v-if="row.is_defect==='N'" class="el-icon-share" style="color: #E4E7ED;" @click="defectClick(row)" />
               </div>
             </template>
           </el-table-column>
@@ -187,6 +193,7 @@
         <el-form-item prop="steptypecode" label="宸ュ簭绫诲瀷">
           <el-select
             v-model="dialogForm.steptypecode"
+            filterable
             style="width: 200px"
             placeholder="璇烽�夋嫨"
             :popper-append-to-body="false"
@@ -202,6 +209,7 @@
         <el-form-item prop="enable" label="鍚敤鐘舵��">
           <el-select
             v-model="dialogForm.enable"
+            filterable
             style="width: 200px"
             placeholder="璇烽�夋嫨"
             :popper-append-to-body="false"
@@ -357,7 +365,7 @@
 
 const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'Zzjg',
+  name: 'GXDY',
   components: {
     Pagination
   },
@@ -405,7 +413,7 @@
         'stepcode': '',
         'stepname': '',
         'steptypecode': '',
-        'enable': '',
+        'enable': 'Y',
         'description': '',
         'OperType': ''
       },
@@ -530,7 +538,7 @@
       this.dialogForm.stepcode = ''
       this.dialogForm.stepname = ''
       this.dialogForm.steptypecode = ''
-      this.dialogForm.enable = ''
+      this.dialogForm.enable = 'Y'
       this.dialogForm.description = ''
       this.$refs.dialogForm.clearValidate()
     },
@@ -568,7 +576,7 @@
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 250
         this.tableHeight = this.mainHeight - 100
-        this.isFullscreen = window.innerHeight < 800
+        // this.isFullscreen = window.innerHeight < 800
         if (window.innerHeight < 800) {
           this.tableHeight = this.tableHeight - 50
         }
@@ -802,7 +810,7 @@
         console.log('3.绗笁绉嶆儏鍐�  鍗婂彾涓洪浂  鍏ㄥ彾涓嶄负闆�')
         console.log(obj.code, 12)
         this.workDialogForm.workGatherArr.forEach((item, index) => {
-          if (item.code === obj.code) {
+          if (item.code === checkedFatherCode) {
             this.workDialogForm.workGatherArr[index].isSelected2 = true
             this.workDialogForm.workCodeSelectedGatherArr.push(obj.code)
             this.$nextTick(() => {
@@ -859,6 +867,7 @@
       const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, data)
       if (res.code === '200') {
         this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getStepSearch()
         this.workDialogVisible = false
       }
     },
@@ -905,6 +914,7 @@
       const res = await SaveStepAssociationDefect(this.defectTreeCode, data)
       if (res.code === '200') {
         this.$message.success('淇濆瓨鎴愬姛锛�')
+        await this.getStepSearch()
         this.defectDialogVisible = false
       }
     }

--
Gitblit v1.9.3