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

gongchunyi

9 天以前 aa802302cfe650e08806c8b87d5a8c5d3a79ffe1

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

@@ -15,7 +15,7 @@
            ref="formRef"
         >
            <el-row :gutter="30">
               <el-col :span="24">
               <el-col :span="12">
                  <el-form-item label="出厂编号：" prop="code">
                     <el-input
                        v-model="form.code"
@@ -24,12 +24,21 @@
                     />
                  </el-form-item>
               </el-col>
               <el-col :span="12">
                  <el-form-item label="计量器具名称：" prop="name">
                     <el-input
                        v-model="form.name"
                        placeholder="请输入计量器具名称"
                        clearable
                     />
                  </el-form-item>
               </el-col>
            </el-row>
            <el-row :gutter="30">
               <el-col :span="12">
                  <el-form-item label="安装位置：" prop="installationLocation">
                  <el-form-item label="安装位置：" prop="instationLocation">
                     <el-input
                        v-model="form.installationLocation"
                        v-model="form.instationLocation"
                        placeholder="请输入"
                        clearable
                     />
@@ -70,17 +79,20 @@
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
          <!-- <el-col :span="12">
            <el-form-item label="有效日期(天)：" prop="valid">
              <el-input
                  v-model="form.valid"
                  type="number"
                  placeholder="请输入有效期天数"
                  clearable
                  :min="1"
                  @input="handleValidInput"
              >
              <template #append>日</template>
              </el-input>
            </el-form-item>
          </el-col>
          </el-col> -->
          <el-col :span="12">
            <el-form-item label="检定周期：" prop="cycle">
              <el-input
@@ -171,7 +183,8 @@
const data = reactive({
   form: {
      code: "",
    installationLocation: "",
    name: "",
    instationLocation: "",
    mostDate:"",
      model: "",
    cycle:"",
@@ -179,19 +192,46 @@
      nextDate: "",
      userId: "",
      recordDate: "",
    unit:"",
    tempFileIds: []
   },
   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"}],
    instationLocation: [{required: true, message: "请输入", trigger: "blur"}],
    mostDate: [{required: true, message: "请选择", trigger: "change"}],
    cycle: [{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'
    //   }
    // ],
    unit: [{required: true, message: "请输入", trigger: "blur"}],
   }
})
@@ -253,6 +293,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) {