task4831设施环境条件控制一览表功能调整（恒生）

src/views/system/fasc/facilityEnvConfig.vue

@@ -201,6 +201,16 @@
               prop="devicename1_"
               label="被控设备名称"
             />
+            <el-table-column
+              v-if="shouldShowColumn('deviceno3_')"
+              prop="deviceno1_"
+              label="被控试剂耗材编号"
+            />
+            <el-table-column
+              v-if="shouldShowColumn('devicename3_')"
+              prop="devicename1_"
+              label="被控试剂耗材名称"
+            />
             <el-table-column prop="deviceno2_" label="监控设备" />
             <el-table-column
               prop="jian_ce_zhou_qi_"
@@ -492,6 +502,13 @@ export default {
           showDevice: false,
           displayField: [],
           requireField: []
+        },
+        '18-试剂耗材监控': {
+          label: '试剂耗材监控',
+          path: '/sshjgl/aqgl/sjhcjk',
+          showDevice: true,
+          displayField: ['deviceno3_', 'devicename3_'],
+          requireField: ['deviceno3_', 'devicename3_']
         }
       },
       subIdList: [],

src/views/system/fasc/fecDialog.vue

@@ -200,7 +200,43 @@
               </el-form-item>
             </el-col>
           </el-row>
-
+          <el-row v-if="shouldShowColumn('deviceno3_')">
+            <el-col :span="12">
+              <el-form-item label="被控试剂/耗材编号：" label-width="140">
+                <template slot="label">
+                  <span class="required">被控试剂/耗材编号：</span>
+                </template>
+                <ibps-custom-dialog
+                  v-model="form.deviceno1_"
+                  size="mini"
+                  template-key="sjhcjcsjdhkbm"
+                  :multiple="false"
+                  :disabled="false"
+                  type="dialog"
+                  class="custom-dialog"
+                  placeholder="请选择试剂/耗材"
+                  icon="el-icon-search"
+                  style="width: 80%"
+                  @change-link-data="deviceno1Change"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-show="form.deviceno1_" :span="12">
+              <el-form-item label="被控试剂/耗材名称：" label-width="140">
+                <template slot="label">
+                  <span>被控试剂/耗材名称</span>
+                  <el-tooltip
+                    effect="dark"
+                    content="选择试剂/耗材后自动带出名称"
+                    placement="top"
+                  >
+                    <i class="el-icon-question question-icon">：</i>
+                  </el-tooltip>
+                </template>
+                <div>{{ form.devicename1_ }}</div>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="监测周期：">
@@ -676,7 +712,8 @@ export default {
   methods: {
     deviceno1Change(key, data) {
       this.form.deviceid1_ = data.id_ || ''
-      this.form.devicename1_ = data.she_bei_ming_cheng_ || ''
+      this.form.devicename1_ =
+        data.she_bei_ming_cheng_ || data.ming_cheng_ || ''
     },
     deviceno2Change(key, data) {
       this.form.deviceid2_ = data.deviceId || ''
@@ -789,7 +826,7 @@ export default {
         throw new Error('监测岗位信息缺失！')
       }
       if (this.shouldRequired('deviceno1_') && this.form.deviceno1_ === '') {
-        throw new Error('请先选择设备！')
+        throw new Error('请先选择设备或试剂耗材！')
       }
       if (this.shouldRequired('fang_jian_') && this.form.fang_jian_ === '') {
         throw new Error('请先选择房间！')