zhuzhuanzhuan
2023-07-18 0ff08c1904b5ccce1ea7f6f040e1a45234c97a9a
合格率管理新增的时候加工数量和不合格数量的校验
已修改2个文件
64 ■■■■■ 文件已修改
src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
@@ -12,18 +12,19 @@
          </a-col>
          <a-col :span="12">
            <a-form-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备名称"
                       v-decorator="['equipmentName',validatorRules.equipmentName]"/>
            <a-form-item label="加工数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :disabled="disableSubmit" placeholder="请输入加工数量" :min="0" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="加工数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :disabled="disableSubmit" placeholder="请输入加工数量" :min="0" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
            <a-form-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备名称"
                       v-decorator="['equipmentName',validatorRules.equipmentName]"/>
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item label="不合格数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :disabled="disableSubmit" placeholder="请输入不合格数量" :min="0" v-decorator="['unqualifiedQuantity', validatorRules.unqualifiedQuantity]"></a-input-number>
src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
@@ -10,9 +10,10 @@
                              @search="deviceSearch" enter-button/>
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item label="不合格数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :min="0" placeholder="请输入不合格数量"  v-decorator="['unqualifiedQuantity', validatorRules.unqualifiedQuantity,]"></a-input-number>
            <a-form-item label="加工数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :min="0" placeholder="请输入加工数量"  v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
            </a-form-item>
          </a-col>
        </a-row>
@@ -24,12 +25,10 @@
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item label="加工数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :min="0" placeholder="请输入加工数量"  v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
            <a-form-item label="不合格数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :min="0" placeholder="请输入不合格数量"  v-decorator="['unqualifiedQuantity', validatorRules.unqualifiedQuantity,]"></a-input-number>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
@@ -225,23 +224,12 @@
          if (!err) {
            that.confirmLoading = true
            let formData = Object.assign(this.model, values)
            // let start = moment(formData.startTime).format('YYYY-MM-DD HH:mm:ss');
            // let end = moment(formData.endTime).format('YYYY-MM-DD HH:mm:ss');
            // let startOne = start.replace(/:/g,'');
            // let endOne = end.replace(/:/g,'');
            // var data = new Date();
            // let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
            // let dataStart = stertDate.replace(/:/g,'');
            // if(startOne < dataStart){
            //   that.$message.warning("开始时间不能小于当前时间")
            //   that.confirmLoading = false
            // }else{
            //   if(startOne>=endOne){
            //     that.$message.warning("结束时间不能小于开始时间");
            //     // console.log(this.model)
            //     // this.endTime = ''
            //     that.confirmLoading = false
            //   }else{
            let stat = formData.processQuantity
            let end = formData.unqualifiedQuantity
            if(end>stat){
              that.$message.warning("不合格数量必须小于等于加工数量");
              that.confirmLoading = false
            }else{
                let obj
                if (!this.model.id) {
                  obj = postAction(this.url.add, formData)
@@ -263,6 +251,25 @@
                  that.close()
                })
              }
            // let start = moment(formData.startTime).format('YYYY-MM-DD HH:mm:ss');
            // let end = moment(formData.endTime).format('YYYY-MM-DD HH:mm:ss');
            // let startOne = start.replace(/:/g,'');
            // let endOne = end.replace(/:/g,'');
            // var data = new Date();
            // let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
            // let dataStart = stertDate.replace(/:/g,'');
            // if(startOne < dataStart){
            //   that.$message.warning("开始时间不能小于当前时间")
            //   that.confirmLoading = false
            // }else{
            //   if(startOne>=endOne){
            //     that.$message.warning("结束时间不能小于开始时间");
            //     // console.log(this.model)
            //     // this.endTime = ''
            //     that.confirmLoading = false
            //   }else{
              }
            // }
          // }