1、各类审批状态提至列表靠前位置 2、新增二保、技术鉴定状态申请以及技术鉴定工单变更流程驳回时的审批节点展示条件

zhaowei

3 小时以前 3a8181119526dd55814fc69ac0566f93009fa71f

1、各类审批状态提至列表靠前位置
2、新增二保、技术鉴定状态申请以及技术鉴定工单变更流程驳回时的审批节点展示条件

 src/views/eam/base/EamMaintenanceStandardList.vue

@@ -125,7 +125,8 @@
          </a-popconfirm>
          </template>

          <template v-if="record.standardStatus !== 'WAIT_SUBMIT'&&record.standardStatus!=='ABOLISH'&&record.standardStatus!=='START'">
          <template
            v-if="record.standardStatus !== 'WAIT_SUBMIT'&&record.standardStatus!=='ABOLISH'&&record.standardStatus!=='START'">
            <a-divider type="vertical"/>

            <a @click.stop="handleDetail(record)">详情</a>
@@ -208,17 +209,22 @@
          {
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentCode'
            dataIndex: 'equipmentCode',
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName'
            dataIndex: 'equipmentName',
          },
          {
            title: '设备型号',
            align: 'center',
            dataIndex: 'equipmentModel'
            dataIndex: 'equipmentModel',
          },
          {
            title: '规范状态',
            align: 'center',
            dataIndex: 'standardStatus_dictText',
          },
          {
            title: '保养分类',
@@ -241,30 +247,21 @@
            title: '保养周期',
            align: 'center',
            dataIndex: 'maintenancePeriod',
            width: 100
          },
          {
            title: '保养周期单位',
            align: 'center',
            dataIndex: 'periodUnit',
            width: 120
          },
          {
            title: '初始日期',
            align: 'center',
            dataIndex: 'initialDate',
            width: 100
          },
          {
            title: '规范状态',
            align: 'center',
            dataIndex: 'standardStatus_dictText'
          },
          {
            title: '规范版本',
            align: 'center',
            dataIndex: 'standardVersion',
            width: 100
          }
        ],
        url: {

 src/views/eam/maintenance/EamInspectionOrderList.vue

@@ -171,6 +171,12 @@
            fixed: 'left'
          },
          {
            title: '点检状态',
            align: 'center',
            dataIndex: 'inspectionStatus_dictText',
            fixed: 'left'
          },
          {
            title: '工单号',
            align: 'center',
            dataIndex: 'orderNum'
@@ -202,11 +208,6 @@
            title: '创建方式',
            align: 'center',
            dataIndex: 'creationMethod_dictText'
          },
          {
            title: '点检状态',
            align: 'center',
            dataIndex: 'inspectionStatus_dictText'
          },
          {
            title: '点检人',

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -106,7 +106,8 @@

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

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

@@ -189,6 +190,12 @@
            fixed: 'left'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText',
            fixed: 'left'
          },
          {
            title: '工单号',
            align: 'center',
            dataIndex: 'orderNum'
@@ -222,11 +229,6 @@
            title: '维修工',
            align: 'center',
            dataIndex: 'repairman_dictText'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText'
          },
          {
            title: '创建方式',
@@ -263,10 +265,10 @@
          list: '/eam/secondMaintenanceOrder/list',
          abolish: '/eam/secondMaintenanceOrder/abolish',
          collect: '/eam/secondMaintenanceOrder/collect',
          restore:'/eam/secondMaintenanceOrder/restore',
          restore: '/eam/secondMaintenanceOrder/restore',
          abolishBatch: '/eam/secondMaintenanceOrder/abolishBatch',
          collectBatch: '/eam/secondMaintenanceOrder/collectBatch',
          restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch',
          restoreBatch: '/eam/secondMaintenanceOrder/restoreBatch'
        }
      }
    },
