Merge remote-tracking branch 'origin/master'

src/views/ysjl/3000/common/index.vue

@@ -62,6 +62,7 @@
               >
                 <el-form-item label="记录编号">
                   <el-input v-model="jlbh1" style="width: 80px" disabled />
+                  <el-input v-model="jlbh4" style="width: 80px" disabled />
                   <el-input v-model="jlbh2" style="width: 80px" disabled />-
                   <el-input
                     v-model="jlbh3"
@@ -150,7 +151,14 @@
               </el-col>
             </el-row>
             <el-row
-              v-if="fromType === 1 || fromType === 5 || fromType === 3 ||fromType===8 ||fromType===10||fromType===12"
+              v-if="
+                fromType === 1 ||
+                  fromType === 5 ||
+                  fromType === 3 ||
+                  fromType === 8 ||
+                  fromType === 10 ||
+                  fromType === 12
+              "
               :gutter="20"
             >
               <el-col :span="18">
@@ -163,7 +171,17 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType === 2 || fromType === 4 ||fromType===6||fromType===8||fromType===10||fromType===12" :gutter="20">
+            <el-row
+              v-if="
+                fromType === 2 ||
+                  fromType === 4 ||
+                  fromType === 6 ||
+                  fromType === 8 ||
+                  fromType === 10 ||
+                  fromType === 12
+              "
+              :gutter="20"
+            >
               <el-col :span="18">
                 <el-form-item
                   label="施工单位名称"
@@ -177,7 +195,17 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType === 2 || fromType === 4 ||fromType===6||fromType===8||fromType===10||fromType===12" :gutter="20">
+            <el-row
+              v-if="
+                fromType === 2 ||
+                  fromType === 4 ||
+                  fromType === 6 ||
+                  fromType === 8 ||
+                  fromType === 10 ||
+                  fromType === 12
+              "
+              :gutter="20"
+            >
               <el-col :span="9">
                 <el-form-item
                   label="施工单位许可证编号"
@@ -200,7 +228,15 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType === 2 || fromType===6||fromType===8||fromType===12" :gutter="20">
+            <el-row
+              v-if="
+                fromType === 2 ||
+                  fromType === 6 ||
+                  fromType === 8 ||
+                  fromType === 12
+              "
+              :gutter="20"
+            >
               <el-col :span="18">
                 <el-form-item label="安装地点" prop="anzhuangdidian">
                   <el-input
@@ -211,7 +247,15 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType!==6&&fromType!==8&&fromType!==10&&fromType!==12" :gutter="20">
+            <el-row
+              v-if="
+                fromType !== 6 &&
+                  fromType !== 8 &&
+                  fromType !== 10 &&
+                  fromType !== 12
+              "
+              :gutter="20"
+            >
               <el-col :span="9">
                 <el-form-item label="安全管理人员" prop="anquanguanlirenyuan">
                   <el-input
@@ -254,7 +298,16 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType === 1 || fromType === 5 ||fromType===7||fromType===8||fromType===11" :gutter="20">
+            <el-row
+              v-if="
+                fromType === 1 ||
+                  fromType === 5 ||
+                  fromType === 7 ||
+                  fromType === 8 ||
+                  fromType === 11
+              "
+              :gutter="20"
+            >
               <el-col :span="18">
                 <el-form-item label="注册代码" prop="zhucedaima">
                   <el-input
@@ -276,7 +329,15 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType!==6&&fromType!==8&&fromType!==10&&fromType!==12" :gutter="20">
+            <el-row
+              v-if="
+                fromType !== 6 &&
+                  fromType !== 8 &&
+                  fromType !== 10 &&
+                  fromType !== 12
+              "
+              :gutter="20"
+            >
               <el-col :span="9">
                 <el-form-item label="单位内编号" prop="danweineibubianhao">
                   <el-input
@@ -298,7 +359,15 @@
               </el-col>
             </el-row>
             <el-row :gutter="20">
-              <el-col v-if="fromType!==6&&fromType!==8&&fromType!==10&&fromType!==12" :span="9">
+              <el-col
+                v-if="
+                  fromType !== 6 &&
+                    fromType !== 8 &&
+                    fromType !== 10 &&
+                    fromType !== 12
+                "
+                :span="9"
+              >
                 <el-form-item label="改造单位名称" prop="gaizaodanwei">
                   <el-input
                     v-model="ysjl.gaizaodanwei"
