1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件

zhuzhuanzhuan

2023-09-21 a1ff69f228b7a0d08959e6b25eff2dac6085df8d

 src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue

@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :md="9" :sm="9">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss" showTime/>
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss"/>
            </a-form-item>
          </a-col>
          <a-col :md="4" :sm="4">
@@ -33,10 +33,10 @@
    </div>
    <!-- 操作按钮区域 -->
    <div class="table-operator" style="display: inline;">
      <a-button v-has="'user.addrequip'" @click="handleAdd" type="primary" icon="plus">维修新增
      <a-button  @click="handleAdd" type="primary" icon="plus">新增
      </a-button>
      <a-button v-has="'user.add'"  @click="handleAddXIU" type="primary" icon="plus">休班新增
      </a-button>
      <!--<a-button v-has="'user.add'"  @click="handleAddXIU" type="primary" icon="plus">休班新增-->
      <!--</a-button>-->
    </div>

    <!-- table区域-begin -->
@@ -64,9 +64,9 @@
    </div>
    <!-- table区域-end -->
    <device-repair-model ref="modalForm" @ok="modalFormOk"></device-repair-model>
    <device-repair-model-add  ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>
    <!--<device-repair-model-add  ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>-->
    <device-repair-model-edit ref="modalFormedit" @ok="modalFormOk"></device-repair-model-edit>
    <!--<repair-model ref="repairModelFrom" @ok="modalFormOk"></repair-model>-->
    <!--<repair-model ref="repairModelFrom" @ok="modalFormOk">0</repair-model>-->

  </a-card>
</template>
@@ -279,7 +279,11 @@
            }
            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
          }else{
            this.$message.warning(res.message)
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false
@@ -324,7 +328,11 @@
              this.ipagination.total = 0;
            }
          }else{
            this.$message.warning(res.message)
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false
@@ -362,7 +370,11 @@
              this.ipagination.total = 0;
            }
          }else{
            this.$message.warning(res.message)
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false
@@ -404,7 +416,11 @@
              this.ipagination.total = 0;
            }
          }else{
            this.$message.warning(res.message)
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false
@@ -438,7 +454,11 @@
            }
            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
          }else{
            this.$message.warning(res.message)
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false
@@ -460,23 +480,34 @@
          if (res.success) {
            //重新计算分页问题
            that.reCalculatePage(1)
            that.$message.success(res.message);
            // that.$message.success(res.message);
            that.$notification.success({
              message:'消息',
              description:res.message
            });
            that.searchQuery();
          } else {
            that.$message.warning(res.message);
            // that.$message.warning(res.message);
            that.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        });
      },
      /**
       * 打开新增维修或休班弹窗
       */
      handleAdd() {
        this.$refs.modalForm.add(this.node)
        this.$refs.modalForm.title = '新增'
        this.$refs.modalForm.disableSubmit = false
      },
      handleAddXIU() {
        this.$refs.modalFormadd.add()
        this.$refs.modalFormadd.title = '新增'
        this.$refs.modalFormadd.disableSubmit = false
      },
      // handleAddXIU() {
      //   this.$refs.modalFormadd.add()
      //   this.$refs.modalFormadd.title = '新增'
      //   this.$refs.modalFormadd.disableSubmit = false
      // },
      pQuery(parentId) {
        this.queryParam.parentId = parentId[0]
        if(this.selectedRowKeys.length >= 1) {
@@ -497,7 +528,11 @@
              _this.equipment = res.result
              _this.searchQuery()
            } else {
              _this.$message.warning('请配置设备！')
              // _this.$message.warning('请配置设备！')
              _this.$notification.warning({
                message:'消息',
                description:"请配置设备!"
              });
            }
          }
        })