1、我的待办页面 设备维修 分类审批弹窗功能逻辑开发并复用至我的已办和维修工单页面 2、根据会议内容调整系统功能 3、调整设备铭牌打印高度

zhaowei

2025-04-23 9219b0c4d7aecd6347a120ae0923ee5a6a25da05

 src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue

@@ -12,17 +12,20 @@
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备编号">
              <lx-search-equipment-select placeholder="请输入设备编号或名称搜索" v-model="queryParam.equipmentId"></lx-search-equipment-select>
              <lx-search-equipment-select placeholder="请输入设备编号或名称搜索"
                                          v-model="queryParam.equipmentId"></lx-search-equipment-select>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="计划保养日期">
              <a-range-picker v-model="queryParam.maintenanceDateRange" @change="onMaintenanceDateChange" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
              <a-range-picker v-model="queryParam.maintenanceDateRange" @change="onMaintenanceDateChange"
                              format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="保养状态">
              <j-dict-select-tag placeholder="请选择保养状态" dict-code="week_maintenance_status" v-model="queryParam.maintenanceStatus" />
              <j-dict-select-tag placeholder="请选择保养状态" dict-code="week_maintenance_status"
                                 v-model="queryParam.maintenanceStatus"/>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
@@ -79,16 +82,21 @@
        @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
          <a v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:weekMaintenance:edit')" @click="handleEdit(record)">编辑</a>
          <a-divider type="vertical" v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:weekMaintenance:edit')" />
          <a-popconfirm title="确定领取吗?" @confirm="() => handlerCollect(record.id)" v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:weekMaintenance:collect')">
          <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:weekMaintenance:edit')">
          <a @click="handleEdit(record)">编辑</a>

          <a-divider type="vertical"/>

          <a-popconfirm title="确定领取吗?" @confirm="() => handlerCollect(record.id)">
            <a>领取</a>
          </a-popconfirm>
          <a-divider type="vertical" v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:weekMaintenance:collect')" />

          <a-divider type="vertical"/>

          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'  && isShowAuth('eam:weekMaintenance:abolish')">
              <a-menu-item>
                <a-popconfirm title="确定作废吗?" @confirm="() => handlerAbolish(record.id)">
                  <a>作废</a>
                </a-popconfirm>
@@ -98,15 +106,20 @@
              </a-menu-item>
            </a-menu>
          </a-dropdown>
        </span>
          </template>

          <template v-else>
              <a @click="handleDetail(record)">详情</a>
          </template>
        </span>
      </a-table>
    </div>
    <!-- table区域-end -->

    <!-- 表单区域 -->
    <eamWeekMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"></eamWeekMaintenanceOrder-modal>
    <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"></week-maintenance-approval-modal>
    <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal"
                                     :selectShenpiData="selectWeekMaintenanceData"></week-maintenance-approval-modal>
  </a-card>
</template>

@@ -155,124 +168,124 @@
          align: 'center',
          dataIndex: 'orderNum',
          fixed: 'left',
          width: 60,
            width: 60
        },
        {
          title: '设备编号',
          align: 'center',
          dataIndex: 'equipmentCode',
          fixed: 'left',
          width: 60,
            width: 60
        },
        {
          title: '设备名称',
          align: 'center',
          dataIndex: 'equipmentName',
          fixed: 'left',
          width: 60,
            width: 60
        },
        {
          title: '标准名称',
          align: 'center',
          dataIndex: 'standardId_dictText',
          width: 100,
            width: 100
        },
        {
          title: '计划保养日期',
          align: 'center',
          dataIndex: 'maintenanceDate',
          width: 60,
            width: 60
        },
        {
          title: '实际开始时间',
          align: 'center',
          dataIndex: 'actualStartTime',
          width: 60,
            width: 60
        },
        {
          title: '实际结束时间',
          align: 'center',
          dataIndex: 'actualEndTime',
          width: 60,
            width: 60
        },
        {
          title: '保养人',
          align: 'center',
          dataIndex: 'operator_dictText',
          width: 60,
            width: 60
        },
        {
          title: '保养状态',
          align: 'center',
          dataIndex: 'maintenanceStatus_dictText',
          width: 60,
            width: 60
        },
        {
          title: '创建方式',
          align: 'center',
          dataIndex: 'creationMethod_dictText',
          width: 60,
            width: 60
        },
        {
          title: '确认人',
          align: 'center',
          dataIndex: 'confirmUser_dictText',
          width: 60,
            width: 60
        },
        {
          title: '确认时间',
          align: 'center',
          dataIndex: 'confirmTime',
          width: 60,
            width: 60
        },
        {
          title: '确认意见',
          align: 'center',
          dataIndex: 'confirmComment',
          width: 60,
            width: 60
        },
        {
          title: '初验收人',
          align: 'center',
          dataIndex: 'initialAcceptanceUser_dictText',
          width: 60,
            width: 60
        },
        {
          title: '初验收时间',
          align: 'center',
          dataIndex: 'initialAcceptanceTime',
          width: 60,
            width: 60
        },
        {
          title: '初验收意见',
          align: 'center',
          dataIndex: 'initialAcceptanceComment',
          width: 60,
            width: 60
        },
        {
          title: '终验收人',
          align: 'center',
          dataIndex: 'finalAcceptanceUser_dictText',
          width: 60,
            width: 60
        },
        {
          title: '终验收时间',
          align: 'center',
          dataIndex: 'finalAcceptanceTime',
          width: 60,
            width: 60
        },
        {
          title: '终验收意见',
          align: 'center',
          dataIndex: 'finalAcceptanceComment',
          width: 60,
            width: 60
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark',
          width: 60,
        },
            width: 60
          }
        // {
        //   title: '操作',
        //   dataIndex: 'action',
