From ee6c8516f4f357d5c57a88e77b32edcf779b8e73 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Mon, 23 Aug 2021 14:41:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202.=20=E8=AE=B0=E5=BD=95=E7=BC=96=E5=8F=B7=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E5=8F=98=E5=8C=96=203.=20=E6=A3=80=E9=AA=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97=E9=9C=80=E8=A6=81=E9=87=87=E7=94=A8=E5=85=B7?=
 =?UTF-8?q?=E4=BD=93=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E5=88=97=E5=90=8D?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=AF=E9=87=87=E7=94=A8DN=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ysjl/4000/dj/common/index.vue | 170 +++++++++++-------------
 1 file changed, 74 insertions(+), 96 deletions(-)

diff --git a/src/views/ysjl/4000/dj/common/index.vue b/src/views/ysjl/4000/dj/common/index.vue
index d466cf5..60f95e3 100644
--- a/src/views/ysjl/4000/dj/common/index.vue
+++ b/src/views/ysjl/4000/dj/common/index.vue
@@ -53,42 +53,19 @@
           <fieldset>
             <legend>基本信息</legend>
             <el-row :gutter="25">
-              <el-col
-                v-if="
-                  state === 'create' ||
-                    ysjl.jilubianhao === null ||
-                    ysjl.jilubianhao === ''
-                "
-                :span="14"
-              >
+              <el-col v-if="state === 'create' || !ysjl.jilubianhao" :span="10">
                 <el-form-item label="记录编号">
                   <el-input v-model="jlbh1" style="width: 80px" disabled />
                   <el-input v-model="jlbh2" style="width: 80px" disabled />-
-                  <el-input
-                    v-model="jlbh3"
-                    style="width: 85px"
-                    @blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3, ysjl.id)"
-                  />
+                  <el-input v-model="jlbh3" style="width: 85px" />
                 </el-form-item>
               </el-col>
               <el-col v-else :span="9">
                 <el-form-item label="记录编号" prop="jilubianhao">
-                  <el-input
-                    v-if="state !== 'create'"
-                    v-model="ysjl.jilubianhao"
-                    :disabled="edit"
-                  />
+                  <el-input v-if="state !== 'create'" v-model="ysjl.jilubianhao" :disabled="edit" />
                 </el-form-item>
               </el-col>
-              <el-col
-                v-if="isRepeat"
-                :span="2"
-                style="
-                  vertical-align: middle;
-                  padding-top: 3px;
-                  font-size: 15px;
-                "
-              >
+              <el-col v-if="isRepeat" :span="2" style="font-size: 15px;">
                 <span style="color: red">编号重复</span>
               </el-col>
             </el-row>
@@ -249,20 +226,20 @@
               <el-col :span="18">
                 <el-form-item label="取物装置" prop="quwuzhuangzhi">
                   <el-radio-group v-model="param.quwuzhuangzhi">
-                    <el-radio label="吊钩">
-                      吊钩
+                    <el-radio label="吊钩">
+                      吊钩
                     </el-radio>
-                    <el-radio label="抓斗">
-                      抓斗
+                    <el-radio label="抓斗">
+                      抓斗
                     </el-radio>
-                    <el-radio label="吸盘">
-                      吸盘
+                    <el-radio label="吸盘">
+                      吸盘
                     </el-radio>
-                    <el-radio label="集装箱吊具">
-                      集装箱吊具
+                    <el-radio label="集装箱吊具">
+                      集装箱吊具
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -272,20 +249,20 @@
               <el-col :span="18">
                 <el-form-item label="吊具形式" prop="quwuzhuangzhi">
                   <el-radio-group v-model="param.quwuzhuangzhi">
-                    <el-radio label="吊钩">
-                      吊钩
+                    <el-radio label="吊钩">
+                      吊钩
                     </el-radio>
-                    <el-radio label="抓斗">
-                      抓斗
+                    <el-radio label="抓斗">
+                      抓斗
                     </el-radio>
-                    <el-radio label="吸盘">
-                      吸盘
+                    <el-radio label="吸盘">
+                      吸盘
                     </el-radio>
-                    <el-radio label="集装箱吊具">
-                      集装箱吊具
+                    <el-radio label="集装箱吊具">
+                      集装箱吊具
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -295,11 +272,11 @@
               <el-col :span="18">
                 <el-form-item label="检验类别" prop="jianyanleibie">
                   <el-radio-group v-model="ysjl.jianyanleibie">
-                    <el-radio label="SC">
-                      首次检验
+                    <el-radio label="SC">
+                      首次检验
                     </el-radio>