@@ -325,7 +327,7 @@
        this.$refs.secondMaintenanceApprovalModal.title = '详情'
        this.$refs.secondMaintenanceApprovalModal.visible = true
        this.$refs.secondMaintenanceApprovalModal.disableSubmit = true
        this.$refs.secondMaintenanceApprovalModal.recordDetail(record)
        this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
      },

      /**
@@ -388,7 +390,7 @@
        })
      },
      //还原
      handlerRestore(id){
      handlerRestore(id) {
        let that = this
        this.loading = true
        getAction(that.url.restore, { id })
@@ -409,7 +411,7 @@
          })
      },
      //批量还原
      handlerBatchRestore(){
      handlerBatchRestore() {
        if (!this.url.restoreBatch) {
          this.$message.error('请设置url.restoreBatch属性!')
          return

 src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue

@@ -148,6 +148,12 @@
            fixed: 'left'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText',
            fixed: 'left'
          },
          {
            title: '工单号',
            align: 'center',
            dataIndex: 'orderNum'
@@ -176,11 +182,6 @@
            title: '维修人',
            align: 'center',
            dataIndex: 'repairman_dictText'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText'
          },
          {
            title: '创建方式',

 src/views/flowable/workflow/FlowTodo.vue

@@ -308,7 +308,7 @@
        this.selectedRowData = Object.assign({}, record)
        this.$refs.secondMaintenanceApprovalModal.visible = true
        this.$refs.secondMaintenanceApprovalModal.title = record.name
        this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
        this.$refs.secondMaintenanceApprovalModal.handleApprove(record)
      },

      /**

 src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue

@@ -77,13 +77,13 @@
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.departHeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='DEPART_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="确认意见" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
                      <a-textarea placeholder="请输入意见" v-model="model.departHeaderComment"
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='DEPART_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -98,13 +98,13 @@
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.productionHeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="确认意见" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
                      <a-textarea placeholder="请输入意见" v-model="model.productionHeaderComment"
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_HEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -119,13 +119,13 @@
                                       :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.productionSupportSignatureResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_SUPPORT_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="24">
                    <a-form-model-item label="确认意见" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
                      <a-textarea placeholder="请输入意见" v-model="model.productionSupportComment"
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='PRODUCTION_SUPPORT_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -201,13 +201,13 @@
    },
    computed: {
      displayDepartHeaderFlag() {
        return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
        return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus)
      },
      displayProductionHeaderFlag() {
        return this.model.applicationStatus && ['PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
        return this.model.applicationStatus && ['PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus) && this.model.departHeaderSignatureResult === '1'
      },
      displayProductionSupportFlag() {
        return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
        return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus) && this.model.productionHeaderSignatureResult === '1'
      }
    },
    methods: {

 src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal.vue

@@ -211,13 +211,13 @@
    },
    computed: {
      displayEquipmentManagerFlag() {
        return this.model.changeStatus && ['EQUIPMENT_MANAGER_SIGNING', 'DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
        return this.model.changeStatus && ['EQUIPMENT_MANAGER_SIGNING', 'DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus)
      },
      displayDepartManagerFlag() {
        return this.model.changeStatus && ['DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
        return this.model.changeStatus && ['DEPART_MANAGER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus) && this.model.equipmentManagerSignatureResult === '1'
      },
      displayProductionSupportFlag() {
        return this.model.changeStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
        return this.model.changeStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus) && this.model.departManagerSignatureResult === '1'
      }
    },
    methods: {

 src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue

@@ -69,7 +69,7 @@
                 :span="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'&&model.maintenanceStatus!='UNDER_MAINTENANCE'?10:16">
            <a-tabs :active-key="activeTabKey" @change="handleTabChange">
              <a-tab-pane :key="1" tab="操作工"
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='operator_task'||
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='operator_task'||
                          (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')">
                <j-vxe-table ref="editableDetailTable1" :rowNumber="false" rowSelection bordered
                             alwaysEdit keep-source
@@ -104,7 +104,7 @@
              </a-tab-pane>

              <a-tab-pane :key="2" tab="维修工"
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='maintenance_task'||
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='maintenance_task'||
                          (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')">
                <j-vxe-table ref="editableDetailTable2" :rowNumber="false" rowSelection bordered
                             alwaysEdit kee-source
@@ -149,8 +149,8 @@
                v-if="activeTabKey!=='3'"
                :disabled="disableSubmit ||
                (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') ||
                (activeTabKey=='1'&&selectedOperatorMaintenanceRowKeys.length == 0)||
                (activeTabKey=='2'&&selectedRepairerMaintenanceRowKeys.length == 0)"
                (activeTabKey==='1'&&selectedOperatorMaintenanceRowKeys.length === 0)||
                (activeTabKey==='2'&&selectedRepairerMaintenanceRowKeys.length === 0)"
                slot="tabBarExtraContent"
                type="primary" @click="handleSelectAllInspectionResult">批量保养正常
              </a-button>
@@ -330,10 +330,10 @@
    },
    computed: {
      displayAdminConfirmFlag() {
        return ['WAIT_ADMIN_CONFIRM', 'WAIT_INSPECTOR_CONFIRM', 'COMPLETE'].includes(this.model.maintenanceStatus)
        return ['WAIT_ADMIN_CONFIRM', 'WAIT_INSPECTOR_CONFIRM', 'COMPLETE', 'REJECTED'].includes(this.model.maintenanceStatus)
      },
      displayInspectorConfirmFlag() {
        return ['WAIT_INSPECTOR_CONFIRM', 'COMPLETE'].includes(this.model.maintenanceStatus)
        return ['WAIT_INSPECTOR_CONFIRM', 'COMPLETE', 'REJECTED'].includes(this.model.maintenanceStatus) && this.model.manageUserResult === '1'
      }
    },
    methods: {
@@ -341,7 +341,7 @@
       * 主页面点击执行审批时触发
       * @param record 主页面列表行记录
       */
      async handleDetail(record) {
      async handleApprove(record) {
        this.spinning = true
        this.model = {}
        this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
@@ -355,7 +355,7 @@
       * 主页面点击详情时触发
       * @param record 主页面列表行记录
       */
      recordDetail(record) {
      handleDetail(record) {
        this.spinning = true
        this.activeTabKey = 1
        this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
@@ -443,7 +443,7 @@
            that.confirmLoading = that.spinning = true

            // 仅在保养中状态传递表格列表
            if (this.model.maintenanceStatus == 'UNDER_MAINTENANCE') {
            if (this.model.maintenanceStatus === 'UNDER_MAINTENANCE') {
              for (let index = 1; index <= 2; index++) {
                if (that.$refs['editableDetailTable' + index]) {
                  this.model.tableDetailList = that.$refs['editableDetailTable' + index].getTableData()
@@ -499,8 +499,8 @@
      handleTabToFirstTable() {
        this.$nextTick(() => {
          console.log('taskDefKey', this.selectShenpiData.taskDefKey)
          if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey == 'operator_task') || !this.selectShenpiData.taskDefKey) this.activeTabKey = 1
          else if (this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey == 'maintenance_task') this.activeTabKey = 2
          if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'operator_task') || !this.selectShenpiData.taskDefKey) this.activeTabKey = 1
          else if (this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'maintenance_task') this.activeTabKey = 2
        })
      },

@@ -509,8 +509,8 @@
        getAction(this.url.detail, { orderId })
          .then(res => {
            if (res.success) {
              this.detail.operatorMaintenanceList = res.result.filter(item => item.itemCategory == 'OPERATOR_MAINTENANCE')
              this.detail.repairerMaintenanceList = res.result.filter(item => item.itemCategory == 'REPAIRER_MAINTENANCE')
              this.detail.operatorMaintenanceList = res.result.filter(item => item.itemCategory === 'OPERATOR_MAINTENANCE')
              this.detail.repairerMaintenanceList = res.result.filter(item => item.itemCategory === 'REPAIRER_MAINTENANCE')
            }
          })
      },
@@ -523,16 +523,16 @@
      // 批量选择所有点检结果
      handleSelectAllInspectionResult() {
        let selectedRowKeys, prefix
        if (this.activeTabKey == 1) {
        if (this.activeTabKey === 1) {
          selectedRowKeys = this.selectedOperatorMaintenanceRowKeys
          prefix = 'operator'
        }
        else if (this.activeTabKey == 2) {
        else if (this.activeTabKey === 2) {
          selectedRowKeys = this.selectedRepairerMaintenanceRowKeys
          prefix = 'repairer'
        }
        else selectedRowKeys = []
        if (selectedRowKeys.length == 0) return
        if (selectedRowKeys.length === 0) return

        selectedRowKeys.forEach(key => {
          const dataItem = this.detail[prefix + 'MaintenanceList'].find(item => item.id === key)