加班管理页面维度由班次班制调整为日期与设备，删除班制班次有关字段

zhuzhuanzhuan

2024-01-26 a022fa78a6f1ec591187c0c3e032036c15761779

加班管理页面维度由班次班制调整为日期与设备，删除班制班次有关字段

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

@@ -166,25 +166,25 @@
          {
            title: '日期',
            align: 'center',
            dataIndex: 'effectiveDate',
            dataIndex: 'theDate',
            width:150
            // scopedSlots:{customRender:'startTime'},
            // customRender:(text,row,index) => {
            //   return moment(text).format("YYYY-MM-DD HH:mm:ss")
            // }
          },
          {
            title: '班次开始时间',
            align: 'center',
            dataIndex: 'startDate',
            width:150
          },
          {
            title: '班次结束时间',
            align: 'center',
            dataIndex: 'endDate',
            width:150
          },
          // {
          //   title: '班次开始时间',
          //   align: 'center',
          //   dataIndex: 'startDate',
          //   width:150
          // },
          // {
          //   title: '班次结束时间',
          //   align: 'center',
          //   dataIndex: 'endDate',
          //   width:150
          // },
          {
            title: '加班开始时间',
            align: 'center',
@@ -202,13 +202,13 @@
            align: 'center',
            dataIndex: 'duration',
            scopedSlots: {customRender: 'duration'},
            width:150
            width:200
          },
          {
            title: '备注',
            align: 'center',
            dataIndex: 'remark',
            width:150
            width:210
          },
          {
            title: '操作',

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

@@ -4,10 +4,22 @@
    <a-spin :spinning="confirmLoading">
      <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="['calendarId', validatorRules.calendarId]"
                              @search="deviceSearch" enter-button/>
          <!--<a-col :span="24">-->
            <!--<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-col :span="12">
            <a-form-item label="设备组" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"
                              @search="deviceSearch" enter-button placeholder="请选择设备"/>
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-date-picker :disabled="disableSubmit" :readOnly="disableSubmit"
                             v-decorator="['theDate',validatorRules.theDate]" format="YYYYMMDD" valueFormat="YYYYMMDD" style="width: 100%" placeholder="请选择加班日期"/>
            </a-form-item>
          </a-col>
        </a-row>
@@ -15,27 +27,27 @@
          <a-col :span="12">
            <a-form-item label="加班开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear
                             v-decorator="['startTime',validatorRules.startTime]"  valueFormat="HH:mm:ss"/>
                             v-decorator="['startTime',validatorRules.startTime]"  valueFormat="HH:mm:ss" style="width: 100%"/>
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item label="加班结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"
                             v-decorator="['endTime',validatorRules.endTime]" valueFormat="HH:mm:ss"/>
                             v-decorator="['endTime',validatorRules.endTime]" valueFormat="HH:mm:ss" style="width: 100%"/>
            </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="['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>
      </a-form>
    </a-spin>
    <torqueconfiguration-modal-list ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></torqueconfiguration-modal-list>

    <!--<torqueconfiguration-modal-list ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></torqueconfiguration-modal-list>-->
    <select-device-modal ref="selectDeviceModal" @selectFinished="selectOK" :title="'选择设备'"/>
  </a-modal>
</template>

@@ -52,10 +64,11 @@
  import {
    duplicateCheck
  } from '@/api/api'
  import SelectDeviceModal from '../../../../system/modules/SelectDeviceModal'

  export default {
    name: 'TorqueconfigurationModal',
    components: {TorqueconfigurationModalList},
    components: { SelectDeviceModal, TorqueconfigurationModalList},
    props: {},
    data() {
      return {
@@ -103,7 +116,7 @@
        confirmLoading: false,
        form: this.$form.createForm(this),
        validatorRules: {
          equipmentIds:{
          equipmentId:{
            rules:[
              {
                required:true,
@@ -111,11 +124,19 @@
              },
            ],
          },
          calendarId:{
          // calendarId:{
          //   rules:[
          //     {
          //       required:true,
          //       message: "请选择班次"
          //     },
          //   ],
          // },
          theDate:{
            rules:[
              {
                required:true,
                message: "请选择班次"
                message: "请选择加班日期"
              },
            ],
          },
@@ -169,32 +190,33 @@
      onChangeEnd(dates, dateStrings){
        this.endTime = dateStrings[0];
      },
      getDeviceRows(val) {
        var calendarId;
        for(var i = 0;i<val.length;i++){
          if (i == 0) {
            calendarId =  val[i].id;
          } else {
            calendarId = calendarId + "," + val[i].id;
          }
        }
        // console.log("========",equipmentIds);
        this.form.setFieldsValue({
          calendarId: calendarId,
        })
        //   this.form.setFieldsValue({
        // equipmentId: val.equipmentId,
        // equipmentName: val.equipmentName,
        // equipmentModel: val.equipmentModel,
        // equipmentIp: val.equipmentIp,
        // dataPort: val.dataPort,
        // driveType: val.driveType
        // })
      },
      // getDeviceRows(val) {
      //   var calendarId;
      //   for(var i = 0;i<val.length;i++){
      //     if (i == 0) {
      //       calendarId =  val[i].id;
      //     } else {
      //       calendarId = calendarId + "," + val[i].id;
      //     }
      //   }
      //   // console.log("========",equipmentIds);
      //   this.form.setFieldsValue({
      //     calendarId: calendarId,
      //   })
      //   //   this.form.setFieldsValue({
      //   // equipmentId: val.equipmentId,
      //   // equipmentName: val.equipmentName,
      //   // equipmentModel: val.equipmentModel,
      //   // equipmentIp: val.equipmentIp,
      //   // dataPort: val.dataPort,
      //   // driveType: val.driveType
      //   // })
      // },
      deviceSearch() {
        this.$refs.deviceRepairListModel.openPage()
        this.$refs.deviceRepairListModel.title = '选择设备'
        this.$refs.deviceRepairListModel.disableSubmit = false
        this.$refs.selectDeviceModal.visible = true
        this.$refs.selectDeviceModal.selectedRowKeys = []
        this.$refs.selectDeviceModal.selectedRows = []
        this.$refs.selectDeviceModal.checkedKeys = this.form.getFieldValue('equipmentId') ? this.form.getFieldValue('equipmentId').split(',') : []
      },
      //级联框onChange事件
      // onChange(value) {
@@ -227,7 +249,7 @@
        this.model = Object.assign({}, record)
        this.visible = true
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model, 'equipmentIds', 'equipmentName', 'mdcRepairType', 'startTime', 'endTime',
          this.form.setFieldsValue(pick(this.model, 'equipmentId', 'equipmentName', 'mdcRepairType', 'startTime', 'endTime',
          ))
        })
      },
@@ -322,6 +344,22 @@
      },
      checkboxChange(e) {
        this.checked = e.target.checked
      },

      /**
       * 选择已有设备后点击确定时触发
       * @param data 已选择的设备
       */
      selectOK(data) {
        // let params = {}
        // params.equipmentIdList = []
        // for (var a = 0; a < data.length; a++) {
        //   params.equipmentIdList.push(data[a])
        // }
        console.log('data=', data)
        this.form.setFieldsValue({
          equipmentId: data.join(',')
        })
      }
    }
  }

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

@@ -9,12 +9,11 @@
              <a-input :disabled="disableSubmit" :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-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"  @change="changeStartTime"
                             v-decorator="['startTime',validatorRules.startTime]"/>
                             v-decorator="['startTime',validatorRules.startTime]" style="width: 100%"/>
            </a-form-item>
          </a-col>
        </a-row>
@@ -29,13 +28,21 @@
          <a-col :span="12">
            <a-form-item label="加班结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" @change="changeEndTime"
                             v-decorator="['endTime',validatorRules.endTime]"/>
                             v-decorator="['endTime',validatorRules.endTime]" style="width: 100%"/>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-date-picker :disabled="disableSubmit" :readOnly="disableSubmit"
                             v-decorator="['theDate',validatorRules.theDate]" format="YYYYMMDD" valueFormat="YYYYMMDD" style="width: 100%" placeholder="请选择加班日期"/>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="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" :disabled="disableSubmit"  v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"></a-textarea>
          </a-form-item>
        </a-row>
      </a-form>
@@ -62,6 +69,7 @@

  export default {
    name: 'TorqueconfigurationModalEdit',
    components: {  },
    // components: {DeviceRepairListModel,JDate,DeviceRepairEditListModel},
    props: {},
    data() {
@@ -141,6 +149,14 @@
              },
            ],
          },
          theDate:{
            rules:[
              {
                required:true,
                message: "请选择加班日期"
              },
            ],
          }
          // mdcRepairType:{
          //   rules:[
          //     {
@@ -264,7 +280,7 @@
        // this.editStart  = (this.model.startTime).replace(/:/g,'');
        this.visible = true
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','startTime', 'endTime','remark'
          this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','startTime', 'endTime','theDate','remark'
          ))
          this.form.setFieldsValue({
            startTime: moment(this.model.startTime, 'HH:mm:ss'),