1、优化首页布局 2、班次班制管理页面表格数据新增增加表单项验证 3、班次班制管理页面新增班次时如果并未选择开始与结束休息时间，应默认为空，而不是当前...

zhuzhuanzhuan

2023-11-09 1086953400ff7d23bf3b2b75c5960bca2dc184a7

1、优化首页布局
2、班次班制管理页面表格数据新增增加表单项验证
3、班次班制管理页面新增班次时如果并未选择开始与结束休息时间，应默认为空，而不是当前时间
4、班次班制管理页面新增或修改班次时如果选择跨天，则时间请求参数会混乱，应与不跨天时保持一致

 src/views/dashboard/Analysis.vue

@@ -1,6 +1,6 @@
<template>
  <div>
    <index-chart v-if="indexStyle==1"></index-chart>
  <div class="page-container" style="width: 100%">
    <!--<index-chart v-if="indexStyle==1"></index-chart>-->
    <!--<index-bdc v-if="indexStyle==2"></index-bdc>-->
    <!--<index-task v-if="indexStyle==3"></index-task>-->
    <!--<div style="width: 100%;text-align: right;margin-top: 20px">-->
@@ -11,9 +11,14 @@
    <!--&lt;!&ndash;<a-radio :value="3">任务表格</a-radio>&ndash;&gt;-->
    <!--&lt;!&ndash;</a-radio-group>&ndash;&gt;-->
    <!--</div>-->
    <a-button type="primary" size="large" v-for="item in workshopList" :key="item.workshopId"
              @click="navigateToWorkshopSignage(item.id)">{{item.workshopName}}
    </a-button>
    <!--<a-button type="primary" size="large" v-for="item in workshopList" :key="item.workshopId"-->
    <!--@click="navigateToWorkshopSignage(item.id)">{{item.workshopName}}-->
    <!--</a-button>-->

    <a-card v-for="item in workshopList" :key="item.workshopId"
            @click="navigateToWorkshopSignage(item.id)" class="workshop-entrance">
      {{item.workshopName}}
    </a-card>
  </div>
</template>

@@ -33,24 +38,7 @@
    data() {
      return {
        indexStyle: 1,
        workshopList: [
          {
            workshopName: '长沙车间',
            id: '5321'
          },
          {
            workshopName: '天津车间',
            id: '6312'
          },
          {
            workshopName: '武汉车间',
            id: '3463'
          },
          {
            workshopName: '北京车间',
            id: '8421'
          }
        ]
        workshopList: []
      }
    },
    created() {
@@ -78,4 +66,25 @@
      }
    }
  }
</script>
</script>

<style lang="less" scoped>
  .page-container {
    width: 100%;
    display: flex;
    flex-wrap: wrap;

    .workshop-entrance {
      font-size: 30px;
      background-color: #fff;
      width: 300px;
      height: 140px;
      display: flex;
      justify-content: center;
      align-items: center;
      margin: 30px 38px;
      cursor: pointer;
      border-radius: 20px;
    }
  }
</style>

 src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue

