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

zhuo

2025-03-29 d233572a40431aa56e665553a87df80c973ca5b2

 src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue

@@ -103,6 +103,15 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12" v-if="editForm.inspectionItemType == 1">
            <el-form-item label="设备绑定：" prop="deviceId">
              <el-select v-model="editForm.deviceId" clearable placeholder="请选择" size="small" style="width: 100%" multiple>
                <el-option v-for="item in equipOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="检验值类型：" prop="inspectionValueType">
              <el-select v-model="editForm.inspectionValueType" clearable placeholder="请选择" size="small" style="width: 100%">
@@ -110,8 +119,6 @@
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="特殊标识：" prop="bsm">
              <el-select v-model="editForm.bsm" clearable placeholder="请选择" size="small" style="width: 100%">
@@ -119,6 +126,8 @@
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="原始记录模板：" prop="templateId">
              <el-select v-model="editForm.templateId" clearable placeholder="请选择" size="small" style="width: 100%">
@@ -126,20 +135,18 @@
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="检验项分类：" prop="inspectionItemClass">
              <el-input v-model="editForm.inspectionItemClass" clearable size="small"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="检验项分类EN：" prop="inspectionItemClassEn">
              <el-input v-model="editForm.inspectionItemClassEn" clearable size="small"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="试验方法：" prop="method">
              <el-select v-model="editForm.method" clearable multiple placeholder="请选择" size="small" style="width: 100%">
@@ -147,6 +154,8 @@
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="条件：" prop="radiusList">
              <el-select v-model="editForm.radiusList" allow-create default-first-option filterable multiple
@@ -157,8 +166,6 @@
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="收费标准(元/次)：" prop="rates">
              <el-input v-model="editForm.rates" clearable size="small"></el-input>
@@ -191,6 +198,7 @@
  upItemParameter
} from "@/api/structural/capability";
import {selectStandardMethods} from "@/api/structural/standardMethod";
import {search} from "@/api/business/inspectionTask";

export default {
  name: "EditForm",
@@ -227,6 +235,7 @@
        method: '', // 试验方法
        radiusList: [], // 条件
        rates: '', // 条件
        deviceId: [], // 设备
      },
      sampleList: [], // 检验对象下拉框
      laboratoryList: [], // 场所下拉框
@@ -262,7 +271,8 @@
          { required: true, message: '请选择原始记录模板', trigger: 'change' }
        ]
      },
      operationType: ''
      operationType: '',
      equipOptions: []
    }
  },
  // 方法集合
@@ -270,6 +280,7 @@
    openDia (type, row) {
      this.operationType = type
      this.editFormDia = true
      this.getEquipOptions() // 获取所有设备
      this.obtainItemParameterList() // 场所类型
      this.getStandardTemplate() // 原始记录模板下拉框
      this.getSelectStandardMethods() // 试验方法
@@ -305,8 +316,9 @@
      } else {
        this.editForm = this.HaveJson(row)
        this.editForm.sample = JSON.parse(this.editForm.sample)
        this.editForm.radiusList = JSON.parse(this.editForm.radiusList)
        this.editForm.radiusList = this.editForm.radiusList && JSON.parse(this.editForm.radiusList)
        this.editForm.method = JSON.parse(this.editForm.method)
        this.$set(this.editForm, 'deviceId', this.editForm.deviceIds && this.editForm.deviceIds.split(","))
      }
    },
    // 提交编辑
@@ -321,6 +333,11 @@
            obj.radiusList = JSON.stringify(obj.radiusList)
          } else {
            obj.radiusList = null
          }
          if (obj.deviceId?.length > 0) {
            obj.deviceIds = obj.deviceId.join(',')
          } else {
            obj.deviceIds = null
          }
          if(obj.id){
            // 修改
@@ -425,6 +442,21 @@
        this.templateIdList = data
      })
    },
    // 获取所有设备
    getEquipOptions() {
      this.equipOptions = [];
      search({ status: 0 }).then((res) => {
        if (res.code === 200 && res.data) {
          this.equipOptions = res.data.map((m) => {
            m.value = m.managementNumber;
            m.label = m.deviceName;
            return m;
          });
        }
      }).catch((error) => {
        console.error(error);
      });
    },
  },
}
</script>