Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-06 ddd818f74d59c1fdeeed29714d660d7e49200c04

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue

@@ -44,14 +44,14 @@
          </a-col>
          <a-col :span='24'>
            <a-form-item
              label='检定方式'
              label='鉴定方式'
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
            >
              <j-dict-select-tag
                allow-clear
                :disabled='disableSubmit'
                :placeholder="disableSubmit?'':'请选择检定方式'"
                :placeholder="disableSubmit?'':'请选择鉴定方式'"
                :triggerChange='true'
                dictCode='calibration_type'
                v-decorator="['calibrationType', validatorRules.calibrationType]"
@@ -240,7 +240,7 @@
        },
        calibrationType: {
          rules: [
            { required: true, message: '请选择检定方式!' }
            { required: true, message: '请选择鉴定方式!' }
          ]
        },
        managementMode: {