Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue

@@ -1,19 +1,19 @@
<template>
  <a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading"
           :okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备编号"
              <a-input  :readOnly="readOnly" allow-clear placeholder="请输入设备编号"
                       v-decorator="['equipmentId',validatorRules.equipmentId]"/>
            </a-form-item>

          </a-col>
          <a-col :span="12">
            <a-form-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备名称"
              <a-input  :readOnly="readOnly" allow-clear placeholder="请输入设备名称"
                       v-decorator="['equipmentName',validatorRules.equipmentName]"/>
            </a-form-item>
          </a-col>
@@ -46,21 +46,21 @@

          <a-col :span="12">
            <a-form-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-date :disabled="disableSubmit"  date-format="YYYY-MM-DD" placeholder="请选择日期"
              <j-date   date-format="YYYY-MM-DD" placeholder="请选择日期"
                      v-decorator="['efficientDate', validatorRules.efficientDate]"></j-date>
            </a-form-item>

          </a-col>
          <a-col :span="12">
            <a-form-item label='加工数量' :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :min="0" :disabled="disableSubmit"  placeholder="请输入加工数量"  v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
              <a-input-number :min="0"   placeholder="请输入加工数量"  v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
          <a-form-item label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
            <a-textarea :maxLength="20"  :disabled="disableSubmit"  v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
            <a-textarea :maxLength="20"    v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
          </a-col>
        </a-row>
@@ -152,6 +152,21 @@
              },
            ],
          },
          duration:{
            rules:[
              {required:true,message:'请选择标准加工时间'}
            ]
          },
          efficientDate:{
            rules:[
              {required:true,message:'请选择日期'}
            ]
          },
          processQuantity:{
            rules:[
              {required:true,message:'请选择加工数量'}
            ]
          },
          // mdcRepairType:{
          //   rules:[
          //     {