Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-10 c46213fa824995bb2155c11ea332824d23232d9c

 src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue

@@ -17,7 +17,8 @@
            >
              <a-input
                v-model="model.code"
                placeholder="请输入周期编码"
                placeholder="自动生成"
                :disabled="true"
              ></a-input>
            </a-form-model-item>
          </a-col>
@@ -89,14 +90,14 @@
          </a-col>
          <a-col :span="24/2">
            <a-form-model-item
              label="计划时间"
              label="有效时间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="effectiveTime"
            >
              <a-input-number
                v-model="model.effectiveTime"
                placeholder="请输入计划时间"
                placeholder="请输入有效时间"
                :min=0
                style="width: 100%"
              />
@@ -121,6 +122,20 @@
          </a-col>
          <a-col :span="24/2">
            <a-form-model-item
              label="版本"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="version"
            >
              <a-input
                v-model="model.version"
                placeholder="请输入版本号"
                :disabled=true
              ></a-input>
            </a-form-model-item>
          </a-col>
          <!-- <a-col :span="24/2">
            <a-form-model-item
              label="调整方式"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -133,9 +148,9 @@
                v-model="model.arrangeWay"
              />
            </a-form-model-item>
          </a-col>
          </a-col> -->
        </a-row>
        <a-row>
        <!-- <a-row>
          <a-col :span="24/2">
            <a-form-model-item
              label="逾期处理方式"
@@ -166,22 +181,53 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        </a-row> -->
        <a-row>
          <a-col :span="24/2">
            <a-form-model-item
              label="版本"
            <a-form-item
              label="ABC标识"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="version"
            >
              <a-input
                v-model="model.version"
                placeholder="请输入版本号"
                :disabled=true
              ></a-input>
            </a-form-model-item>
              <j-multi-select-tag
                v-model="model.equipmentImportanceId"
                :disabled="disableSubmit"
                dictCode="ABC-standard-result"
                placeholder="请选择ABC标识"
              >
                <!-- v-decorator="['equipmentImportanceId', validatorRules.equipmentImportanceId ]" -->
                <!-- dictCode="mes_base_deputy,name,id,status!='0' and del_flag!='1' and type!='0' order by num asc" -->
              </j-multi-select-tag>
            </a-form-item>
          </a-col>
          <a-col :span="24/2">
            <a-form-item
              label="保养类型"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="maintenanceType"
            >
              <!-- <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选保养类型'"
                :triggerChange="true"
                dictCode="maintenance_type"
                v-model="model.maintenanceType"
                
              /> -->

              <j-dict-select-tag
                placeholder="请选保养类型"
                :triggerChange="true"
                dictCode="maintenance_type"
                v-model="model.maintenanceType"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row>

          <a-col
            v-if=" model.isRevise == true"
            :span="24/2"
@@ -209,10 +255,11 @@
import { httpAction, getAction, requestPut } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import pick from 'lodash.pick'
import JMultiSelectTag from '@/components/dict/JMultiSelectTag'

export default {
  name: 'MaintenanceCycleForm',
  components: {},
  components: { JMultiSelectTag },
  props: {
    //表单禁用
    disabled: {
@@ -243,38 +290,42 @@
      },
      confirmLoading: false,
      validatorRules: {
        code: [
        /*code: [
          { required: true, message: '请输入周期编码!' },
        ],
        ],*/
        cycle: [
          { required: true, message: '请输入周期!' },
        ],
        cycleUnit: [
          { required: true, message: '请输入周期单位!' },
        ],
        maintenanceType: [
          { required: true, message: '请选择保养类型!' },
        ],

        firstMaintenanceTime: [
          { required: true, message: '请选择首次保养时间!' },
          { required: false, message: '请选择首次保养时间!' },
        ],
        leadTime: [
          { required: true, message: '请输入提前时间!' },
          { required: false, message: '请输入提前时间!' },
        ],
        effectiveTime: [
          { required: true, message: '请输入有效时间!' },
          { required: false, message: '请输入有效时间!' },
        ],
        unit: [
          { required: true, message: '请选择时间单位!' },
          { required: false, message: '请选择时间单位!' },
        ],
        arrangeWay: [
          { required: true, message: '请选择调整方式!' },
          { required: false, message: '请选择调整方式!' },
        ],
        version: [
          { required: true, message: '请输入版本号!' },
          { required: false, message: '请输入版本号!' },
        ],
        overdueDisposeMode: [
          { required: true, message: '请选择逾期处理方式!' },
          { required: false, message: '请选择逾期处理方式!' },
        ],
        accordingCalendar: [
          { required: true, message: '请选择依据日历!' },
          { required: false, message: '请选择依据日历!' },
        ],
      },
      url: {