@@ -317,7 +386,15 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType === 2 || fromType===6 ||fromType==10||fromType==12" :gutter="20">
+            <el-row
+              v-if="
+                fromType === 2 ||
+                  fromType === 6 ||
+                  fromType == 10 ||
+                  fromType == 12
+              "
+              :gutter="20"
+            >
               <el-col :span="9">
                 <el-form-item label="联系人" prop="lianxiren">
                   <el-input
@@ -351,7 +428,12 @@
             <el-row :gutter="20">
               <el-col :span="9">
                 <el-form-item
-                  v-if="fromType === 5 ||fromType === 6||fromType===7||fromType===8"
+                  v-if="
+                    fromType === 5 ||
+                      fromType === 6 ||
+                      fromType === 7 ||
+                      fromType === 8
+                  "
                   label="维护保养单位电话"
                   prop="weibaodanweiDianhua"
                 >
@@ -383,7 +465,18 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="fromType !== 6&&fromType !== 5&&fromType!==7&&fromType!==8&&fromType!==10&&fromType!==11&&fromType!==12" :gutter="20">
+            <el-row
+              v-if="
+                fromType !== 6 &&
+                  fromType !== 5 &&
+                  fromType !== 7 &&
+                  fromType !== 8 &&
+                  fromType !== 10 &&
+                  fromType !== 11 &&
+                  fromType !== 12
+              "
+              :gutter="20"
+            >
               <el-col :span="18">
                 <el-form-item
                   label="现场检验条件"
@@ -402,10 +495,7 @@
             </el-row>
             <el-row v-if="fromType === 7 || fromType === 8" :gutter="20">
               <el-col :span="9">
-                <el-form-item
+                <el-form-item label="整机防爆标志" prop="zhengjifangbaobiaozhi">
-                  label="整机防爆标志"
-                  prop="zhengjifangbaobiaozhi"
-                >
                   <el-input
                     v-model="param.zhengjifangbaobiaozhi"
                     type="text"
@@ -414,10 +504,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item
+                <el-form-item label="燃爆物质" prop="ranbaowuzhi">
-                  label="燃爆物质"
-                  prop="ranbaowuzhi"
-                >
                   <el-input
                     v-model="param.ranbaowuzhi"
                     type="text"
@@ -428,27 +515,15 @@
             </el-row>
             <el-row v-if="fromType === 7 || fromType === 8" :gutter="20">
               <el-col :span="18">
-                <el-form-item
+                <el-form-item label="区域防爆等级" prop="quyufangbaodengji">
-                  label="区域防爆等级"
+                  <el-input v-model="param.quyufangbaodengji" type="text" />
-                  prop="quyufangbaodengji"
-                >
-                  <el-input
-                    v-model="param.quyufangbaodengji"
-                    type="text"
-                  />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="18">
-                <el-form-item
+                <el-form-item label="设备名称" prop="shebeimingcheng">
-                  label="设备名称"
+                  <el-input v-model="ysjl.shebeimingcheng" type="text" />
-                  prop="shebeimingcheng"
-                >
-                  <el-input
-                    v-model="ysjl.shebeimingcheng"
-                    type="text"
-                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -695,7 +770,11 @@
       <el-tab-pane label="检验项目" name="second">
         <Inspection :bgfy-data="bgfyData" :jybg-data="jybgData" />
       </el-tab-pane>
-      <el-tab-pane v-if="fromType === 5 ||fromType === 6" label="附表1" name="three">
+      <el-tab-pane
+        v-if="fromType === 5 || fromType === 6"
+        label="附表1"
+        name="three"
+      >
         <zdft-fb ref="table4" :table-data.sync="fubiao1" :state.sync="state" />
       </el-tab-pane>
       <template v-else>
@@ -714,7 +793,13 @@
           />
         </el-tab-pane>
         <el-tab-pane
-          v-if="fromType === 1 || fromType === 3||fromType===7||fromType===8 ||fromType===9"
+          v-if="
+            fromType === 1 ||
+              fromType === 3 ||
+              fromType === 7 ||
+              fromType === 8 ||
+              fromType === 9
+          "
           label="附表三"
           name="six"
         >
