Merge remote-tracking branch 'origin/master'

zhaowei

5 天以前 886748a39efb188d8008d41f2718eb78f3006ddd

Merge remote-tracking branch 'origin/master'

 src/views/eam/base/EamMaintenanceStandardList.vue

@@ -102,8 +102,8 @@

              <a-divider v-has="'standard:edit'" type="vertical"/>

              <a-popconfirm title="确定发起流程吗?" @confirm="() => startProcess(record.id)">
                  <a v-has="'standard:saveFlow'" @click.stop="event=>event.stopPropagation()">发起流程</a>
              <a-popconfirm title="确定提交吗?" @confirm="() => startProcess(record.id)">
                  <a v-has="'standard:saveFlow'" @click.stop="event=>event.stopPropagation()">提交</a>
              </a-popconfirm>



 src/views/eam/base/EamRepairDepartList.vue

@@ -7,11 +7,6 @@
        <a-row style="margin-left: 14px">
          <a-button @click="handleAdd(1)" type="primary">添加维修部门</a-button>
          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
          <a-button type="primary" icon="download" @click="handleExportXls('维修部门信息')">导出</a-button>
          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                    :action="importExcelUrl" @change="handleImportExcel">
            <a-button type="primary" icon="import">导入</a-button>
          </a-upload>
          <a-button @click="handleDelete" v-if="selectedKeys.length>0">删除</a-button>
          <a-button title="删除多条数据" @click="batchDel" v-if="checkedKeys.length>0">批量删除</a-button>
          <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -50,6 +50,10 @@
            <a-icon type="form"/>
            领取
          </a-menu-item>
          <a-menu-item key="3" @click="handlerBatchRestore">
            <a-icon type="form"/>
            还原
          </a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> 批量操作
          <a-icon type="down"/>
@@ -98,6 +102,14 @@

          <template v-else>
            <a @click="handleDetail(record)">详情</a>


            <a-divider v-if="record.maintenanceStatus === 'ABOLISH'" type="vertical"/>

            <a-popconfirm v-if="record.maintenanceStatus === 'ABOLISH'" title="确定还原吗?" @confirm="() => handlerRestore(record.id)">
              <a>还原</a>
            </a-popconfirm>

            <a-divider type="vertical" v-if="record.maintenanceStatus === 'COMPLETE'"/>
            <a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">打印</a>
          </template>
@@ -251,8 +263,10 @@
          list: '/eam/secondMaintenanceOrder/list',
          abolish: '/eam/secondMaintenanceOrder/abolish',
          collect: '/eam/secondMaintenanceOrder/collect',
          restore:'/eam/secondMaintenanceOrder/restore',
          abolishBatch: '/eam/secondMaintenanceOrder/abolishBatch',
          collectBatch: '/eam/secondMaintenanceOrder/collectBatch'
          collectBatch: '/eam/secondMaintenanceOrder/collectBatch',
          restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch',
        }
      }
    },
@@ -373,6 +387,76 @@
          }
        })
      },
      //还原
      handlerRestore(id){
        let that = this
        this.loading = true
        getAction(that.url.restore, { id })
          .then((res) => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
              this.loading = false
            }
          })
      },
      //批量还原
      handlerBatchRestore(){
        if (!this.url.restoreBatch) {
          this.$message.error('请设置url.restoreBatch属性!')
          return
        }
        if (this.selectedRowKeys.length <= 0) {
          // this.$message.warning('请选择一条记录！');
          this.$notification.warning({
            message: '消息',
            description: '请选择一条记录'
          })
          return
        } else {
          var ids = ''
          for (var a = 0; a < this.selectedRowKeys.length; a++) {
            ids += this.selectedRowKeys[a] + ','
          }
          var that = this
          this.$confirm({
            title: '确认还原',
            content: '是否还原选中数据，只有作废状态的数据才可还原成功?',
            onOk: function() {
              that.loading = true
              deleteAction(that.url.restoreBatch, { ids: ids }).then((res) => {
                if (res.success) {
                  //重新计算分页问题
                  that.reCalculatePage(that.selectedRowKeys.length)
                  // that.$message.success(res.message);
                  that.$notification.success({
                    message: '消息',
                    description: res.message
                  })
                  that.loadData()
                  that.onClearSelected()
                } else {
                  // that.$message.warning(res.message);
                  that.$notification.warning({
                    message: '消息',
                    description: res.message
                  })
                }
              }).finally(() => {
                that.loading = false
              })
            }
          })
        }
      },
      //批量领取
      handlerBatchCollect() {
        if (!this.url.collectBatch) {