Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inven...

gongchunyi

2026-05-12 aa802302cfe650e08806c8b87d5a8c5d3a79ffe1

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

@@ -37,7 +37,7 @@
               </el-col>
            </el-row>
            <el-row :gutter="30">
               <el-col :span="12">
               <el-col :span="24">
                  <el-form-item label="检定日期：" prop="recordDate">
                     <el-date-picker
                        style="width: 100%"
@@ -50,17 +50,20 @@
                     />
                  </el-form-item>
               </el-col>
               <el-col :span="12">
                  <el-form-item label="有效期：" prop="valid">
               <!-- <el-col :span="12">
                  <el-form-item label="有效日期(天)：" prop="valid">
                     <el-input
                        v-model="form.valid"
                        placeholder="请输入"
                        type="number"
                        placeholder="请输入有效期天数"
                        clearable
                        :min="1"
                        @input="handleValidInput"
                     >
                        <template #append>日</template>
                     </el-input>
                  </el-form-item>
               </el-col>
               </el-col> -->
            </el-row>
            <el-row :gutter="30">
               <el-col :span="12">
@@ -125,7 +128,7 @@
</template>

<script setup>
import {ref} from "vue";
import {ref, reactive, toRefs, getCurrentInstance} from "vue";
import useUserStore from "@/store/modules/user.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import {afterSalesServiceAdd, afterSalesServiceUpdate} from "@/api/customerService/index.js";
@@ -152,7 +155,32 @@
   rules: {
      code: [{required: true, message: "请输入", trigger: "blur"}],
      name: [{required: true, message: "请输入", trigger: "blur"}],
      valid: [{required: true, message: "请输入", trigger: "blur"}],
      // valid: [
      //    {required: true, message: "请输入", trigger: "blur"},
      //    {
      //       validator: (rule, value, callback) => {
      //          if (value === '' || value === null || value === undefined) {
      //             callback();
      //             return;
      //          }
      //          const numValue = Number(value);
      //          if (isNaN(numValue)) {
      //             callback(new Error('请输入有效的数字'));
      //             return;
      //          }
      //          if (numValue <= 0) {
      //             callback(new Error('只能输入正数'));
      //             return;
      //          }
      //          if (!Number.isInteger(numValue)) {
      //             callback(new Error('请输入整数'));
      //             return;
      //          }
      //          callback();
      //       },
      //       trigger: 'blur'
      //    }
      // ],
      recordDate: [{required: true, message: "请选择", trigger: "change"}],
      userId: [{required: true, message: "请选择", trigger: "change"}],
      entryDate: [{required: true, message: "请选择", trigger: "change"}],
@@ -188,6 +216,10 @@
   if(type === "add"){
    fileList.value = row.commonFiles;
  }
   if(type === "verifying"){
      form.value.valid = row.valid;
      form.value.recordDate = row.mostDate;
   }

   form.value.id = row.id;
   form.value.code = row.code;
@@ -229,6 +261,25 @@
   }
}

// 处理有效日期输入（已注释「有效日期」表单项，保留便于恢复）
// const handleValidInput = (value) => {
//    if (value === '' || value === null || value === undefined) {
//       form.value.valid = '';
//       return;
//    }
//    const numStr = String(value).replace(/[^0-9]/g, '');
//    if (numStr === '') {
//       form.value.valid = '';
//       return;
//    }
//    const numValue = parseInt(numStr, 10);
//    if (numValue > 0 && !isNaN(numValue)) {
//       form.value.valid = numValue;
//    } else {
//       form.value.valid = '';
//    }
// }

const submitForm = () => {
   proxy.$refs["formRef"].validate(valid => {
      if (valid) {