@@ -287,7 +300,7 @@
        abolish: '/eam/weekMaintenanceOrder/abolish',
        abolishBatch: '/eam/weekMaintenanceOrder/abolishBatch',
        collect: '/eam/weekMaintenanceOrder/collect',
        collectBatch: '/eam/weekMaintenanceOrder/collectBatch',
          collectBatch: '/eam/weekMaintenanceOrder/collectBatch'
      }
    }
  },
@@ -300,7 +313,7 @@
      dataIndex: 'action',
      align: 'center',
      fixed: 'right',
      width: 147,
        width: 200,
      scopedSlots: { customRender: 'action' }
    }
    this.columns = [...this.columns, operationColumn]
@@ -314,10 +327,10 @@
    },
    handlerAbolish(id) {
      if(!this.url.abolish){
        this.$message.error("请设置url.abolish属性!")
          this.$message.error('请设置url.abolish属性!')
        return
      }
      var that = this;
        var that = this
      deleteAction(that.url.abolish, {id: id}).then((res) => {
        if (res.success) {
          //重新计算分页问题
@@ -326,40 +339,40 @@
          that.$notification.success({
            message:'消息',
            description:res.message
          });
          that.loadData();
            })
            that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message:'消息',
            description:res.message
          });
            })
        }
      });
        })
    },
    handlerBatchAbolish() {
      if(!this.url.abolishBatch){
        this.$message.error("请设置url.abolishBatch属性!")
          this.$message.error('请设置url.abolishBatch属性!')
        return
      }
      if (this.selectedRowKeys.length <= 0) {
        // this.$message.warning('请选择一条记录！');
        this.$notification.warning({
          message:'消息',
          description:"请选择一条记录"
        });
        return;
            description: '请选择一条记录'
          })
          return
      } else {
        var ids = "";
          var ids = ''
        for (var a = 0; a < this.selectedRowKeys.length; a++) {
          ids += this.selectedRowKeys[a] + ",";
            ids += this.selectedRowKeys[a] + ','
        }
        var that = this;
          var that = this
        this.$confirm({
          title: "确认作废",
          content: "是否作废选中数据，只有待保养状态的数据才可作废成功?",
            title: '确认作废',
            content: '是否作废选中数据，只有待保养状态的数据才可作废成功?',
          onOk: function () {
            that.loading = true;
              that.loading = true
            deleteAction(that.url.abolishBatch, {ids: ids}).then((res) => {
              if (res.success) {
                //重新计算分页问题
@@ -368,30 +381,30 @@
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.loadData();
                that.onClearSelected();
                  })
                  that.loadData()
                  that.onClearSelected()
              } else {
                // that.$message.warning(res.message);
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
                  })
              }
            }).finally(() => {
              that.loading = false;
            });
                that.loading = false
              })
          }
        });
          })
      }
    },
    //单个领取
    handlerCollect(id) {
      if(!this.url.collect){
        this.$message.error("请设置url.collect属性!")
          this.$message.error('请设置url.collect属性!')
        return
      }
      let that = this;
        let that = this
      getAction(that.url.collect, {id: id}).then((res) => {
        if (res.success) {
          //重新计算分页问题
@@ -400,41 +413,41 @@
          that.$notification.success({
            message:'消息',
            description:res.message
          });
          that.loadData();
            })
            that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message:'消息',
            description:res.message
          });
            })
        }
      });
        })
    },
    //批量领取
    handlerBatchCollect(){
      if(!this.url.collectBatch){
        this.$message.error("请设置url.abolishBatch属性!")
          this.$message.error('请设置url.abolishBatch属性!')
        return
      }
      if (this.selectedRowKeys.length <= 0) {
        // this.$message.warning('请选择一条记录！');
        this.$notification.warning({
          message:'消息',
          description:"请选择一条记录"
        });
        return;
            description: '请选择一条记录'
          })
          return
      } else {
        var ids = "";
          var ids = ''
        for (var a = 0; a < this.selectedRowKeys.length; a++) {
          ids += this.selectedRowKeys[a] + ",";
            ids += this.selectedRowKeys[a] + ','
        }
        var that = this;
          var that = this
        this.$confirm({
          title: "确认领取",
          content: "是否领取选中数据，只有待保养状态的数据才可领取成功?",
            title: '确认领取',
            content: '是否领取选中数据，只有待保养状态的数据才可领取成功?',
          onOk: function () {
            that.loading = true;
              that.loading = true
            deleteAction(that.url.collectBatch, {ids: ids}).then((res) => {
              if (res.success) {
                //重新计算分页问题
@@ -443,27 +456,27 @@
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.loadData();
                that.onClearSelected();
                  })
                  that.loadData()
                  that.onClearSelected()
              } else {
                // that.$message.warning(res.message);
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
                  })
              }
            }).finally(() => {
              that.loading = false;
            });
                that.loading = false
              })
          }
        });
          })
      }
    },
    handleDetail(record) {
      this.selectWeekMaintenanceData = Object.assign({}, record)
      this.$refs.weekMaintenanceApprovalModal.recordDetail(record)
      this.$refs.weekMaintenanceApprovalModal.title = '详情';
        this.$refs.weekMaintenanceApprovalModal.title = '详情'
      this.$refs.weekMaintenanceApprovalModal.disableSubmit = true
    }
  }