Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-03-11 b1b6d5435e244018433b3b1223eee2365cf6fc85

 src/views/CNAS/resourceDemand/device/component/management.vue

@@ -170,7 +170,7 @@
                style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
                <div v-show="formData.imageName" class="picName">{{ formData.imageName }}</div>
                <el-upload :disabled="isUp" :action="action" :on-success="handleSuccessUpImg2"
                           :show-file-list="false" accept='image/jpg,image/jpeg,image/png' :headers="headers"
                           :show-file-list="false" accept='image/jpg,image/jpeg,image/png' :headers="uploadHeader"
                           :on-change="beforeUpload" :on-error="onError" ref='upload'>
                  <el-button type="text" style="height:30px;padding-top:8px">上传</el-button>
                </el-upload>
@@ -268,7 +268,7 @@
        <el-col :span="7">
          <el-form :label-position="labelPosition" :model="formData2" label-width="120px" ref="ruleForm">
            <!-- 实验室列表 -->
            <el-form-item label="所属部门:">
            <el-form-item label="所属部门:" required>
              <el-select v-model="formData2.subordinateDepartmentsId" placeholder="请选择" size="small"
                         style="width:100%">
                <el-option v-for="item in subordinateDepartmentsList" :key="item.value"
@@ -308,7 +308,7 @@
                style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;line-height:32px;display:flex;justify-content: space-around;font-size: 13px;">
                <div v-show="formData2.imageName" class="picName">{{ formData2.imageName }}</div>
                <el-upload :action="action" :on-success="handleSuccessUpImg2" :show-file-list="false"
                           accept='image/jpg,image/jpeg,image/png' :headers="headers" :on-change="beforeUpload"
                           accept='image/jpg,image/jpeg,image/png' :headers="uploadHeader" :on-change="beforeUpload"
                           :on-error="onError" ref='upload'>
                  <el-button type="text" style="height:30px;padding-top:8px">上传</el-button>
                </el-upload>
@@ -421,11 +421,9 @@
         labelPosition: 'right',
         dialogVisible: false,
         dialogVisible2: false,
         addPower: false,
         showData: false, // 数采配置页面
         tableList: [],
         addDia: true,
         addPower: true,
         //设备类型列表
         equipmentList: [],
         // 负责人列表
@@ -445,7 +443,7 @@
         queryParams: {},
         tableData: [],
         column: [
            { label: "设备名称", prop: "deviceName", dataType: 'link', linkMethod: 'selectAllByOne' },
            { label: "设备名称", prop: "deviceName", dataType: 'link', linkMethod: 'selectAllByOne', width: 120 },
            { label: "设备名称EN", prop: "enDeviceName" },
            {
               label: "规格型号",
@@ -469,10 +467,18 @@
            {
               label: "设备分类", prop: "largeCategory", dataType: "tag",
               formatData: (params) => {
                  return this.equipmentList.find(m => m.value == params).label
            if (this.equipmentList.find(m => m.value == params)) {
              return this.equipmentList.find(m => m.value == params).label
            } else {
              return null
            }
               },
               formatType: (params) => {
                  return this.equipmentList.find(m => m.value == params).type
            if (this.equipmentList.find(m => m.value == params)) {
              return this.equipmentList.find(m => m.value == params).type
            } else {
              return null
            }
               }
            },
            { label: "单价", prop: "unitPrice" },
@@ -821,6 +827,10 @@
            this.$message.error('输入校准周期（月）')
            return
         }
         if (!this.formData2.subordinateDepartmentsId) {
            this.$message.error('请选择所属部门')
            return
         }
         const formData = this.HaveJson(this.formData2)
         formData.insProductIds = formData.insProductIds ? formData.insProductIds.join() : ''
         if (formData.authorizedPerson.length === 0) {