项目优化

zhuzhuanzhuan

2023-09-19 102c7d7dc9f5af873f19c86a0d17d5d6addcbc32

 src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue

@@ -5,45 +5,30 @@
      <a-form :form="form">
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item label="设备组" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
            <a-form-item label="班次选择" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-input-search :readOnly="true" v-decorator="['calendarId', validatorRules.calendarId]"
                              @search="deviceSearch" enter-button/>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间"
                       v-decorator="['torqueDate', validatorRules.torqueDate]"></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="['torqueValue', validatorRules.torqueValue]"/>-->
            <!--</a-form-item>-->
          <!--</a-col>-->
          <a-col :span="12">
            <a-form-item label="加班开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear
                             v-decorator="['startDate',validatorRules.startDate]"/>
                             v-decorator="['startTime',validatorRules.startTime]"/>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">

          <a-col :span="12">
            <a-form-item label="加班结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"
                             v-decorator="['endDate',validatorRules.endDate]"/>
                             v-decorator="['endTime',validatorRules.endTime]"/>
            </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"  v-decorator="['notes', validatorRules.notes]" placeholder="请输入备注"  ></a-textarea>
            <a-textarea :maxLength="20"  v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
          </a-col>
        </a-row>
@@ -129,8 +114,8 @@
        },

        url: {
          add: '/mdc/MdcTorqueConfig/addMdcTorqueConfig',
          edit: '/mdc/MdcTorqueConfig/editMdcTorqueConfig'
          add: '/mdc/mdcEquipmentOvertime/add',
          edit: '/mdc/mdcEquipmentOvertime/edit'
        },

        disableSubmit: true,
@@ -161,17 +146,17 @@
        this.endTime = dateStrings[0];
      },
      getDeviceRows(val) {
        var equipmentIds;
        var calendarId;
        for(var i = 0;i<val.length;i++){
          if (i == 0) {
            equipmentIds =  val[i].equipmentId;
            calendarId =  val[i].id;
          } else {
            equipmentIds = equipmentIds + "," + val[i].equipmentId;
            calendarId = calendarId + "," + val[i].id;
          }
        }
        // console.log("========",equipmentIds);
        this.form.setFieldsValue({
          equipmentIds: equipmentIds,
          calendarId: calendarId,
        })
        //   this.form.setFieldsValue({
        // equipmentId: val.equipmentId,
@@ -227,6 +212,19 @@
        this.visible = false
        this.show = false
      },
      fun(obj) {
    if(obj){
      if (obj = obj.split("T")) {
        var tim = obj[1];
        if(tim = tim.split(".")){
          var tim0 = tim[0];
        }
        var dd = tim0
        return dd;
      }
    }

  },
      handleOk() {
        const that = this
        // 触发表单验证
@@ -234,25 +232,28 @@
          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,'');
            let start = moment(formData.startTime).format('HH:mm:ss');
            let end = moment(formData.endTime).format('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 stertDate = moment(data).format("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{
              if(startOne>=endOne){
                that.$message.warning("结束时间不能小于开始时间");
                // console.log(this.model)
                // this.endTime = ''
                that.confirmLoading = false
              }else{
                let obj

                if (!this.model.id) {
                  formData.startTime = this.fun(JSON.stringify(formData.startTime));
                  formData.endTime = this.fun(JSON.stringify(formData.endTime))
                  obj = postAction(this.url.add, formData)
                } else {
                  obj = requestPut(this.url.edit, formData, {
@@ -280,7 +281,7 @@
                  that.close()
                })
              }
            // }
            }

          // }
        })