设施环境配置-试剂耗材监控

src/views/system/fasc/facilityEnvConfig.vue

@@ -213,17 +213,24 @@
             />
             <el-table-column prop="deviceno2_" label="监控设备" />
             <el-table-column
+              v-if="!shouldShowColumn('deviceno3_')"
               prop="jian_ce_zhou_qi_"
               label="监测周期"
               width="80"
             />
             <el-table-column
+              v-if="!shouldShowColumn('deviceno3_')"
               prop="jian_ce_ri_qi_"
               label="监测日期"
               width="110"
             />
-            <el-table-column prop="jian_ce_gang_wei_" label="监测岗位" />
             <el-table-column
+              v-if="!shouldShowColumn('deviceno3_')"
+              prop="jian_ce_gang_wei_"
+              label="监测岗位"
+            />
+            <el-table-column
+              v-if="!shouldShowColumn('deviceno3_')"
               prop="shi_fou_qi_yong_"
               label="是否启用"
               width="80"
@@ -507,8 +514,8 @@ export default {
           label: '试剂耗材监控',
           path: '/sshjgl/aqgl/sjhcjk',
           showDevice: true,
-          displayField: ['deviceno3_', 'devicename3_'],
-          requireField: ['deviceno3_', 'devicename3_']
+          displayField: ['deviceno3_'],
+          requireField: ['deviceno3_', 'fang_jian_']
         }
       },
       subIdList: [],
@@ -993,19 +1000,26 @@ export default {
         if (item.bu_men_ === '') {
           return this.$message.warning(`子表第${i + 1}行部门信息缺失！`)
         }
-        if (item.jian_ce_ri_qi_ === '' && item.jian_ce_zhou_qi_ !== '按需') {
+        if (
+          item.jian_ce_ri_qi_ === '' &&
+          item.jian_ce_zhou_qi_ !== '按需' &&
+          !this.shouldShowColumn('deviceno3_')
+        ) {
           return this.$message.warning(`子表第${i + 1}行监测日期信息缺失！`)
         }
-        if (item.jian_ce_gang_wei_ === '') {
+        if (
+          item.jian_ce_gang_wei_ === '' &&
+          !this.shouldShowColumn('deviceno3_')
+        ) {
           return this.$message.warning(`子表第${i + 1}行监测岗位信息缺失！`)
         }
         if (this.shouldRequired('deviceno1_') && item.deviceno1_ === '') {
-          return this.$message.warning(`子表第${i + 1}行设备信息缺失！`)
+          return this.$message.warning(`子表第${i + 1}行设备缺失！`)
         }
         if (this.shouldRequired('fang_jian_') && item.fang_jian_ === '') {
           return this.$message.warning(`子表第${i + 1}行房间信息缺失！`)
         }
-        if (item.lie_biao_shu_ju_) {
+        if (item.lie_biao_shu_ju_ && !this.shouldShowColumn('deviceno3_')) {
           const lie_biao_shu_ju_ = JSON.parse(item.lie_biao_shu_ju_)
           for (let i = 0; i < lie_biao_shu_ju_.length; i++) {
             const item = lie_biao_shu_ju_[i]