task-6032 华创-设备管理模块的供应商模块调整

src/views/component/device/deviceDialog.vue

@@ -316,7 +316,7 @@
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
-                  <el-col :span="8">
+                  <el-col :span="8" v-if="projectName != 'dev4'">
                     <el-form-item label="供应商：" prop="shiFouQiJianH">
                       <template slot="label">
                         <span :class="dynamicRequiredFields ? 'required' : ''"
@@ -337,6 +337,21 @@
                       />
                     </el-form-item>
                   </el-col>
+                  <el-col :span="8" v-else>
+                    <el-form-item label="供应商：">
+                      <template slot="label">
+                        <span :class="dynamicRequiredFields ? 'required' : ''"
+                          >供应商：</span
+                        >
+                      </template>
+                      <el-input
+                        v-if="!readonly"
+                        v-model="form.gongYingShang"
+                        size="mini"
+                      />
+                      <span v-else>{{ form.gongYingShang || '/' }}</span>
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="8">
                     <el-form-item label="供应商电话：">
                       <el-input
@@ -824,7 +839,7 @@
                           </el-col>
                         </el-row>
                         <el-row v-if="form.shiFouXiaoZhun === '是'">
-                          <el-col>
+                          <el-col v-if="projectName != 'dev4'">
                             <el-form-item
                               label="检定/校准单位："
                               label-width="140px"
@@ -842,6 +857,23 @@
                               />
                             </el-form-item>
                           </el-col>
+                    
+                          <el-col v-else>
+                            <el-form-item
+                              label="检定/校准单位："
+                              label-width="140px"
+                            >
+                              <el-input
+                                v-if="!readonly"
+                                v-model="form.shiYongKeShi"
+                                size="mini"
+                              />
+                              <span v-else
+                                >{{ form.shiYongKeShi || '/' }}
+                              </span>
+                            </el-form-item>
+                          </el-col>
+
                         </el-row>
                         <el-row v-if="form.shiFouXiaoZhun === '是'">
                           <el-col>
@@ -1445,7 +1477,8 @@ export default {
         // chuChangRiQi: [
         //   { required: true, message: '出厂日期不能为空', trigger: 'blur' }
         // ]
-      }
+      },
+      projectName: setting?.system?.projectName,
     }
   },
   computed: {

src/views/component/device/index.vue

@@ -969,7 +969,8 @@ export default {
       },
       tagName: '',
       tagData: {},
-      config: setting?.postJob?.allocation || false
+      config: setting?.postJob?.allocation || false,
+      projectName: setting?.system?.projectName,
     }
   },
   async mounted() {
@@ -1503,7 +1504,10 @@ export default {
           item.weiHuFangShi,
           deviceGroupData
         )
-        item.shiYongKeShi = this.switchGYSIdToName(item.shiYongKeShi, gysData)
+        if(this.projectName != 'dev4'){
+          item.shiYongKeShi = this.switchGYSIdToName(item.shiYongKeShi, gysData)
+        }
+         
         if (this.stateList[item.sheBeiZhuangTa]) {
           item.sheBeiZhuangTa = this.stateList[item.sheBeiZhuangTa]
         }
@@ -1927,7 +1931,10 @@ export default {
       if (list.length < 1) {
         return
       }
-      this.handleSupplierInfo(list, supplierList)
+      if(this.projectName != 'dev4'){
+        this.handleSupplierInfo(list, supplierList)
+      }
+      
       this.handlePositionInfo(list, positionList)
       this.handlePersonInfo(list, employeeList)
       this.handleDeviceGroupInfo(list, deviceGroupList)