@@ -572,7 +572,7 @@
                  //重新计算分页问题
                  that.reCalculatePage(that.selectedRowKeys.length)
                  // that.$message.success(res.message);
                  that.$notification.warning({
                  that.$notification.success({
                    message:'消息',
                    description:res.message
                  });

 src/views/mdc/base/modules/shift/ShiftInfoModel.vue

@@ -1,6 +1,6 @@
<template>
  <a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading"
            @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-row :gutter="24">
@@ -12,7 +12,7 @@
          </a-col>
          <a-col :span="12">
            <a-form-item label="班次名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input allow-clear placeholder="请输入班制名称" v-decorator="['shiftSubName',validatorRules.shiftSubName]"/>
              <a-input allow-clear placeholder="请输入班次名称" v-decorator="['shiftSubName',validatorRules.shiftSubName]"/>
            </a-form-item>
          </a-col>
        </a-row>
@@ -72,7 +72,6 @@
    JeecgListMixin
  } from '@/mixins/JeecgListMixin'


  export default {
    name: 'ShiftInfoModel',
    mixins: [JeecgListMixin],
@@ -105,20 +104,35 @@
        confirmLoading: false,
        form: this.$form.createForm(this),
        validatorRules: {
          shiftSubName:[
            {
              required:true,
              message:'请输入字段长度',
            },{
              validator:this.checkshiftSuName,
              trigger:'blur'
            }
          ]
          shiftSubName: {
            rules: [
              {
                required: true,
                message: '请输入班次名称'
              }
            ]
          },
          startDate: {
            rules: [
              {
                required: true,
                message: '请选择开始时间'
              }
            ]
          },
          endDate: {
            rules: [
              {
                required: true,
                message: '请选择结束时间'
              }
            ]
          }
        },
        url: {
          add: '/mdc/mdcShiftSub/addShiftSub',
          edit: '/mdc/mdcShiftSub/editMdcShiftSub',
          list: '/mdc/mdcMdcShift/queryPageList',
          list: '/mdc/mdcMdcShift/queryPageList'
        },
        disableSubmit: true
      }
@@ -129,27 +143,27 @@

    methods: {
      //自定义校验函数，要求名字不能重复  value是表单的值，callback是回调函数   必须调用才可验证
      checkshiftSuName(rule,value,callback){
        if(!value){
          alert("不能为空！")
      checkshiftSuName(rule, value, callback) {
        if (!value) {
          alert('不能为空！')
          return
        }
        // debugger
        // let NameSelf = value;
       this.loadData()
        this.loadData()
        // console.log(dataSource);
        callback();
        callback()
      },
      loadData() {
        if(!this.url.list){
          this.$message.error("请设置url.list属性!")
        if (!this.url.list) {
          this.$message.error('请设置url.list属性!')
          return
        }
        //加载数据 若传入参数1则加载第一页的内容
        // if (arg === 1) {
        //   this.ipagination.current = 1;
        // }
        var params = this.getQueryParams();//查询条件
        var params = this.getQueryParams()//查询条件
        //
        // if(!params){
        //   return false;
@@ -160,7 +174,7 @@
          if (res.success) {
            // console.log(res)
            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
            this.dataSource = res.result.records||res.result;
            this.dataSource = res.result.records || res.result
            // if(res.result.total)
            // {
            //   this.ipagination.total = res.result.total;
@@ -168,12 +182,12 @@
            //   this.ipagination.total = 0;
            // }
            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
          }else{
          } else {
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
              message: '消息',
              description: res.message
            })
          }
        }).finally(() => {
          this.loading = false
@@ -230,28 +244,23 @@
            that.confirmLoading = true
            let formData = Object.assign(this.model, values)
            formData.isDaySpan = that.isDaySpan
            console.log(formData.isDaySpan);
            if(formData.isDaySpan == false){
              formData.startDate = moment(formData.startDate).format('HH:mm:ss');
              formData.endDate = moment(formData.endDate).format('HH:mm:ss');
              formData.sleepStartDate = moment(formData.sleepStartDate).format('HH:mm:ss');
              formData.sleepEndDate = moment(formData.sleepEndDate).format('HH:mm:ss');
              let startTimeOne = formData.startDate.replace(/:/g,'');
              let endTimeOne = formData.endDate.replace(/:/g,'');
              if(startTimeOne > endTimeOne){
            console.log(formData.isDaySpan)
            formData.startDate = moment(formData.startDate).format('HH:mm:ss')
            formData.endDate = moment(formData.endDate).format('HH:mm:ss')
            if (formData.sleepStartDate) formData.sleepStartDate = moment(formData.sleepStartDate).format('HH:mm:ss')
            if (formData.sleepEndDate) formData.sleepEndDate = moment(formData.sleepEndDate).format('HH:mm:ss')
            if (formData.isDaySpan == false) {
              let startTimeOne = formData.startDate.replace(/:/g, '')
              let endTimeOne = formData.endDate.replace(/:/g, '')
              if (startTimeOne > endTimeOne) {
                // that.$message.warning("非跨天班次结束时间不能小于等于开始时间！")
                that.$notification.warning({
                  message:'消息',
                  description:"非跨天班次结束时间不能小于等于开始时间！"
                });
                // that.$message.success("保存失败")
                that.$notification.error({
                  message:'消息',
                  description:"保存失败！"
                });
                  message: '消息',
                  description: '非跨天班次结束时间不能小于等于开始时间！'
                })
                that.confirmLoading = false
                that.close()
              }else{
              } else {
                formData.shiftSubStatus = 1
                let obj
                if (!this.model.id) {
@@ -265,23 +274,23 @@
                  if (res.success) {
                    // that.$message.success("保存成功")
                    that.$notification.success({
                      message:'消息',
                      description:"保存成功"
                    });
                      message: '消息',
                      description: '保存成功'
                    })
                    that.$emit('ok', res.result)
                  } else {
                    // that.$message.warning(res.message)
                    that.$notification.warning({
                      message:'消息',
                      description:res.message
                    });
                      message: '消息',
                      description: res.message
                    })
                  }
                }).finally(() => {
                  that.confirmLoading = false
                  that.close()
                })
              }
            }else{
            } else {
              formData.shiftSubStatus = 1
              let obj
              if (!this.model.id) {
@@ -295,16 +304,16 @@
                if (res.success) {
                  // that.$message.success
                  that.$notification.success({
                    message:'消息',
                    description:"保存成功"
                  });
                    message: '消息',
                    description: '保存成功'
                  })
                  that.$emit('ok', res.result)
                } else {
                  // that.$message.warning(res.message)
                  that.$notification.warning({
                    message:'消息',
                    description:res.message
                  });
                    message: '消息',
                    description: res.message
                  })
                }
              }).finally(() => {
                that.confirmLoading = false
@@ -388,4 +397,4 @@
  .ant-tabs-content .ant-form-item {
    margin-bottom: 0px;
  }
</style>
</style>

 src/views/system/modules/WorkshopModal.vue

@@ -12,9 +12,6 @@

    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" v-bind="layout" :model="model" :rules="validatorRules">
        <a-form-model-item label="车间编号" required prop="id">
          <a-input v-model="model.id" :disabled="isEdit" placeholder="请输入车间编号"/>
        </a-form-model-item>
        <a-form-model-item label="车间名称" required prop="workshopName">
          <a-input v-model="model.workshopName" placeholder="请输入车间名称"/>
        </a-form-model-item>