-                    <el-radio label="DQ">
-                      定期检验
+                    <el-radio label="DQ">
+                      定期检验
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -310,23 +287,23 @@
               <el-col :span="18">
                 <el-form-item label="工作环境" prop="jianyanhuanjing">
                   <el-radio-group v-model="param.jianyanhuanjing">
-                    <el-radio label="露天">
-                      露天
+                    <el-radio label="露天">
+                      露天
                     </el-radio>
-                    <el-radio label="非露天">
-                      非露天
+                    <el-radio label="非露天">
+                      非露天
                     </el-radio>
-                    <el-radio label="高温">
-                      高温
+                    <el-radio label="高温">
+                      高温
                     </el-radio>
-                    <el-radio label="粉尘">
-                      粉尘
+                    <el-radio label="粉尘">
+                      粉尘
                     </el-radio>
-                    <el-radio label="有毒">
-                      有毒
+                    <el-radio label="有毒">
+                      有毒
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -340,11 +317,11 @@
                   prop="jianyanhuanjingtiaojian"
                 >
                   <el-radio-group v-model="ysjl.jianyanhuanjingtiaojian">
-                    <el-radio label="符合">
-                      符合
+                    <el-radio label="符合">
+                      符合
                     </el-radio>
-                    <el-radio label="不符合">
-                      不符合
+                    <el-radio label="不符合">
+                      不符合
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -474,20 +451,20 @@
               <el-col :span="18">
                 <el-form-item label="取物装置" prop="quwuzhuangzhi">
                   <el-radio-group v-model="param.quwuzhuangzhi">
-                    <el-radio label="吊钩">
-                      吊钩
+                    <el-radio label="吊钩">
+                      吊钩
                     </el-radio>
-                    <el-radio label="抓斗">
-                      抓斗
+                    <el-radio label="抓斗">
+                      抓斗
                     </el-radio>
-                    <el-radio label="吸盘">
-                      吸盘
+                    <el-radio label="吸盘">
+                      吸盘
                     </el-radio>
-                    <el-radio label="集装箱吊具">
-                      集装箱吊具
+                    <el-radio label="集装箱吊具">
+                      集装箱吊具
                     </el-radio>
-                    <el-radio label="其他">
-                      其他
+                    <el-radio label="其他">
+                      其他
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -732,17 +709,17 @@
               <el-col :span="18">
                 <el-form-item label="检验结论" prop="jianyanjielun">
                   <el-radio-group v-model="ysjl.jianyanjielun">
-                    <el-radio label="合格">
-                      合格
+                    <el-radio label="合格">
+                      合格
                     </el-radio>
-                    <el-radio label="不合格">
-                      不合格
+                    <el-radio label="不合格">
+                      不合格
                     </el-radio>
-                    <el-radio label="复检合格">
-                      复检合格
+                    <el-radio label="复检合格">
+                      复检合格
                     </el-radio>
-                    <el-radio label="复检不合格">
-                      复检不合格
+                    <el-radio label="复检不合格">
+                      复检不合格
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -847,7 +824,7 @@
           <el-table-column align="center" prop="D1" label="检验结果">
             <template slot-scope="scope">
               <el-select
-                v-model="scope.row.D1"
+                v-model="scope.row.jianyanjieguo"
                 :disabled="edit"
                 type="text"
                 placeholder="请选择"
@@ -887,7 +864,7 @@ export default {
   },
   data() {
     return {
-      jlbh1: 'GN',
+      jlbh1: 'QZ',
       jlbh2: '(' + new Date().getFullYear() + ')',
       jlbh3: '',
       ysjl: {
@@ -934,13 +911,13 @@ export default {
   },
   computed: {},
   watch: {
-    // jlbh3: function(val) {
-    //   this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
-    //   this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
-    // },
-    // jilubianhao: function(newValue) {
-    //   this.judgeRepeat(newValue, this.ysjl.id)
-    // }
+    jlbh3: function(val) {
+      this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
+      this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
+    },
+    jilubianhao: function(newValue) {
+      this.judgeRepeat(newValue, this.ysjl.id)
+    }
   },
   // 添加F5刷新监听事件
   mounted() {
@@ -1128,10 +1105,11 @@ export default {
       this.sybjSData.forEach((row) => {
         tableData.push({
           ysjlId: this.ysjlId,
+          id: row.id,
           beizhu: row.beizhu,
           dicJyxmId: row.dicJyxmId,
-          jianyanjieguo: row.jianyanjieguo ? row.jianyanjieguo : '',
-          jianyanjielun: row.jianyanjielun ? row.jianyanjielun : '',
+          jianyanjieguo: row.jianyanjieguo || '',
+          jianyanjielun: row.jianyanjielun || '',
           jyxmMode: 0,
           sort: row.sort,
           orders: row.orders,