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

gaoluyang

5 小时以前 9289a4fbacafcc7a80385fc3a3167f383d5cf991

 src/views/equipmentManagement/measurementEquipment/components/formDia.vue

@@ -15,19 +15,10 @@
            ref="formRef"
         >
            <el-row :gutter="30">
               <el-col :span="12">
                  <el-form-item label="计量器具编号：" prop="code">
               <el-col :span="24">
                  <el-form-item label="出厂编号：" prop="code">
                     <el-input
                        v-model="form.code"
                        placeholder="请输入"
                        clearable
                     />
                  </el-form-item>
               </el-col>
               <el-col :span="12">
                  <el-form-item label="计量器具名称：" prop="name">
                     <el-input
                        v-model="form.name"
                        placeholder="请输入"
                        clearable
                     />
@@ -36,28 +27,70 @@
            </el-row>
            <el-row :gutter="30">
               <el-col :span="12">
                  <el-form-item label="规格型号：" prop="model">
                  <el-form-item label="安装位置：" prop="installationLocation">
                     <el-input
                        v-model="form.model"
                        v-model="form.installationLocation"
                        placeholder="请输入"
                        clearable
                     />
                  </el-form-item>
               </el-col>
               <el-col :span="12">
                  <el-form-item label="预计下次检定日期：" prop="nextDate">
                     <el-date-picker
                        style="width: 100%"
                        v-model="form.nextDate"
                        value-format="YYYY-MM-DD"
                        format="YYYY-MM-DD"
                        type="date"
                        placeholder="请选择"
                        clearable
                     />
                  <el-form-item label="检定单位：" prop="unit">
              <el-input
                  v-model="form.unit"
                  placeholder="请输入检定单位"
                  clearable
              />
                  </el-form-item>
               </el-col>
            </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="证书编号：" prop="model">
              <el-input
                  v-model="form.model"
                  placeholder="请输入"
                  clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="最新鉴定日期：" prop="mostDate">
              <el-date-picker
                  style="width: 100%"
                  v-model="form.mostDate"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  type="date"
                  placeholder="请选择"
                  clearable
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="有效日期(天)：" prop="valid">
              <el-input
                  v-model="form.valid"
                  placeholder="请输入有效期天数"
                  clearable
              >
              <template #append>日</template>
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检定周期：" prop="cycle">
              <el-input
                  v-model="form.cycle"
                  placeholder="请输入检定周期"
                  clearable
              />
            </el-form-item>
          </el-col>
        </el-row>
            <el-row :gutter="30">
               <el-col :span="12">
                  <el-form-item label="录入人：" prop="userId">
@@ -84,6 +117,7 @@
                        style="width: 100%"
                        v-model="form.recordDate"
                        value-format="YYYY-MM-DD"
                disabled
                        format="YYYY-MM-DD"
                        type="date"
                        placeholder="请选择"
@@ -126,7 +160,7 @@
import {userListNoPageByTenantId} from "@/api/system/user.js";
import {afterSalesServiceAdd, afterSalesServiceUpdate} from "@/api/customerService/index.js";
import {getToken} from "@/utils/auth.js";
import {measuringInstrumentAdd, measuringInstrumentUpdate} from "@/api/equipmentManagement/measurementEquipment.js";
import {addMeasuringInstrumentLedger, updateMeasuringInstrumentLedger} from "@/api/equipmentManagement/measurementEquipment.js";
import { getCurrentDate } from "@/utils/index.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -137,8 +171,10 @@
const data = reactive({
   form: {
      code: "",
      name: "",
    installationLocation: "",
    mostDate:"",
      model: "",
    cycle:"",
      validDate: "",
      nextDate: "",
      userId: "",
@@ -147,12 +183,16 @@
   },
   rules: {
      code: [{required: true, message: "请输入", trigger: "blur"}],
      name: [{required: true, message: "请输入", trigger: "blur"}],
      model: [{required: true, message: "请输入", trigger: "blur"}],
      validDate: [{required: true, message: "请输入", trigger: "blur"}],
      nextDate: [{required: true, message: "请选择", trigger: "change"}],
      userId: [{required: true, message: "请选择", trigger: "change"}],
      recordDate: [{required: true, message: "请选择", trigger: "change"}],
    installationLocation: [{required: true, message: "请输入", trigger: "blur"}],
    mostDate: [{required: true, message: "请选择", trigger: "change"}],
    cycle: [{required: true, message: "请选择", trigger: "blur"}],
    valid: [{required: true, message: "请输入", trigger: "blur"}],
    unit: [{required: true, message: "请输入", trigger: "blur"}],
   }
})
const { form, rules } = toRefs(data);
@@ -217,13 +257,13 @@
   proxy.$refs["formRef"].validate(valid => {
      if (valid) {
         if (operationType.value === "add") {
            measuringInstrumentAdd(form.value).then(response => {
        addMeasuringInstrumentLedger(form.value).then(response => {
               proxy.$modal.msgSuccess("新增成功")
          form.value.tempFileIds = []
               closeDia()
            })
         } else {
            measuringInstrumentUpdate(form.value).then(response => {
        updateMeasuringInstrumentLedger(form.value).then(response => {
               proxy.$modal.msgSuccess("修改成功")
          form.value.tempFileIds = []
               closeDia()