@@ -768,8 +853,9 @@ export default {
     return {
       ysjl: {},
       param: {},
-      jlbh2: '(' + new Date().getFullYear() + ')',
+      jlbh2: new Date().getFullYear(),
       jlbh3: '',
+      jlbh4: '',
       isRepeat: false,
       jianyanrenyuan: '',
       departmentId: this.$route.query.departmentId,
@@ -867,7 +953,7 @@ export default {
   },
   methods: {
     getDepartment() {
-      getDepartmentTreeList().then(res => {
+      getDepartmentTreeList().then((res) => {
         this.tree = res
       })
     },
@@ -883,6 +969,19 @@ export default {
         this.ysjl.cjState = 'ysjl'
         this.ysjl.xianchangjianyantiaojian = '符合'
         this.departmentId = this.ysjl.departmentId
+        if (data.ysjl.shebeileibiedaima === '3300') {
+          this.jlbh4 = '(F)'
+        } else if (data.ysjl.shebeileibiedaima === '3200') {
+          this.jlbh4 = '(Y)'
+        } else if (data.ysjl.shebeileibiedaima === '3400') {
+          if (data.ysjl.shebeipinzhongdaima === '3420') {
+            this.jlbh4 = '(X)'
+          } else if (data.ysjl.shebeipinzhongdaima === '3430') {
+            this.jlbh4 = '(Z)'
+          }
+        } else {
+          this.jlbh4 = '(C)'
+        }
         this.getJyxm(1)
         this.getSbList()
         this.jybgTemplateId = this.ysjl.jybgTemplateId
@@ -1088,13 +1187,25 @@ export default {
       }
       let arr = []
       const subArr = this.sortClass(this.jybgData)
-      subArr.map(item => {
+      subArr.map((item) => {
-        if (item.some(k => k.jianyanjieguo === '不符合' || k.jianyanjieguo === 'X')) {
+        if (
-          _this.jybgData[(item[0].jybgJyjlIndex) - 1].jianyanjielun = '不合格'
+          item.some(
-        } else if (item.every(k => k.jianyanjieguo === '符合' || k.jianyanjieguo === '√')) {
+            (k) => k.jianyanjieguo === '不符合' || k.jianyanjieguo === 'X'
-          _this.jybgData[(item[0].jybgJyjlIndex) - 1].jianyanjielun = '合格'
+          )
-        } else if (item.every(k => k.jianyanjieguo === '无此项' || k.jianyanjieguo === '/')) {
+        ) {
-          _this.jybgData[(item[0].jybgJyjlIndex) - 1].jianyanjielun = '无此项'
+          _this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '不合格'
+        } else if (
+          item.every(
+            (k) => k.jianyanjieguo === '符合' || k.jianyanjieguo === '√'
+          )
+        ) {
+          _this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '合格'
+        } else if (
+          item.every(
+            (k) => k.jianyanjieguo === '无此项' || k.jianyanjieguo === '/'
+          )
+        ) {
+          _this.jybgData[item[0].jybgJyjlIndex - 1].jianyanjielun = '无此项'
         }
       })
       arr = arr.concat(this.bgfyData, this.jybgData)
@@ -1151,7 +1262,7 @@ export default {
     },
     save(operation, type, jyxm, fubiao) {
       console.log(this.jybgData, 2222)
-      if (this.fromType !== 5 && this.fromType !== 6) this.ysjl.imagePath = this.$refs.table1.imgPath
+      if (this.fromType !== 5 && this.fromType !== 6) { this.ysjl.imagePath = this.$refs.table1.imgPath }
 
       // 判断报告编号是否重复
       if (this.isRepeat) {

src/views/ysjl/3000/dj/xfdt/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DT'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/dj/yeyin/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DT'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/dj/yy/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DT'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/dj/yyfb/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DT'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/dj/zdft/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DT'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/dj/zw/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DT'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/jj/wjf-yy/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/jj/xfdt/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/jj/yjf-yy/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" />
+    <baseInfo :from-type="type" :jlbh1="'DTJ'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/jj/yy-jj/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/jj/yyfb/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/jj/zdft/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
   </div>
 </template>
 <script>

src/views/ysjl/3000/jj/zw/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <baseInfo :from-type="type" :array-group="arrayGroup" />
+    <baseInfo :from-type="type" :array-group="arrayGroup" :jlbh1="'DTJ'" />
   </div>
 </template>
 <script>