新疆-新聚 1.销售台账中的销售合同按框架合同处理 2.设备台账需按车间/区域汇总设备，车间/位置可自行新增，且支持子父级递归 3.计量器具台账支持通...

gaoluyang

4 天以前 9646ba4b026e4dbee0c0d5ac3d52b428bfef7b29

 src/views/equipmentManagement/upkeep/Form/formDia.vue

@@ -95,6 +95,7 @@
                     <el-option label="每周" value="WEEKLY"/>
                     <el-option label="每月" value="MONTHLY"/>
                     <el-option label="季度" value="QUARTERLY"/>
                     <el-option label="年度保养" value="YEARLY"/>
                  </el-select>
               </el-form-item>
            </el-col>
@@ -143,6 +144,20 @@
                  />
               </el-form-item>
            </el-col>
            <el-col :span="12" v-if="form.frequencyType === 'YEARLY'">
               <el-form-item label="执行日期" prop="frequencyDetail">
                  <div style="display: flex; gap: 4px; width: 100%">
                     <el-select v-model="form.yearMonth" placeholder="月" clearable style="flex: 1">
                        <el-option v-for="m in 12" :key="m" :label="m + '月'" :value="m" />
                     </el-select>
                     <el-select v-model="form.yearDay" placeholder="日" clearable style="flex: 1">
                        <el-option v-for="d in 31" :key="d" :label="d + '日'" :value="d" />
                     </el-select>
                     <el-time-picker v-model="form.yearTime" placeholder="时间" format="HH:mm" value-format="HH:mm" style="flex: 1.2" />
                  </div>
               </el-form-item>
            </el-col>

         </el-row>
         <el-row>
            <el-col :span="12">
@@ -182,6 +197,9 @@
      frequencyDetail: '',
      week: '',
      time: '',
      yearMonth: undefined,
      yearDay: undefined,
      yearTime: '',
      deviceModel: undefined, // 规格型号
      registrationDate: '',
      maintenancePerson: '' // 保养人
@@ -238,6 +256,13 @@
      if (form.value.taskId) {
         setDeviceModel(form.value.taskId);
      }
      // YEARLY 频率回显：解析 月份,日期,时间
      if (form.value.frequencyType === 'YEARLY' && form.value.frequencyDetail) {
         const parts = String(form.value.frequencyDetail).split(',');
         form.value.yearMonth = Number(parts[0]);
         form.value.yearDay = Number(parts[1]);
         form.value.yearTime = parts[2] || '';
      }
   } else if (type === 'add') {
      // 新增时设置登记日期为当天
      form.value.registrationDate = getCurrentDate();
@@ -269,6 +294,9 @@
      frequencyDetail: '',
      week: '',
      time: '',
      yearMonth: undefined,
      yearDay: undefined,
      yearTime: '',
      deviceModel: undefined,
      registrationDate: '',
      maintenancePerson: ''
@@ -300,6 +328,25 @@
               frequencyDetail = payload.week + ',' + payload.time
               payload.frequencyDetail = frequencyDetail
            }

            if (payload.frequencyType === 'YEARLY') {
               const month = Number(payload.yearMonth);
               const day = Number(payload.yearDay);
               const time = payload.yearTime;
               if (!month || month < 1 || month > 12) {
                  proxy.$modal.msgError('月份必须在1-12之间');
                  return;
               }
               if (!day || day < 1 || day > 31) {
                  proxy.$modal.msgError('日期必须在1-31之间');
                  return;
               }
               if (!time || !/^\d{2}:\d{2}$/.test(time)) {
                  proxy.$modal.msgError('时间格式必须为 HH:mm');
                  return;
               }
               payload.frequencyDetail = month + ',' + day + ',' + time;
            }
            
            // 录入日期：直接使用表单里的 registrationDate 字段
            // 一些默认状态字段