Merge remote-tracking branch 'origin/master'

lyh

2 天以前 b1c4b9509b3b84594bbc9a541f308101d3a17140

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
#	src/views/eam/repair/EamRepairOrderList.vue

 src/views/eam/base/EamMaintenanceStandardList.vue

@@ -117,12 +117,19 @@
              </a-popconfirm>
          </template>

          <template v-if="record.standardStatus != 'WAIT_SUBMIT'">
          <template v-if="record.standardStatus !== 'WAIT_SUBMIT'">
            <a-divider v-has="'standard:delete'" type="vertical" v-if="record.standardStatus=='START'"/>

          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
            <a v-has="'standard:delete'" @click.stop="event=>event.stopPropagation()">删除</a>
          </a-popconfirm>
          </template>

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

            <a @click.stop="handleDetail(record)">详情</a>
          </template>
        </span>
      </a-table>
@@ -160,6 +167,9 @@

    <!-- è¡¨å•åŒºåŸŸ -->
    <eamMaintenanceStandard-modal ref="modalForm" @ok="modalFormOk"/>

    <!--审批窗口-->
    <maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" :selectShenpiData="selectedRowData"/>
  </a-card>
</template>

@@ -170,6 +180,8 @@
  import EamMaintenanceStandardDetailList from '@views/eam/base/modules/EamMaintenanceStandardDetailList'
  import { deleteAction, getAction, templateXlsDownload } from '@api/manage'
  import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
  import MaintenanceStandardApprovalModal
    from '../../flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal'


  export default {
@@ -182,6 +194,7 @@
      }
    },
    components: {
      MaintenanceStandardApprovalModal,
      LxSearchEquipmentSelect,
      EamMaintenanceStandardModal,
      EamMaintenanceStandardDetailList
@@ -190,22 +203,28 @@
      return {
        description: '保养规范页面',
        disableMixinCreated: true,
        selectedRowData: {},
        // è¡¨å¤´
        columns: [
          {
            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: '保养分类',
@@ -228,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: {
@@ -357,13 +367,28 @@
          })
      },

      /**
       * ç‚¹å‡»å‡ç‰ˆæ—¶è§¦å‘时触发
       * @param record
       */
      handleUpgrade(record) {
        //升版
        this.$refs.modalForm.upgrade(record)
        this.$refs.modalForm.title = '升版'
        this.$refs.modalForm.disableSubmit = false
      },

      /**
       * ç‚¹å‡»è¯¦æƒ…时触发时触发
       * @param record
       */
      handleDetail(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.maintenanceStandardApprovalModal.title = '详情'
        this.$refs.maintenanceStandardApprovalModal.disableSubmit = true
        this.$refs.maintenanceStandardApprovalModal.visible = true
        this.$refs.maintenanceStandardApprovalModal.handleDetail(record)
      },

      batchDel() {
        var ids = ''
        for (var a = 0; a < this.selectedRowKeys.length; a++) {

 src/views/eam/base/modules/EamMaintenanceStandardModal.vue

@@ -248,6 +248,7 @@
              title: '保养部位',
              key: 'itemPart',
              type: JVXETypes.textarea,
              placeholder: '请输入${title}',
              slotName: 'itemPart',
              align: 'center',
              validateRules: [{ required: true, message: '请输入${title}' }]

 src/views/eam/equipment/modules/LxSearchEquipmentSelect.vue

@@ -79,6 +79,13 @@
          this.initSelectValue()
        }
      }
    },
    factoryOrgCode:{
      handler(val){
        if(val){
          this.loadData()
        }
      }
    }
  },
  methods: {

 src/views/eam/maintenance/EamInspectionOrderList.vue

@@ -40,7 +40,6 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator" v-if="isDisplayOperation">
      <a-button v-has="'eam:inspection:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button v-if="selectedRowKeys.length == 1" @click="handlePrint" type="primary">查看</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchZf('ABOLISH')" v-has="'eam:inspection:abolish'">
@@ -172,6 +171,12 @@
            fixed: 'left'
          },
          {
            title: '点检状态',
            align: 'center',
            dataIndex: 'inspectionStatus_dictText',
            fixed: 'left'
          },
          {
            title: '工单号',
            align: 'center',
            dataIndex: 'orderNum'
@@ -203,11 +208,6 @@
            title: '创建方式',
            align: 'center',
            dataIndex: 'creationMethod_dictText'
          },
          {
            title: '点检状态',
            align: 'center',
            dataIndex: 'inspectionStatus_dictText'
          },
          {
            title: '点检人',

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -189,6 +189,12 @@
            fixed: 'left'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText',
            fixed: 'left'
          },
          {
            title: '工单号',
            align: 'center',
            dataIndex: 'orderNum'
@@ -222,11 +228,6 @@
            title: '维修工',
            align: 'center',
            dataIndex: 'repairman_dictText'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText'
          },
          {
            title: '创建方式',
@@ -263,10 +264,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 +326,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 +389,7 @@
        })
      },
      //还原
      handlerRestore(id){
      handlerRestore(id) {
        let that = this
        this.loading = true
        getAction(that.url.restore, { id })
@@ -409,7 +410,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/eam/repair/EamRepairOrderList.vue

@@ -35,11 +35,11 @@

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator" v-if="isDisplayOperation">
      <a-dropdown v-if="selectedRowKeys.length > 0">
      <a-dropdown :disabled="selectedRowKeys.length == 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel">
            <a-icon type="delete"/>
            åˆ é™¤
          <a-menu-item key="1" @click="handleBatchSubmit">
            <a-icon type="form"/>
            æäº¤
          </a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ
@@ -61,13 +61,15 @@
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"
               :scroll="{x:'max-content'}">
        <span slot="action" slot-scope="text, record">
          <a v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" @click="handleFillIn(record)">填报</a>
          <a-divider v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" type="vertical"/>
          <a-popconfirm v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" title="确定提交吗?" @confirm="() => handleSubmit(record.id)">
             <a>提交</a>
          </a-popconfirm>
          <a-divider v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" type="vertical"/>
          <a @click="handleDetail(record)">详情</a>
          <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE'">
             <a @click="handleFillIn(record)">填报</a>
             <a-divider type="vertical"/>
             <a-popconfirm title="确定提交吗?" @confirm="() => handleSubmit(record.id)">
               <a>提交</a>
             </a-popconfirm>
          </template>

          <a v-else @click="handleDetail(record)">详情</a>
        </span>
      </a-table>
    </div>
@@ -261,6 +263,11 @@
          })
      },

      // æ‰¹é‡æäº¤æ—¶è§¦å‘
      handleBatchSubmit() {

      },

      /**
       * ç‚¹å‡»è¯¦æƒ…触发
       * @param record è¡¨æ ¼è¡Œä¿¡æ¯

 src/views/eam/technical/EamTechnicalStatusChangeList.vue

@@ -47,30 +47,37 @@

    <!-- table区域-begin -->
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}">
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
             :customRow="customRow">
        <span slot="action" slot-scope="text, record">
          <template v-if="record.changeStatus=='WAIT_SUBMIT'">
          <a @click="handleEdit(record)">编辑</a>
          <a @click.stop="handleEdit(record)">编辑</a>

          <a-divider type="vertical"/>

          <a-popconfirm title="确定提交吗？" @confirm="handleSubmit(record.id)">
             <a>提交</a>
             <a @click="e=>e.stopPropagation()">提交</a>
          </a-popconfirm>

          <a-divider type="vertical"/>

          <a-popconfirm title="确定作废吗？" @confirm="handleAbolish(record.id)">
            <a>作废</a>
            <a @click="e=>e.stopPropagation()">作废</a>
          </a-popconfirm>
          </template>

          <a @click="handleDetail(record)"
          <a @click.stop="handleDetail(record)"
             v-if="record.changeStatus!='WAIT_SUBMIT'&&record.changeStatus!='ABOLISH'">详情</a>
        </span>
    </a-table>

    <!-- table区域-end -->

    <a-tabs v-if="selectedRowKeys.length>0">
      <a-tab-pane tab="设备明细">
        <eam-technical-status-change-equipment-detail :selectedRow="selectionRows[0]"/>
      </a-tab-pane>
    </a-tabs>

    <!-- è¡¨å•åŒºåŸŸ -->
    <eamTechnicalStatusChange-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"/>
@@ -87,11 +94,13 @@
  import { getAction } from '@/api/manage'
  import TechnicalStatusChangeApprovalModal
    from '../../flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal'
  import EamTechnicalStatusChangeEquipmentDetail from './modules/EamTechnicalStatusChangeEquipmentDetail'

  export default {
    name: 'EamTechnicalStatusChangeList',
    mixins: [JeecgListMixin],
    components: {
      EamTechnicalStatusChangeEquipmentDetail,
      TechnicalStatusChangeApprovalModal,
      EamTechnicalStatusChangeModal
    },
@@ -133,7 +142,7 @@
          {
            title: '使用单位室级主管签字',
            align: 'center',
            dataIndex: 'departHeaderSignature'
            dataIndex: 'departHeaderSignature_dictText'
          },
          {
            title: '使用单位室级主管签字时间',
@@ -143,7 +152,7 @@
          {
            title: '使用单位部级主管签字',
            align: 'center',
            dataIndex: 'departLeaderSignature'
            dataIndex: 'departLeaderSignature_dictText'
          },
          {
            title: '使用单位部级主管签字时间',
@@ -255,6 +264,19 @@
        this.$refs.technicalStatusChangeApprovalModal.handleDetail(record)
      },

      customRow(record) {
        return {
          style: {
            cursor: 'pointer'
          },
          on: {
            click: event => {
              this.onSelectChange([record.id], [record])
            }
          }
        }
      },

      /**
       * ç”³è¯·æ—¶é—´å‘生改变时触发
       * @param dateStringArray

 src/views/eam/technical/EamTechnicalStatusDeactivateList.vue

@@ -1,46 +1,39 @@
<template>
  <a-card :bordered="false">

    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">

          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="删除标记">
              <a-input placeholder="请输入删除标记" v-model="queryParam.delFlag"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="4" :lg="6" :md="8" :sm="12">
            <a-form-item label="停用单号">
              <a-input placeholder="请输入停用单号" v-model="queryParam.deactivateOrderNum"></a-input>
              <a-input placeholder="请输入停用单号" v-model="queryParam.deactivateOrderNum"/>
            </a-form-item>
          </a-col>
        <template v-if="toggleSearchStatus">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="申请人">
              <a-input placeholder="请输入申请人" v-model="queryParam.applicant"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="申请部门">
              <a-input placeholder="请输入申请部门" v-model="queryParam.factoryOrgCode"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="12">
            <a-form-item label="申请日期">
              <a-input placeholder="请输入申请日期" v-model="queryParam.applyDate"></a-input>
              <a-range-picker v-model="queryParam.applyDate" value-format="YYYY-MM-DD" @change="handleDateRangeChange"/>
            </a-form-item>
          </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请单状态">
              <j-dict-select-tag placeholder="请选择申请单状态" v-model="queryParam.applicationStatus"
                                 dict-code="technical_status_deactivate_status"/>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="12">
            <a-form-item label="申请部门">
              <a-tree-select v-model="queryParam.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
                             show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                             treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请部门"
                             allow-clear tree-default-expand-all/>
            </a-form-item>
          </a-col>

          <a-col :xl="3" :lg="6" :md="8" :sm="12">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
            </span>
          </a-col>

@@ -51,180 +44,242 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</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-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
          <a-menu-item key="1" @click="batchDel">
            <a-icon type="delete"/>
            åˆ é™¤
          </a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ <a-icon type="down" /></a-button>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ
          <a-icon type="down"/>
        </a-button>
      </a-dropdown>
    </div>

    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
          <template v-if="record.applicationStatus=='WAIT_SUBMIT'">
          <a @click.stop="handleEdit(record)">编辑</a>

          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          <a-divider type="vertical"/>

          <a-popconfirm title="确定提交吗？" @confirm="handleSubmit(record.id)">
             <a @click="e=>e.stopPropagation()">提交</a>
          </a-popconfirm>

          <a-divider type="vertical"/>

          <a-popconfirm title="确定作废吗？" @confirm="handleAbolish(record.id)">
            <a @click="e=>e.stopPropagation()">作废</a>
          </a-popconfirm>
          </template>

          <a @click.stop="handleDetail(record)"
             v-if="record.applicationStatus!='WAIT_SUBMIT'&&record.applicationStatus!='ABOLISH'">详情</a>
        </span>

      </a-table>
    </div>
    </a-table>
    <!-- table区域-end -->

    <!-- è¡¨å•åŒºåŸŸ -->
    <eamTechnicalStatusDeactivate-modal ref="modalForm" @ok="modalFormOk"></eamTechnicalStatusDeactivate-modal>
    <eamTechnicalStatusDeactivate-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"/>

    <!--审批窗口-->
    <technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal"
                                                :selectShenpiData="selectedRowData"/>
  </a-card>
</template>

<script>
  import '@/assets/less/TableExpand.less'
  import EamTechnicalStatusDeactivateModal from './modules/EamTechnicalStatusDeactivateModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { getAction } from '@/api/manage'
  import TechnicalStatusDeactivateApprovalModal
    from '../../flowable/workflow/TechnicalStatus/TechnicalStatusDeactivateApprovalModal'

  export default {
    name: "EamTechnicalStatusDeactivateList",
    mixins:[JeecgListMixin],
    name: 'EamTechnicalStatusDeactivateList',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusDeactivateApprovalModal,
      EamTechnicalStatusDeactivateModal
    },
    data () {
    data() {
      return {
        description: '停用加工设备申请单管理页面',
        productionTreeData: [],
        selectedRowData: {},
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
           },
           {
            title: '删除标记',
            align:"center",
            dataIndex: 'delFlag'
           },
           {
          },
          {
            title: '停用单号',
            align:"center",
            align: 'center',
            dataIndex: 'deactivateOrderNum'
           },
           {
          },
          {
            title: '申请人',
            align:"center",
            dataIndex: 'applicant'
           },
           {
            align: 'center',
            dataIndex: 'applicant_dictText'
          },
          {
            title: '申请部门',
            align:"center",
            dataIndex: 'factoryOrgCode'
           },
           {
            align: 'center',
            dataIndex: 'factoryOrgCode_dictText'
          },
          {
            title: '申请日期',
            align:"center",
            align: 'center',
            dataIndex: 'applyDate'
           },
           {
            title: '申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成',
            align:"center",
            dataIndex: 'applicationStatus'
           },
           {
          },
          {
            title: '申请单状态',
            align: 'center',
            dataIndex: 'applicationStatus_dictText'
          },
          {
            title: '使用单位室主管签字',
            align:"center",
            align: 'center',
            dataIndex: 'departHeaderSignature'
           },
           {
          },
          {
            title: '使用单位室主管签字时间',
            align:"center",
            align: 'center',
            dataIndex: 'departHeaderSignatureTime'
           },
           {
            title: '使用单位室主管意见',
            align:"center",
            dataIndex: 'departHeaderSignatureComment'
           },
           {
          },
          {
            title: '使用单位部主管签字',
            align:"center",
            align: 'center',
            dataIndex: 'departLeaderSignature'
           },
           {
          },
          {
            title: '使用单位部主管签字时间',
            align:"center",
            align: 'center',
            dataIndex: 'departLeaderSignatureTime'
           },
           {
            title: '使用单位部主管签字',
            align:"center",
            dataIndex: 'departLeaderSignatureComment'
           },
           {
          },
          {
            title: 'HF编码',
            align:"center",
            align: 'center',
            dataIndex: 'hfCode'
           },
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            align: 'center',
            scopedSlots: { customRender: 'action' },
            width: 200,
            fixed: 'right'
          }
        ],
        url: {
          list: "/eam/eamTechnicalStatusDeactivate/list",
          delete: "/eam/eamTechnicalStatusDeactivate/delete",
          deleteBatch: "/eam/eamTechnicalStatusDeactivate/deleteBatch",
          exportXlsUrl: "eam/eamTechnicalStatusDeactivate/exportXls",
          importExcelUrl: "eam/eamTechnicalStatusDeactivate/importExcel",
       },
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
        url: {
          list: '/eam/eamTechnicalStatusDeactivate/list',
          submit: '/eam/eamTechnicalStatusDeactivate/submit',
          abolish: '/eam/eamTechnicalStatusDeactivate/abolish',
          getProductionTreeList: '/eam/BaseFactory/queryTreeList'
        }
      }
    },
    created() {
      this.getProductionTreeDataByApi()
    },
    methods: {
     
      // èŽ·å–申请部门树
      getProductionTreeDataByApi() {
        getAction(this.url.getProductionTreeList)
          .then(res => {
            if (res.success) {
              this.productionTreeData = res.result
            } else {
              this.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
      },

      /**
       * æäº¤æ—¶è§¦å‘
       * @param id
       */
      handleSubmit(id) {
        const that = this
        that.loading = true
        getAction(this.url.submit, { id })
          .then(res => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
              that.loading = false
            }
          })
      },

      /**
       * ä½œåºŸæ—¶è§¦å‘
       * @param id
       */
      handleAbolish(id) {
        const that = this
        that.loading = true
        getAction(this.url.abolish, { id })
          .then(res => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
              that.loading = false
            }
          })
      },

      /**
       * ç‚¹å‡»è¯¦æƒ…时触发时触发
       * @param record
       */
      handleDetail(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusDeactivateApprovalModal.title = '详情'
        this.$refs.technicalStatusDeactivateApprovalModal.disableSubmit = true
        this.$refs.technicalStatusDeactivateApprovalModal.visible = true
        this.$refs.technicalStatusDeactivateApprovalModal.handleDetail(record)
      },

      /**
       * ç”³è¯·æ—¥æœŸå€¼å‘生改变时触发
       * @param dateStringArray
       */
      handleDateRangeChange(dateStringArray) {
        this.queryParam.dateBegin = dateStringArray[0]
        this.queryParam.dateEnd = dateStringArray[1]
      }
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
</style>
</script>

 src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue

@@ -1,49 +1,45 @@
<template>
  <a-card :bordered="false">

    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">

          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="删除标记">
              <a-input placeholder="请输入删除标记" v-model="queryParam.delFlag"></a-input>
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="统一编码">
              <lx-search-equipment-select placeholder="请输入统一编码或名称搜索" v-model="queryParam.equipmentId"/>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="4" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请单号">
              <a-input placeholder="请输入申请单号" v-model="queryParam.applicationOrderNum"></a-input>
              <a-input placeholder="请输入申请单号" v-model="queryParam.applicationOrderNum"/>
            </a-form-item>
          </a-col>
        <template v-if="toggleSearchStatus">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="申请人">
              <a-input placeholder="请输入申请人" v-model="queryParam.applicant"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请部门">
              <a-input placeholder="请输入申请部门" v-model="queryParam.factoryOrgCode"></a-input>
              <a-tree-select v-model="queryParam.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
                             show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                             treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请部门"
                             allow-clear tree-default-expand-all/>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请日期">
              <a-input placeholder="请输入申请日期" v-model="queryParam.applyDate"></a-input>
              <a-range-picker v-model="queryParam.applyDate" value-format="YYYY-MM-DD" @change="handleDateRangeChange"/>
            </a-form-item>
          </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="5" :lg="6" :md="8" :sm="12">
            <a-form-item label="申请单状态">
              <j-dict-select-tag v-model="queryParam.applicationStatus" placeholder="请选择申请单状态"
                                 dict-code="technical_status_evaluation_application_status"/>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="6" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
            </span>
          </a-col>

        </a-row>
      </a-form>
    </div>
@@ -51,195 +47,268 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</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-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ <a-icon type="down" /></a-button>
      </a-dropdown>
    </div>

    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
          <template v-if="record.applicationStatus=='WAIT_SUBMIT'">
          <a @click.stop="handleEdit(record)">编辑</a>

          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          <a-divider type="vertical"/>

          <a-popconfirm title="确定提交吗？" @confirm="handleSubmit(record.id)">
             <a @click="e=>e.stopPropagation()">提交</a>
          </a-popconfirm>

          <a-divider type="vertical"/>

          <a-popconfirm title="确定作废吗？" @confirm="handleAbolish(record.id)">
            <a @click="e=>e.stopPropagation()">作废</a>
          </a-popconfirm>
          </template>

          <a @click.stop="handleDetail(record)"
             v-if="record.applicationStatus!='WAIT_SUBMIT'&&record.applicationStatus!='ABOLISH'">详情</a>
        </span>

      </a-table>
    </div>
    </a-table>
    <!-- table区域-end -->

    <!-- è¡¨å•åŒºåŸŸ -->
    <eamTechnicalStatusEvaluationApplication-modal ref="modalForm" @ok="modalFormOk"></eamTechnicalStatusEvaluationApplication-modal>
    <eamTechnicalStatusEvaluationApplication-modal ref="modalForm" @ok="modalFormOk"
                                                   :productionTreeData="productionTreeData"/>

    <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
                                                            :selectShenpiData="selectedRowData"/>
  </a-card>
</template>

<script>
  import '@/assets/less/TableExpand.less'
  import EamTechnicalStatusEvaluationApplicationModal from './modules/EamTechnicalStatusEvaluationApplicationModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
  import { getAction } from '@/api/manage'
  import TechnicalStatusEvaluationApplicationApprovalModal
    from '../../flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'

  export default {
    name: "EamTechnicalStatusEvaluationApplicationList",
    mixins:[JeecgListMixin],
    name: 'EamTechnicalStatusEvaluationApplicationList',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusEvaluationApplicationApprovalModal,
      LxSearchEquipmentSelect,
      EamTechnicalStatusEvaluationApplicationModal
    },
    data () {
    data() {
      return {
        description: '加工设备技术鉴定申请管理页面',
        productionTreeData: [],
        selectedRowData: {},
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
           },
           {
            title: '删除标记',
            align:"center",
            dataIndex: 'delFlag'
           },
           {
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            },
            fixed: 'left'
          },
          {
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentCode',
            fixed: 'left'
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName',
            fixed: 'left'
          },
          {
            title: '设备型号',
            align: 'center',
            dataIndex: 'equipmentModel',
            fixed: 'left'
          },
          {
            title: '申请单状态',
            align: 'center',
            dataIndex: 'applicationStatus_dictText',
            fixed: 'left'
          },
          {
            title: '申请单号',
            align:"center",
            align: 'center',
            dataIndex: 'applicationOrderNum'
           },
           {
          },
          {
            title: '申请人',
            align:"center",
            dataIndex: 'applicant'
           },
           {
            align: 'center',
            dataIndex: 'applicant_dictText'
          },
          {
            title: '申请部门',
            align:"center",
            dataIndex: 'factoryOrgCode'
           },
           {
            align: 'center',
            dataIndex: 'factoryOrgCode_dictText'
          },
          {
            title: '申请日期',
            align:"center",
            align: 'center',
            dataIndex: 'applyDate'
           },
           {
            title: '申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成',
            align:"center",
            dataIndex: 'applicationStatus'
           },
           {
          },
          {
            title: '技术状态鉴定日期',
            align: 'center',
            dataIndex: 'evaluationDate'
          },
          {
            title: '申请单位室级领导签字',
            align:"center",
            dataIndex: 'departHeaderSignature'
           },
           {
            align: 'center',
            dataIndex: 'departHeaderSignature_dictText'
          },
          {
            title: '申请单位室级领导签字时间',
            align:"center",
            align: 'center',
            dataIndex: 'departHeaderSignatureTime'
           },
           {
            title: '申请单位室级领导意见',
            align:"center",
            dataIndex: 'departHeaderComment'
           },
           {
          },
          {
            title: '生产设备管理主管签字',
            align:"center",
            dataIndex: 'productionHeaderSignature'
           },
           {
            title: '生产设备管理主管签字四件',
            align:"center",
            align: 'center',
            dataIndex: 'productionHeaderSignature_dictText'
          },
          {
            title: '生产设备管理主管签字时间',
            align: 'center',
            dataIndex: 'productionHeaderSignatureTime'
           },
           {
            title: '生产设备管理主管意见',
            align:"center",
            dataIndex: 'productionHeaderComment'
           },
           {
          },
          {
            title: '生产保障部领导签字',
            align:"center",
            dataIndex: 'productionSupportSignature'
           },
           {
            align: 'center',
            dataIndex: 'productionSupportSignature_dictText'
          },
          {
            title: '生产保障部领导签字时间',
            align:"center",
            align: 'center',
            dataIndex: 'productionSupportSignatureTime'
           },
           {
            title: '生产保障部领导意见',
            align:"center",
            dataIndex: 'productionSupportComment'
           },
           {
          },
          {
            title: 'HF编码',
            align:"center",
            align: 'center',
            dataIndex: 'hfCode'
           },
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            align: 'center',
            scopedSlots: { customRender: 'action' },
            fixed: 'right',
            width: 200
          }
        ],
        url: {
          list: "/eam/eamTechnicalStatusEvaluationApplication/list",
          delete: "/eam/eamTechnicalStatusEvaluationApplication/delete",
          deleteBatch: "/eam/eamTechnicalStatusEvaluationApplication/deleteBatch",
          exportXlsUrl: "eam/eamTechnicalStatusEvaluationApplication/exportXls",
          importExcelUrl: "eam/eamTechnicalStatusEvaluationApplication/importExcel",
       },
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
        url: {
          list: '/eam/eamTechnicalStatusEvaluationApplication/list',
          submit: '/eam/eamTechnicalStatusEvaluationApplication/submit',
          abolish: '/eam/eamTechnicalStatusEvaluationApplication/abolish',
          getProductionTreeList: '/eam/BaseFactory/queryTreeList'
        }
      }
    },
    created() {
      this.getProductionTreeDataByApi()
    },
    methods: {
     
      // èŽ·å–申请部门树
      getProductionTreeDataByApi() {
        getAction(this.url.getProductionTreeList)
          .then(res => {
            if (res.success) {
              this.productionTreeData = res.result
            } else {
              this.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
      },

      /**
       * æäº¤æ—¶è§¦å‘
       * @param id
       */
      handleSubmit(id) {
        const that = this
        that.loading = true
        getAction(this.url.submit, { id })
          .then(res => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
              that.loading = false
            }
          })
      },

      /**
       * ä½œåºŸæ—¶è§¦å‘
       * @param id
       */
      handleAbolish(id) {
        const that = this
        that.loading = true
        getAction(this.url.abolish, { id })
          .then(res => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
              that.loading = false
            }
          })
      },

      /**
       * ç‚¹å‡»è¯¦æƒ…时触发时触发
       * @param record
       */
      handleDetail(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = '详情'
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.disableSubmit = true
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleDetail(record)
      },

      /**
       * ç”³è¯·æ—¥æœŸå€¼å‘生改变时触发
       * @param dateStringArray
       */
      handleDateRangeChange(dateStringArray) {
        this.queryParam.dateBegin = dateStringArray[0]
        this.queryParam.dateEnd = dateStringArray[1]
      }
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
</style>
</script>

 src/views/eam/technical/modules/EamTechnicalStatusChangeEquipmentDetail.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,170 @@
<template>
  <div>
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="false" :loading="loading" :scroll="{x:'max-content'}">
    <span slot="action" slot-scope="text, record">
      <!--非搬迁-->
      <a v-if="record.changeCategory!='EQUIPMENT_RELOCATION'"
         :disabled="selectedRow.changeStatus!='COMPLETED'||(selectedRow.changeStatus=='COMPLETED'&&record.acceptanceChecker)"
         @click="handleAcceptance(record)">验收</a>

      <!--搬迁-->
      <a-popconfirm v-else title="是否生成技术状态鉴定工单？" @confirm="handleAcceptance(record)">
        <a
          :disabled="selectedRow.changeStatus!='COMPLETED'||(selectedRow.changeStatus=='COMPLETED'&&record.acceptanceChecker)">验收</a>
      </a-popconfirm>
    </span>
    </a-table>

    <!--设备验收弹窗-->
    <eam-technical-status-equipment-acceptance-modal ref="modalForm" @ok="modalFormOk"/>
  </div>
</template>

<script>
  import { getAction, postAction } from '@/api/manage'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import EamTechnicalStatusEquipmentAcceptanceModal from './EamTechnicalStatusEquipmentAcceptanceModal'

  export default {
    name: 'EamTechnicalStatusChangeEquipmentDetail',
    components: { EamTechnicalStatusEquipmentAcceptanceModal },
    mixins: [JeecgListMixin],
    props: {
      selectedRow: {
        type: Object
      }
    },
    watch: {
      selectedRow: {
        handler(val) {
          if (val) {
            this.loadData()
          }
        },
        immediate: true
      }
    },
    data() {
      return {
        disableMixinCreated: true,
        columns: [
          {
            title: '#',
            dataIndex: '',
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
          },
          {
            title: '统一编码',
            dataIndex: 'equipmentCode',
            align: 'center'
          },
          {
            title: '设备名称',
            dataIndex: 'equipmentName',
            align: 'center'
          },
          {
            title: '设备型号',
            dataIndex: 'equipmentModel',
            align: 'center'
          },
          {
            title: '使用单位',
            dataIndex: 'factoryName',
            align: 'center'
          },
          {
            title: '变更原因',
            dataIndex: 'changeCategory_dictText',
            align: 'center'
          },
          {
            title: '变更日期',
            dataIndex: 'changeDate',
            align: 'center'
          },
          {
            title: '变更后技术状态',
            dataIndex: 'changeTechnicalStatus_dictText',
            align: 'center'
          },
          {
            title: '验收人',
            dataIndex: 'acceptanceChecker_dictText',
            align: 'center'
          },
          {
            title: '验收时间',
            dataIndex: 'acceptanceCheckTime',
            align: 'center'
          },
          {
            title: '验收检查结果',
            dataIndex: 'acceptanceCheckResult_dictText',
            align: 'center'
          },
          {
            title: '验收意见',
            dataIndex: 'acceptanceCheckComment',
            align: 'center'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align: 'center',
            width: 200,
            fixed: 'right',
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: '/eam/eamTechnicalStatusChangeDetail/queryList',
          acceptance: '/eam/eamTechnicalStatusChange/acceptance'
        }
      }
    },
    methods: {
      loadData() {
        this.loading = true
        getAction(this.url.list, { orderId: this.selectedRow.id })
          .then((res) => {
            if (res.success) this.dataSource = res.result
          })
          .finally(() => {
            this.loading = false
          })
      },

      handleAcceptance(record) {
        if (record.changeCategory != 'EQUIPMENT_RELOCATION') {
          this.$refs.modalForm.handleAcceptance(record)
          this.$refs.modalForm.title = '验收'
        } else {
          this.loading = true
          postAction(this.url.acceptance, record)
            .then(res => {
              if (res.success) {
                this.$notification.success({
                  message: '消息',
                  description: res.message
                })
                this.loadData()
              } else {
                this.$notification.warning({
                  message: '消息',
                  description: res.message
                })
                this.loading = false
              }
            })
        }
      }
    }
  }
</script>

 src/views/eam/technical/modules/EamTechnicalStatusChangeModal.vue

@@ -2,35 +2,33 @@
  <j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="spinning">
      <div class="table-page-search-wrapper">
        <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-row>
            <a-col :span="8">
              <a-form-model-item label="变更单号">
                <a-input placeholder="系统自动生成" v-model="model.changeOrderNum" disabled/>
              </a-form-model-item>
            </a-col>
            <a-col :span="8">
              <a-form-model-item label="申请单位" prop="factoryOrgCode">
                <a-tree-select v-model="model.factoryOrgCode" :tree-data="productionTreeData"
                               @change="detail.dataSource=[]"
                               show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                               treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请单位"
                               allow-clear tree-default-expand-all :allow-clear="false"/>
              </a-form-model-item>
            </a-col>
          </a-row>
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="变更单号">
              <a-input placeholder="系统自动生成" v-model="model.changeOrderNum" disabled/>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="申请单位" prop="factoryOrgCode">
              <a-tree-select v-model="model.factoryOrgCode" :tree-data="productionTreeData"
                             @change="detail.dataSource=[]"
                             show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                             treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请单位"
                             allow-clear tree-default-expand-all :allow-clear="false"/>
            </a-form-model-item>
          </a-col>
        </a-row>

          <a-row>
            <a-col :span="24">
              <a-form-model-item label="备注" :labelCol="{span:2}" :wrapperCol="{span:20}">
                <a-textarea placeholder="请输入备注" v-model="model.remark"/>
              </a-form-model-item>
            </a-col>
          </a-row>
        </a-form-model>
      </div>
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="备注" :labelCol="{span:2}" :wrapperCol="{span:20}">
              <a-textarea placeholder="请输入备注" v-model="model.remark"/>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>

      <j-vxe-table ref="editableDetailTable" rowNumber rowSelection bordered alwaysEdit toolbar
                   v-if="model.factoryOrgCode"

 src/views/eam/technical/modules/EamTechnicalStatusDeactivateModal.vue

@@ -1,147 +1,268 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :visible="visible"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
      
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="删除标记">
          <a-input-number v-model="model.delFlag"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deactivateOrderNum" label="停用单号">
          <a-input placeholder="请输入停用单号" v-model="model.deactivateOrderNum" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicant" label="申请人">
          <a-input placeholder="请输入申请人" v-model="model.applicant" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryOrgCode" label="申请部门">
          <a-input placeholder="请输入申请部门" v-model="model.factoryOrgCode" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applyDate" label="申请日期">
          <a-input placeholder="请输入申请日期" v-model="model.applyDate" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationStatus" label="申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成">
          <a-input placeholder="请输入申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成" v-model="model.applicationStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignature" label="使用单位室主管签字">
          <a-input placeholder="请输入使用单位室主管签字" v-model="model.departHeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignatureTime" label="使用单位室主管签字时间">
          <a-input placeholder="请输入使用单位室主管签字时间" v-model="model.departHeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignatureComment" label="使用单位室主管意见">
          <a-input placeholder="请输入使用单位室主管意见" v-model="model.departHeaderSignatureComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departLeaderSignature" label="使用单位部主管签字">
          <a-input placeholder="请输入使用单位部主管签字" v-model="model.departLeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departLeaderSignatureTime" label="使用单位部主管签字时间">
          <a-input placeholder="请输入使用单位部主管签字时间" v-model="model.departLeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departLeaderSignatureComment" label="使用单位部主管签字">
          <a-input placeholder="请输入使用单位部主管签字" v-model="model.departLeaderSignatureComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hfCode" label="HF编码">
          <a-input placeholder="请输入HF编码" v-model="model.hfCode" />
        </a-form-model-item>
		
  <j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="停用单号">
              <a-input placeholder="系统自动生成" v-model="model.deactivateOrderNum" disabled/>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="申请部门" prop="factoryOrgCode">
              <a-tree-select v-model="model.factoryOrgCode" :tree-data="productionTreeData"
                             @change="detail.dataSource=[]"
                             show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                             treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请部门"
                             allow-clear tree-default-expand-all :allow-clear="false"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row>
          <a-col :span="24">
            <a-form-model-item label="备注" :labelCol="{span:2}" :wrapperCol="{span:20}">
              <a-textarea placeholder="请输入备注" v-model="model.remark"/>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>

      <j-vxe-table ref="editableDetailTable" rowNumber rowSelection bordered alwaysEdit toolbar
                   v-if="model.factoryOrgCode"
                   :toolbarConfig="detail.toolbarConfig" keep-source :height="300"
                   :dataSource="detail.dataSource" :columns="detail.columns">
        <!--统一编码-->
        <template v-slot:equipmentId="props">
          <lx-search-equipment-select v-model="props.row.equipmentId" placeholder="请输入统一编码或名称搜索"
                                      :factoryOrgCode="model.factoryOrgCode"
                                      @autocompleteForm="autocompleteForm($event,props.row)" :allowClear="false"/>
        </template>

        <!-- ä¿å…»æ—¥æœŸ-->
        <template v-slot:changeDate="props">
          <a-date-picker v-model="props.row.changeDate" value-format="YYYY-MM-DD" :allow-clear="false"/>
        </template>

        <!-- æ“ä½œ-->
        <template v-slot:action="props">
          <a :disabled="!props.row.equipmentId" @click="handlePreviewDetail(props.row.standardId)">预览明细</a>
        </template>
      </j-vxe-table>
    </a-spin>
  </j-modal>
</template>

<script>
  import { httpAction } from '@/api/manage'
  import moment from "moment"
  import { httpAction, getAction } from '@/api/manage'
  import { JVXETypes } from '@comp/jeecg/JVxeTable'
  import LxSearchEquipmentSelect from '../../equipment/modules/LxSearchEquipmentSelect'

  export default {
    name: "EamTechnicalStatusDeactivateModal",
    data () {
    name: 'EamTechnicalStatusDeactivateModal',
    components: { LxSearchEquipmentSelect },
    props: {
      productionTreeData: {
        type: Array
      }
    },
    data() {
      return {
        title:"操作",
        title: '操作',
        visible: false,
        spinning: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
          sm: { span: 6 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
          sm: { span: 18 }
        },

        confirmLoading: false,
        validatorRules:{
        validatorRules: {
          factoryOrgCode: [{ required: true, message: '请选择申请部门', trigger: 'change' }]
        },
        detail: {
          dataSource: [],
          columns: [
            {
              title: 'ID',
              key: 'id',
              type: JVXETypes.hidden
            },
            {
              title: '统一编码',
              key: 'equipmentId',
              align: 'center',
              type: JVXETypes.slot,
              slotName: 'equipmentId',
              width: 250,
              validateRules: [
                { required: true, message: '请输入${title}或名称搜索' },
                { unique: true, message: '${title}不能重复' }
              ]
            },
            {
              title: '设备名称',
              key: 'equipmentName',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '设备型号',
              key: 'equipmentModel',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '使用单位',
              key: 'factoryName',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '停用原因',
              key: 'deactivateReason',
              align: 'center',
              type: JVXETypes.textarea,
              width: 200,
              placeholder: '请输入${title}',
              validateRules: [{ required: true, message: '请输入${title}' }]
            },
            {
              title: '已停用时长',
              key: 'deactivateDuration',
              align: 'center',
              type: JVXETypes.inputNumber,
              width: 200,
              placeholder: '请输入${title}',
              validateRules: [{ required: true, message: '请输入${title}' }]
            }
          ],
          toolbarConfig: {
            // prefix å‰ç¼€ï¼›suffix åŽç¼€
            slot: ['prefix', 'suffix'],
            // add æ–°å¢žæŒ‰é’®ï¼›remove åˆ é™¤æŒ‰é’®ï¼›clearSelection æ¸…空选择按钮
            btn: ['add', 'remove', 'clearSelection']
          }
        },
        url: {
          add: "/eam/eamTechnicalStatusDeactivate/add",
          edit: "/eam/eamTechnicalStatusDeactivate/edit",
        },
          add: '/eam/eamTechnicalStatusDeactivate/add',
          edit: '/eam/eamTechnicalStatusDeactivate/edit',
          detail: '/eam/eamTechnicalStatusDeactivateDetail/queryList'
        }
      }
    },
    created () {
    },
    methods: {
      add () {
      add() {
        //初始化默认值
        this.edit({});
        this.edit({})
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;

      edit(record) {
        this.model = Object.assign({}, record)
        this.visible = true
        if (this.model.id) this.loadDetail(record.id)
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();

      autocompleteForm(selectObj, record) {
        record.factoryName = selectObj.factoryOrgCode_dictText
        record.equipmentName = selectObj.equipmentName
        record.equipmentModel = selectObj.equipmentModel
      },
      handleOk () {
        const that = this;

      /**
       * èŽ·å–设备明细
       * @param applicationId
       */
      loadDetail(applicationId) {
        this.spinning = true
        this.detail.dataSource = []
        getAction(this.url.detail, { applicationId })
          .then(res => {
            console.log('res', res)
            if (res.success) this.detail.dataSource = res.result
          })
          .finally(() => {
            this.spinning = false
          })
      },

      async handleOk() {
        const tableData = this.$refs.editableDetailTable.getTableData()
        if (tableData.length == 0) {
          this.$notification.warning({
            message: '消息',
            description: '请至少新增一条记录'
          })
          return
        }

        const errMap = await this.$refs.editableDetailTable.validateTable()
        if (errMap) return

        const that = this
        // è§¦å‘表单验证
         this.$refs.form.validate(valid => {
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            that.confirmLoading = that.spinning = true
            let httpUrl = ''
            let method = ''
            if (!this.model.id) {
              httpUrl += this.url.add
              method = 'post'
            } else {
              httpUrl += this.url.edit
              method = 'put'
            }
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
            })
          }else{
             return false;

            that.model.tableDetailList = this.$refs.editableDetailTable.getTableData()
            httpAction(httpUrl, this.model, method)
              .then((res) => {
                if (res.success) {
                  that.$notification.success({
                    message: '消息',
                    description: res.message
                  })
                  that.$emit('ok')
                  that.close()
                } else {
                  that.$notification.warning({
                    message: '消息',
                    description: res.message
                  })
                }
              })
              .finally(() => {
                that.confirmLoading = that.spinning = false
              })
          } else {
            return false
          }
        })
      },
      handleCancel () {
      handleCancel() {
        this.close()
      },


      close() {
        this.$emit('close')
        this.visible = false
        if (this.$refs.form) this.$refs.form.clearValidate()
      }
    }
  }
</script>

<style lang="less" scoped>

  /deep/ .ant-select-dropdown-menu {
    text-align: left;
  }
</style>

 src/views/eam/technical/modules/EamTechnicalStatusEquipmentAcceptanceModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,100 @@
<template>
  <j-modal :title="title" :width="500" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="验收检查结果" prop="acceptanceCheckResult">
              <j-dict-select-tag dict-code="equipment_technology_status" type="radio"
                                 v-model="model.acceptanceCheckResult"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="验收意见" prop="acceptanceCheckComment">
              <a-textarea placeholder="请输入验收意见" v-model="model.acceptanceCheckComment"/>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
  import { postAction } from '@/api/manage'

  export default {
    name: 'EamTechnicalStatusEquipmentAcceptanceModal',
    data() {
      return {
        title: '操作',
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 7 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 15 }
        },
        confirmLoading: false,
        validatorRules: {
          acceptanceCheckResult: [{ required: true, message: '请选择验收检查结果', trigger: 'change' }],
          acceptanceCheckComment: [{ required: true, message: '请输入验收意见', trigger: 'change' }]
        },
        url: {
          acceptance: '/eam/eamTechnicalStatusChange/acceptance'
        }
      }
    },
    methods: {
      handleAcceptance(record) {
        this.model = Object.assign({}, record)
        this.visible = true
      },

      handleOk() {
        const that = this
        // è§¦å‘表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true
            postAction(this.url.acceptance, this.model)
              .then(res => {
                if (res.success) {
                  that.$notification.success({
                    message: '消息',
                    description: res.message
                  })
                  that.$emit('ok')
                  that.handleCancel()
                } else {
                  that.$notification.warning({
                    message: '消息',
                    description: res.message
                  })
                }
              })
              .finally(() => {
                that.confirmLoading = false
              })
          } else {
            return false
          }
        })
      },

      handleCancel() {
        this.close()
      },

      close() {
        this.$emit('close')
        this.visible = false
        this.$refs.form.clearValidate()
      }
    }
  }
</script>

 src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue

@@ -1,66 +1,30 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :visible="visible"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    
  <j-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
      
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="删除标记">
          <a-input-number v-model="model.delFlag"/>
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-form-model-item prop="factoryOrgCode" label="申请部门">
          <a-tree-select v-model="model.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
                         :disabled="!editable"
                         show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                         @change="()=>delete model.equipmentId"
                         treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                         :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请部门"
                         :allow-clear="false" tree-default-expand-all/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationOrderNum" label="申请单号">
          <a-input placeholder="请输入申请单号" v-model="model.applicationOrderNum" />
        <a-form-model-item prop="equipmentId" label="统一编码">
          <lx-search-equipment-select :disabled="!editable||!model.factoryOrgCode"
                                      :placeholder="!model.factoryOrgCode?'请选择申请部门':'请输入统一编码或名称搜索'"
                                      v-model="model.equipmentId" :allow-clear="false"
                                      :factoryOrgCode="model.factoryOrgCode"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicant" label="申请人">
          <a-input placeholder="请输入申请人" v-model="model.applicant" />
        <a-form-model-item prop="evaluationDate" label="技术状态鉴定日期">
          <a-date-picker value-format="YYYY-MM-DD" v-model="model.evaluationDate" :allow-clear="false"
                         style="width: 100%"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryOrgCode" label="申请部门">
          <a-input placeholder="请输入申请部门" v-model="model.factoryOrgCode" />
        <a-form-model-item label="备注">
          <a-textarea placeholder="请输入备注" v-model="model.remark"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applyDate" label="申请日期">
          <a-input placeholder="请输入申请日期" v-model="model.applyDate" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationStatus" label="申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成">
          <a-input placeholder="请输入申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成" v-model="model.applicationStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignature" label="申请单位室级领导签字">
          <a-input placeholder="请输入申请单位室级领导签字" v-model="model.departHeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignatureTime" label="申请单位室级领导签字时间">
          <a-input placeholder="请输入申请单位室级领导签字时间" v-model="model.departHeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderComment" label="申请单位室级领导意见">
          <a-input placeholder="请输入申请单位室级领导意见" v-model="model.departHeaderComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignature" label="生产设备管理主管签字">
          <a-input placeholder="请输入生产设备管理主管签字" v-model="model.productionHeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignatureTime" label="生产设备管理主管签字四件">
          <a-input placeholder="请输入生产设备管理主管签字四件" v-model="model.productionHeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderComment" label="生产设备管理主管意见">
          <a-input placeholder="请输入生产设备管理主管意见" v-model="model.productionHeaderComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignature" label="生产保障部领导签字">
          <a-input placeholder="请输入生产保障部领导签字" v-model="model.productionSupportSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignatureTime" label="生产保障部领导签字时间">
          <a-input placeholder="请输入生产保障部领导签字时间" v-model="model.productionSupportSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportComment" label="生产保障部领导意见">
          <a-input placeholder="请输入生产保障部领导意见" v-model="model.productionSupportComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hfCode" label="HF编码">
          <a-input placeholder="请输入HF编码" v-model="model.hfCode" />
        </a-form-model-item>
		
      </a-form-model>
    </a-spin>
  </j-modal>
@@ -68,89 +32,103 @@

<script>
  import { httpAction } from '@/api/manage'
  import moment from "moment"
  import LxSearchEquipmentSelect from '../../equipment/modules/LxSearchEquipmentSelect'

  export default {
    name: "EamTechnicalStatusEvaluationApplicationModal",
    data () {
    name: 'EamTechnicalStatusEvaluationApplicationModal',
    components: { LxSearchEquipmentSelect },
    props: {
      productionTreeData: {
        type: Array
      }
    },
    data() {
      return {
        title:"操作",
        title: '操作',
        editable: true,
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
          sm: { span: 5 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
          sm: { span: 16 }
        },

        confirmLoading: false,
        validatorRules:{
        validatorRules: {
          factoryOrgCode: [{ required: true, message: '请选择申请部门', trigger: 'change' }],
          equipmentId: [{ required: true, message: '请输入统一编码或名称搜索', trigger: 'change' }],
          evaluationDate: [{ required: true, message: '请选择技术状态鉴定日期', trigger: 'change' }]
        },
        url: {
          add: "/eam/eamTechnicalStatusEvaluationApplication/add",
          edit: "/eam/eamTechnicalStatusEvaluationApplication/edit",
        },
          add: '/eam/eamTechnicalStatusEvaluationApplication/add',
          edit: '/eam/eamTechnicalStatusEvaluationApplication/edit'
        }
      }
    },
    created () {
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
      add() {
        this.model = {}
        this.editable = true
        this.visible = true
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;

      edit(record) {
        this.model = Object.assign({}, record)
        this.editable = false
        this.visible = true
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();
      },
      handleOk () {
        const that = this;

      handleOk() {
        const that = this
        // è§¦å‘表单验证
         this.$refs.form.validate(valid => {
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            that.confirmLoading = true
            let httpurl = ''
            let method = ''
            if (!this.model.id) {
              httpurl += this.url.add
              method = 'post'
            } else {
              httpurl += this.url.edit
              method = 'put'
            }
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
            httpAction(httpurl, this.model, method).then((res) => {
              if (res.success) {
                that.$notification.success({
                  message: '消息',
                  description: res.message
                })
                that.close()
                that.$emit('ok')
              } else {
                that.$notification.warning({
                  message: '消息',
                  description: res.message
                })
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
              that.confirmLoading = false
            })
          }else{
             return false;
          } else {
            return false
          }
        })
      },
      handleCancel () {

      handleCancel() {
        this.close()
      },


      close() {
        this.$emit('close')
        this.visible = false
        this.$refs.form.clearValidate()
      }
    }
  }
</script>

<style lang="less" scoped>

</style>
</script>

 src/views/flowable/workflow/FlowTodo.vue

@@ -110,6 +110,16 @@
    <!--技术状态变更-->
    <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal" :selectShenpiData="selectedRowData"
                                            @modalFormOk="modalFormOk"/>

    <!--技术状态鉴定申请-->
    <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
                                                            :selectShenpiData="selectedRowData"
                                                            @modalFormOk="modalFormOk"/>

    <!--设备停用申请-->
    <technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal"
                                                :selectShenpiData="selectedRowData"
                                                @modalFormOk="modalFormOk"/>
  </a-card>
</template>

@@ -126,11 +136,16 @@
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
  import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
  import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'
  import TechnicalStatusEvaluationApplicationApprovalModal
    from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
  import TechnicalStatusDeactivateApprovalModal from './TechnicalStatus/TechnicalStatusDeactivateApprovalModal'

  export default {
    name: 'FlowTodo',
    mixins: [JeecgListMixin],
    components: {
      TechnicalStatusDeactivateApprovalModal,
      TechnicalStatusEvaluationApplicationApprovalModal,
      TechnicalStatusChangeApprovalModal,
      RepairOrderApprovalModal,
      TechnicalStatusEvaluationOrderChangeApprovalModal,
@@ -245,6 +260,12 @@
          case 'TECHNICAL_STATUS_CHANGE_PROCESS':
            this.handleTechnicalStatusChange(record)
            break
          case 'TECHNICAL_STATUS_EVALUATION_APPLY_PROCESS':
            this.handleTechnicalStatusEvaluationApply(record)
            break
          case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS':
            this.handleTechnicalStatusDeactivate(record)
            break
          default:
            alert('没找到该流程')
        }
@@ -257,9 +278,8 @@
      handleMaintenanceStandard(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.maintenanceStandardApprovalModal.visible = true
        this.$refs.maintenanceStandardApprovalModal.title = '保养规范'
        this.$refs.maintenanceStandardApprovalModal.getAllApproveData(record)
        this.$refs.maintenanceStandardApprovalModal.getBasicInformation(record)
        this.$refs.maintenanceStandardApprovalModal.title = record.name
        this.$refs.maintenanceStandardApprovalModal.handleApprove(record)
      },

      /**
@@ -288,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)
      },

      /**
@@ -335,6 +355,28 @@
        this.$refs.technicalStatusChangeApprovalModal.handleApprove(record)
      },

      /**
       * ç‚¹å‡»æŠ€æœ¯çŠ¶æ€é‰´å®šç”³è¯·åˆ†ç±»æµç¨‹å®¡æ‰¹æ—¶è§¦å‘
       * @param record
       */
      handleTechnicalStatusEvaluationApply(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.name
        this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleApprove(record)
      },

      /**
       * ç‚¹å‡»åœç”¨åŠ å·¥è®¾å¤‡ç”³è¯·åˆ†ç±»æµç¨‹å®¡æ‰¹æ—¶è§¦å‘
       * @param record
       */
      handleTechnicalStatusDeactivate(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.technicalStatusDeactivateApprovalModal.visible = true
        this.$refs.technicalStatusDeactivateApprovalModal.title = record.name
        this.$refs.technicalStatusDeactivateApprovalModal.handleApprove(record)
      },

      batchHandle() {
        const categorySet = new Set(this.selectionRows.map(item => item.category))
        const nameSet = new Set(this.selectionRows.map(item => item.name))

 src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue

@@ -3,7 +3,7 @@
           :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @ok="submitForm"
           @cancel="handleCancel" :mask-closable="false" :confirmLoading="confirmLoading">
    <a-spin :spinning="spinning">
      <a-form-model ref='form' :model='tableRowRecord' :labelCol="labelCol" :wrapperCol="wrapperCol"
      <a-form-model ref='form' :model='model' :labelCol="labelCol" :wrapperCol="wrapperCol"
                    :rules="validatorRules">
        <a-row :gutter="24" id="outer-row">
          <a-col :span="8" class="scroll-col">
@@ -12,12 +12,12 @@
                <a-row>
                  <a-col :span="span">
                    <a-form-model-item prop="standardCode" label="规范编码">
                      <a-input v-model="tableRowRecord.standardCode" readOnly/>
                      <a-input v-model="model.standardCode" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="span">
                    <a-form-model-item prop="standardName" label="规范名称">
                      <a-input v-model="tableRowRecord.standardName" readOnly/>
                      <a-input v-model="model.standardName" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -25,12 +25,12 @@
                <a-row>
                  <a-col :span='span'>
                    <a-form-model-item label="统一编码">
                      <a-input v-model="tableRowRecord.equipmentCode" readOnly/>
                      <a-input v-model="model.equipmentCode" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span='span'>
                    <a-form-model-item label="保养分类">
                      <a-input v-model="tableRowRecord.maintenanceCategory_dictText" readOnly/>
                      <a-input v-model="model.maintenanceCategory_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>

@@ -39,12 +39,12 @@
                <a-row>
                  <a-col :span='span'>
                    <a-form-model-item label="保养周期单位">
                      <a-input v-model="tableRowRecord.periodUnit" readOnly/>
                      <a-input v-model="model.periodUnit" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span='span'>
                    <a-form-model-item label="保养周期">
                      <a-input v-model="tableRowRecord.maintenancePeriod" readOnly/>
                      <a-input v-model="model.maintenancePeriod" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -52,12 +52,12 @@
                <a-row>
                  <a-col :span='span'>
                    <a-form-model-item label="初始日期">
                      <a-input v-model="tableRowRecord.initialDate" readOnly/>
                      <a-input v-model="model.initialDate" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span='span'>
                    <a-form-model-item label="规范状态">
                      <a-input v-model="tableRowRecord.standardStatus_dictText" readOnly/>
                      <a-input v-model="model.standardStatus_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -65,7 +65,7 @@
                <a-row>
                  <a-col :span="span">
                    <a-form-model-item label="规范版本">
                      <a-input v-model="tableRowRecord.standardVersion" readOnly/>
                      <a-input v-model="model.standardVersion" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -76,9 +76,8 @@
          <a-col :span="10" class="scroll-col">
            <a-tabs default-active-key="1">
              <a-tab-pane key="1" tab="保养项明细">
                <j-vxe-table ref="editableDetailTable" :rowNumber="false" :bordered="true"
                             :alwaysEdit="true" :toolbar="false" keep-source :loading="detail.loading"
                             :dataSource="detail.dataSource" :columns="detail.columns">
                <j-vxe-table ref="editableDetailTable" bordered alwaysEdit keep-source :dataSource="detail.dataSource"
                             :columns="detail.columns">
                  <template v-slot:itemCategory="props">
                    <j-dict-select-tag v-model="props.row.itemCategory" :dict-code="encodedDictCode" disabled/>
                  </template>
@@ -94,41 +93,43 @@
          </a-col>

          <a-col :span="6" class="scroll-col">
            <a-tabs>
            <a-tabs v-if="displayRepairLeaderFlag">
              <a-tab-pane tab="维修主任审批">
                <a-row :gutter="24">
                  <a-col :span="24">
                    <a-form-model-item prop="repairManagerApproveResult" label="处理类型">
                      <j-dict-select-tag type='radio' v-model='tableRowRecord.repairManagerApproveResult'
                                         dictCode='approved_rejected'
                                         :disabled="disableSubmit||tableRowRecord.standardStatus!=='WAIT_REPAIR_DIRECTOR'"/>
                    <a-form-model-item prop="repairManagerApproveResult" label="确认类型">
                      <j-dict-select-tag type='radio' v-model='model.repairManagerApproveResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||model.standardStatus!=='WAIT_REPAIR_DIRECTOR'"/>
                    </a-form-model-item>
                  </a-col>

                  <a-col :span="24">
                    <a-form-model-item label="处理意见">
                    <a-form-model-item label="确认意见">
                      <a-textarea placeholder="请输入意见"
                                  :disabled="disableSubmit||tableRowRecord.standardStatus!=='WAIT_REPAIR_DIRECTOR'"
                                  v-model="tableRowRecord.repairManagerApproveComment"/>
                                  :disabled="disableSubmit||model.standardStatus!=='WAIT_REPAIR_DIRECTOR'"
                                  v-model="model.repairManagerApproveComment"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>

            <a-tabs v-if="tableRowRecord.standardStatus&&tableRowRecord.standardStatus!=='WAIT_REPAIR_DIRECTOR'">
            <a-tabs v-if="displayTechnicalDirectorFlag">
              <a-tab-pane tab="技术主管审批">
                <a-row :gutter="24">
                  <a-col :span="24">
                    <a-form-model-item prop="technicalManagerApproveResult" label="处理类型">
                      <j-dict-select-tag type='radio' v-model='tableRowRecord.technicalManagerApproveResult'
                                         dictCode='approved_rejected'/>
                    <a-form-model-item prop="technicalManagerApproveResult" label="确认类型">
                      <j-dict-select-tag type='radio' v-model='model.technicalManagerApproveResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||model.standardStatus!=='WAIT_TECHNICAL_DIRECTOR'"/>
                    </a-form-model-item>
                  </a-col>

                  <a-col :span="24">
                    <a-form-model-item label="处理意见">
                      <a-textarea placeholder="请输入意见" v-model="tableRowRecord.technicalManagerApproveComment"/>
                    <a-form-model-item label="确认意见">
                      <a-textarea placeholder="请输入意见" v-model="model.technicalManagerApproveComment"
                                  :disabled="disableSubmit||model.standardStatus!=='WAIT_TECHNICAL_DIRECTOR'"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
@@ -142,10 +143,9 @@
</template>

<script>
  import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
  import { getAction, downFile, httpAction } from '@api/manage'
  import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect.vue'
  import { JVXETypes } from '@comp/jeecg/JVxeTable'
  import moment from 'moment'

  export default {
    name: 'MaintenanceStandardApprovalModal',
@@ -160,14 +160,10 @@
        span: 12,
        confirmLoading: false,
        spinning: false,
        tableRowRecord: {},
        model: {},
        validatorRules: {
          repairManagerApproveResult: [
            { required: true, message: '请选择处理类型' }
          ],
          technicalManagerApproveResult: [
            { required: true, message: '请选择处理类型' }
          ]
          repairManagerApproveResult: [{ required: true, message: '请选择确认类型' }],
          technicalManagerApproveResult: [{ required: true, message: '请选择确认类型' }]
        },
        imageSrc: null,
        labelCol: {
@@ -188,10 +184,9 @@
          detailList: '/eam/eamMaintenanceStandardDetail/queryList'
        },
        detail: {
          loading: false,
          dataSource: [],
          columns: [],
          defaultColumns: [
          inspectionColumns: [
            {
              title: 'ID',
              key: 'id',
@@ -205,37 +200,90 @@
            {
              title: '项目序号',
              key: 'itemCode',
              type: JVXETypes.inputNumber,
              align: 'center',
              disabled: true
            },
            {
              title: '部位',
              key: 'itemPart',
              type: JVXETypes.textarea,
              align: 'center',
              disabled: true
              type: JVXETypes.normal,
              align: 'center'
            },
            {
              title: '保养项分类',
              key: 'itemCategory',
              type: JVXETypes.slot,
              slotName: 'itemCategory',
              align: 'center'
              align: 'center',
              disabled: true
            },
            {
              title: '保养项目',
              key: 'itemName',
              type: JVXETypes.textarea,
              align: 'center',
              disabled: true
              type: JVXETypes.normal,
              align: 'center'
            },
            {
              title: '保养规范或要求',
              key: 'itemDemand',
              type: JVXETypes.textarea,
              type: JVXETypes.normal,
              align: 'center'
            }
          ],
          secondMaintenanceColumns: [
            {
              title: 'ID',
              key: 'id',
              type: JVXETypes.hidden
            },
            {
              title: 'standardId',
              key: 'standardId',
              type: JVXETypes.hidden
            },
            {
              title: '项目序号',
              key: 'itemCode',
              type: JVXETypes.normal,
              align: 'center'
            },
            {
              title: '保养项分类',
              key: 'itemCategory',
              type: JVXETypes.slot,
              slotName: 'itemCategory',
              align: 'center',
              disabled: true
            },
            {
              title: '保养项目',
              key: 'itemName',
              type: JVXETypes.normal,
              align: 'center'
            }
          ],
          thirdMaintenanceColumns: [
            {
              title: 'ID',
              key: 'id',
              type: JVXETypes.hidden
            },
            {
              title: 'standardId',
              key: 'standardId',
              type: JVXETypes.hidden
            },
            {
              title: '保养部位',
              key: 'itemPart',
              type: JVXETypes.normal,
              align: 'center'
            },
            {
              title: '保养内容',
              key: 'itemName',
              type: JVXETypes.normal,
              align: 'center'
            },
            {
              title: '验收标准',
              key: 'itemDemand',
              type: JVXETypes.normal,
              align: 'center'
            }
          ]
        },
@@ -244,17 +292,36 @@
      }
    },
    watch: {
      'tableRowRecord.maintenanceCategory': {
      'model.maintenanceCategory': {
        handler(val) {
          if (val) {
            if (val != 'THIRD_MAINTENANCE') this.detail.columns = [...this.detail.defaultColumns.filter(item => item.key != 'itemPart')]
            else this.detail.columns = [...this.detail.defaultColumns.filter(item => item.key != 'itemCategory')]
            console.log('val', val)
            switch (val) {
              case 'POINT_INSPECTION':
                this.detail.columns = this.detail.inspectionColumns
                break
              case 'SECOND_MAINTENANCE':
                this.detail.columns = this.detail.secondMaintenanceColumns
                break
              case 'THIRD_MAINTENANCE':
                this.detail.columns = this.detail.thirdMaintenanceColumns
                break
              default:
                break
            }
          }
          else this.detail.columns = [...this.detail.defaultColumns]
        }
      }
    },
    computed: {
      displayRepairLeaderFlag() {
        return this.model.standardStatus && ['WAIT_REPAIR_DIRECTOR', 'WAIT_TECHNICAL_DIRECTOR', 'REJECTED'].includes(this.model.standardStatus)
      },

      displayTechnicalDirectorFlag() {
        return this.model.standardStatus && ['WAIT_TECHNICAL_DIRECTOR', 'REJECTED'].includes(this.model.standardStatus) && this.model.repairManagerApproveResult === '1'
      },

      encodedDictCode() {
        const dictCode = `sys_dict_item,item_text,item_value,dict_id='1940598438685134850'`
        return encodeURIComponent(dictCode)
@@ -262,39 +329,75 @@
    },
    methods: {
      /**
       * èŽ·å–流程节点和流程图
       * @param record å¾…办记录信息
       * ä¸»é¡µé¢ç‚¹å‡»æ‰§è¡Œå®¡æ‰¹æ—¶è§¦å‘
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getAllApproveData(record) {
        if (record.procInstId) {
          const { processDefinitionId, processInstanceId, processDefinitionKey, procInstId } = record
          const imageParam = { processDefinitionId, processInstanceId, TaskDefinitionKey: processDefinitionKey }
          const that = this
          this.imageSrc = null

          downFile(this.url.diagramView, imageParam, 'get')
            .then((res => {
              const urlObject = window.URL.createObjectURL(new Blob([res]))
              that.imageSrc = urlObject
            }))
            .finally(() => {
              this.spinning = false
            })
        }
      handleApprove(record) {
        this.getBasicInformationByApi(record)
        this.getFlowChartImageByApi(record)
      },

      /**
       * èŽ·å–待办记录的基本信息
       * @param record å¾…办记录信息
       * ä¸»é¡µé¢ç‚¹å‡»è¯¦æƒ…时触发
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      async getBasicInformation(record) {
      handleDetail(record) {
        this.detail.dataSource = []
        this.tableRowRecord = {}
        this.model = Object.assign({}, record)
        this.loadDetail(record.id)
      },

      /**
       * èŽ·å–基础信息
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getBasicInformationByApi(record) {
        this.spinning = true
        const param = { id: record.dataId }
        let res = await getAction(this.url.queryById, param)
        this.tableRowRecord = Object.assign({}, res.result.records[0])
        await this.loadDetail(record.dataId)
        this.model = {}
        this.detail.dataSource = []
        const that = this
        getAction(this.url.queryById, { id: record.dataId })
          .then(res => {
            if (res.success) {
              that.model = Object.assign({}, res.result.records[0])
              that.model.dataId = record.dataId
              that.model.taskId = record.id
              that.model.userId = record.assignee
              that.model.instanceId = record.procInstId
            }
            else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
          .finally(() => {
            this.loadDetail(record.dataId)
          })
      },

      /**
       * èŽ·å–流程图
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getFlowChartImageByApi(record) {
        const { processDefinitionId, processInstanceId, processDefinitionKey } = record
        this.imageSrc = null
        downFile(this.url.diagramView, {
          processDefinitionId,
          processInstanceId,
          TaskDefinitionKey: processDefinitionKey
        }, 'get')
          .then((res => {
            this.imageSrc = window.URL.createObjectURL(new Blob([res]))
          }))
          .catch(err => {
            this.$notification.error({
              message: '消息',
              description: err.message
            })
          })
      },

      /**
@@ -302,14 +405,13 @@
       * @param dataId ä¸šåŠ¡ID
       */
      loadDetail(dataId) {
        if (dataId) {
          getAction(this.url.detailList, { standardId: dataId })
            .then(res => {
              if (res.success) {
                this.detail.dataSource = [...res.result]
              }
            })
        }
        getAction(this.url.detailList, { standardId: dataId })
          .then(res => {
            if (res.success) this.detail.dataSource = res.result
          })
          .finally(() => {
            this.spinning = false
          })
      },

      async submitForm() {
@@ -321,21 +423,8 @@
        this.$refs.form.validate(valid => {
          if (valid) {
            this.confirmLoading = this.spinning = true
            const flowTaskVo = {}
            flowTaskVo.dataId = this.selectShenpiData.dataId
            flowTaskVo.taskId = this.selectShenpiData.id
            flowTaskVo.userId = this.selectShenpiData.assignee
            flowTaskVo.instanceId = this.selectShenpiData.procInstId
            if (this.tableRowRecord.standardStatus == 'WAIT_REPAIR_DIRECTOR') {
              flowTaskVo.repairManagerApproveResult = this.tableRowRecord.repairManagerApproveResult
              flowTaskVo.repairManagerApproveComment = this.tableRowRecord.repairManagerApproveComment
            } else {
              flowTaskVo.technicalManagerApproveResult = this.tableRowRecord.technicalManagerApproveResult
              flowTaskVo.technicalManagerApproveComment = this.tableRowRecord.technicalManagerApproveComment
            }
            const that = this
            console.log('表单提交数据', flowTaskVo)
            httpAction(this.url.approve, flowTaskVo, 'post')
            httpAction(this.url.approve, that.model, 'post')
              .then((res) => {
                if (res.success) {
                  that.$notification.success({

 src/views/flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal.vue

@@ -231,10 +231,10 @@
    },
    computed: {
      displayDepartHeaderFlag() {
        return this.model.changeStatus && ['DEPART_HEADER_SIGNING', 'DEPART_LEADER_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
        return this.model.changeStatus && ['DEPART_HEADER_SIGNING', 'DEPART_LEADER_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus)
      },
      displayDepartLeaderFlag() {
        return this.model.changeStatus && ['DEPART_LEADER_SIGNING', 'COMPLETED'].includes(this.model.changeStatus)
        return this.model.changeStatus && ['DEPART_LEADER_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.changeStatus) && this.model.departHeaderSignatureResult === '1'
      }
    },
    methods: {

 src/views/flowable/workflow/TechnicalStatus/TechnicalStatusDeactivateApprovalModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,386 @@
<template>
  <j-modal :title="title" fullscreen :visible="visible" :confirmLoading="confirmLoading"
           :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @ok="handleOk"
           @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row id="outer-row" :gutter="24">
          <!--左侧基础信息列-->
          <a-col :span="8" class="scroll-col">
            <a-tabs>
              <a-tab-pane tab="基础信息">
                <a-row>
                  <a-col :span="12">
                    <a-form-model-item label="停用单号">
                      <a-input v-model="model.deactivateOrderNum" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="12">
                    <a-form-model-item label="申请单位">
                      <a-input v-model="model.factoryOrgCode_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

                <a-row>
                  <a-col :span="12">
                    <a-form-model-item label="申请人">
                      <a-input v-model="model.applicant_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="12">
                    <a-form-model-item label="申请时间">
                      <a-input v-model="model.applyDate" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

                <a-row>
                  <a-col :span="24">
                    <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="备注">
                      <a-textarea v-model="model.remark" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>
          </a-col>

          <!-- ä¸­é—´æ˜Žç»†é¡¹åˆ—-->
          <a-col :span="10" class="scroll-col">
            <a-tabs>
              <a-tab-pane key="1" tab="设备明细">
                <j-vxe-table ref="editableDetailTable" rowNumber bordered keep-source :dataSource="detail.dataSource"
                             :columns="detail.columns"/>
              </a-tab-pane>
              <a-tab-pane key='2' tab='流程图' v-if="selectShenpiData.procInstId">
                <img :src="imageSrc" alt="Fetched Image" style="width: 100%" v-if="imageSrc"/>
              </a-tab-pane>
            </a-tabs>
          </a-col>

          <!--右侧审批列-->
          <a-col :span="6" class="scroll-col">
            <a-tabs v-if="displayDepartHeaderFlag">
              <a-tab-pane tab="使用单位室级领导确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="departHeaderSignatureResult" label="确认类型" :labelCol="rightColLabelCol"
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.departHeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :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')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>

            <a-tabs v-if="displayDepartLeaderFlag||(disableSubmit&&model.departLeaderSignatureResult==='2')">
              <a-tab-pane tab="使用单位部级领导确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="departLeaderSignatureResult" label="确认类型" :labelCol="rightColLabelCol"
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.departLeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='DEPART_LEADER_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.departLeaderComment"
                                  :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!=='DEPART_LEADER_SIGNING')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
  import { downFile, getAction, postAction } from '@/api/manage'
  import TechnicalStatusEquipmentSelect from '../../../eam/equipment/modules/TechnicalStatusEquipmentSelect'
  import { JVXETypes } from '@comp/jeecg/JVxeTable'

  export default {
    name: 'TechnicalStatusDeactivateApprovalModal',
    components: {
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {
        type: Object
      }
    },
    data() {
      return {
        title: '操作',
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 8 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 }
        },
        labelColLong: {
          xs: { span: 24 },
          sm: { span: 4 }
        },
        wrapperColLong: {
          xs: { span: 24 },
          sm: { span: 20 }
        },
        rightColLabelCol: {
          xs: { span: 24 },
          sm: { span: 6 }
        },
        rightColWrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 }
        },
        confirmLoading: false,
        spinning: false,
        imageSrc: null,
        validatorRules: {
          departHeaderSignatureResult: [{ required: true, message: '请选择确认类型' }],
          departLeaderSignatureResult: [{ required: true, message: '请选择确认类型' }]
        },
        url: {
          queryById: '/eam/eamTechnicalStatusDeactivate/queryById',
          approval: '/eam/eamTechnicalStatusDeactivate/approval',
          detail: '/eam/eamTechnicalStatusDeactivateDetail/queryList',
          diagramView: '/assign/flow/diagramView'
        },
        disableSubmit: false,
        selectedRowKeys: [],
        detail: {
          dataSource: [],
          columns: [
            {
              title: 'ID',
              key: 'id',
              type: JVXETypes.hidden
            },
            {
              title: '统一编码',
              key: 'equipmentCode',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '设备名称',
              key: 'equipmentName',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '设备型号',
              key: 'equipmentModel',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '使用单位',
              key: 'factoryName',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '停用原因',
              key: 'deactivateReason',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            },
            {
              title: '已停用时长',
              key: 'deactivateDuration',
              align: 'center',
              type: JVXETypes.normal,
              width: 200
            }
          ]
        }
      }
    },
    computed: {
      displayDepartHeaderFlag() {
        return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'DEPART_LEADER_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus)
      },
      displayDepartLeaderFlag() {
        return this.model.applicationStatus && ['DEPART_LEADER_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus) && this.model.departHeaderSignatureResult === '1'
      }
    },
    methods: {
      /**
       * ä¸»é¡µé¢ç‚¹å‡»æ‰§è¡Œå®¡æ‰¹æ—¶è§¦å‘
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      handleApprove(record) {
        this.model = {}
        this.getBasicInformationByApi(record)
        this.getFlowChartImageByApi(record)
      },

      /**
       * ä¸»é¡µé¢ç‚¹å‡»è¯¦æƒ…时触发
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      handleDetail(record) {
        this.model = Object.assign({}, record)
        this.loadDetail(record.id)
      },

      /**
       * èŽ·å–基础信息
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getBasicInformationByApi(record) {
        this.spinning = true
        const that = this
        getAction(this.url.queryById, { id: record.dataId })
          .then(res => {
            if (res.success) {
              that.model = Object.assign({}, res.result)
              that.model.dataId = record.dataId
              that.model.taskId = record.id
              that.model.userId = record.assignee
              that.model.instanceId = record.procInstId
            }
            else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
          .finally(() => {
            this.loadDetail(record.dataId)
          })
      },

      /**
       * èŽ·å–流程图
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getFlowChartImageByApi(record) {
        const { processDefinitionId, processInstanceId, processDefinitionKey } = record
        this.imageSrc = null
        downFile(this.url.diagramView, {
          processDefinitionId,
          processInstanceId,
          TaskDefinitionKey: processDefinitionKey
        }, 'get')
          .then((res => {
            this.imageSrc = window.URL.createObjectURL(new Blob([res]))
          }))
          .catch(err => {
            this.$notification.error({
              message: '消息',
              description: err.message
            })
          })
      },

      /**
       * èŽ·å–设备明细
       * @param applicationId
       */
      loadDetail(applicationId) {
        this.detail.dataSource = []
        getAction(this.url.detail, { applicationId })
          .then(res => {
            if (res.success) this.detail.dataSource = res.result
          })
          .finally(() => {
            this.spinning = false
          })
      },

      async handleOk() {
        const that = this

        // è§¦å‘表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = that.spinning = true

            postAction(that.url.approval, that.model)
              .then((res) => {
                if (res.success) {
                  that.$notification.success({
                    message: '消息',
                    description: res.message
                  })
                  that.$emit('modalFormOk')
                  that.close()
                } else {
                  that.$notification.warning({
                    message: '消息',
                    description: res.message
                  })
                }
              })
              .finally(() => {
                that.confirmLoading = that.spinning = false
              })
          } else {
            return false
          }
        })
      },

      handleCancel() {
        this.close()
      },

      close() {
        this.$emit('close')
        this.visible = false
        this.$refs.form.clearValidate()
      }
    }
  }
</script>

<style scoped lang="less">
  /deep/ .ant-spin-nested-loading {
    height: 100%;

    .ant-spin-container {
      height: 100%;

      .ant-form {
        height: 100%;

        #outer-row {
          height: 100%;

          .scroll-col {
            height: 100%;
            overflow: auto;
          }
        }
      }
    }
  }
</style>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,353 @@
<template>
  <j-modal :title="title" :width="1300" :fullscreen="fullScreen" :visible="visible" :confirmLoading="confirmLoading"
           :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @ok="handleOk"
           @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row id="outer-row" :gutter="24">
          <!--左侧基础信息列-->
          <a-col :span="!disableSubmit?8:14" class="scroll-col">
            <a-tabs>
              <a-tab-pane tab="基础信息">
                <a-row>
                  <a-col :span="12">
                    <a-form-model-item label="申请单号">
                      <a-input v-model="model.applicationOrderNum" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="12">
                    <a-form-model-item label="统一编码">
                      <technical-status-equipment-select v-model="model.equipmentId"
                                                         @autocompleteForm="autocompleteForm" disabled/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

                <a-row>


                </a-row>

                <a-row>
                  <a-col :span="12">
                    <a-form-model-item label="申请部门">
                      <a-input v-model="model.factoryOrgCode_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span="12">
                    <a-form-model-item label="申请人">
                      <a-input v-model="model.applicant_dictText" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

                <a-row>
                  <a-col :span="12">
                    <a-form-model-item label="技术状态鉴定日期">
                      <a-input v-model="model.evaluationDate" readOnly/>
                    </a-form-model-item>
                  </a-col>
                </a-row>

                <a-row>
                  <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="备注">
                    <a-textarea v-model="model.remark" readOnly/>
                  </a-form-model-item>
                </a-row>
              </a-tab-pane>
            </a-tabs>
          </a-col>

          <!-- ä¸­é—´æ˜Žç»†é¡¹åˆ—-->
          <a-col v-if="selectShenpiData.procInstId" :span="10" class="scroll-col">
            <a-tabs>
              <a-tab-pane key='1' tab='流程图'>
                <img :src="imageSrc" alt="Fetched Image" style="width: 100%" v-if="imageSrc"/>
              </a-tab-pane>
            </a-tabs>
          </a-col>

          <!--右侧审批列-->
          <a-col :span="!disableSubmit?6:10" class="scroll-col">
            <a-tabs v-if="displayDepartHeaderFlag">
              <a-tab-pane tab="使用单位室级领导确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="departHeaderSignatureResult" label="确认类型" :labelCol="rightColLabelCol"
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.departHeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :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')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>

            <a-tabs v-if="displayProductionHeaderFlag">
              <a-tab-pane tab="生产设备管理主管确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="productionHeaderSignatureResult" label="确认类型" :labelCol="rightColLabelCol"
                                       :wrapperCol="rightColWrapperCol">
                      <j-dict-select-tag type='radio' v-model='model.productionHeaderSignatureResult'
                                         dictCode='approve_reject'
                                         :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')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>

            <a-tabs v-if="displayProductionSupportFlag">
              <a-tab-pane tab="生产保障部领导确认">
                <a-row>
                  <a-col :span="24">
                    <a-form-model-item prop="productionSupportSignatureResult" label="确认类型"
                                       :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')"/>
                    </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')"/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-tab-pane>
            </a-tabs>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
  import { downFile, getAction, postAction } from '@/api/manage'
  import TechnicalStatusEquipmentSelect from '../../../eam/equipment/modules/TechnicalStatusEquipmentSelect'

  export default {
    name: 'TechnicalStatusEvaluationApplicationApprovalModal',
    components: {
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {
        type: Object
      }
    },
    data() {
      return {
        title: '操作',
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 10 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 14 }
        },
        labelColLong: {
          xs: { span: 24 },
          sm: { span: 5 }
        },
        wrapperColLong: {
          xs: { span: 24 },
          sm: { span: 19 }
        },
        rightColLabelCol: {
          xs: { span: 24 },
          sm: { span: 6 }
        },
        rightColWrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 }
        },
        confirmLoading: false,
        spinning: false,
        imageSrc: null,
        fullScreen: true,
        validatorRules: {
          departHeaderSignatureResult: [{ required: true, message: '请选择确认类型' }],
          productionHeaderSignatureResult: [{ required: true, message: '请选择确认类型' }],
          productionSupportSignatureResult: [{ required: true, message: '请选择确认类型' }]
        },
        url: {
          queryById: '/eam/eamTechnicalStatusEvaluationApplication/queryById',
          approval: '/eam/eamTechnicalStatusEvaluationApplication/approval',
          diagramView: '/assign/flow/diagramView'
        },
        disableSubmit: false,
        selectedRowKeys: []
      }
    },
    computed: {
      displayDepartHeaderFlag() {
        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', 'REJECTED'].includes(this.model.applicationStatus) && this.model.departHeaderSignatureResult === '1'
      },
      displayProductionSupportFlag() {
        return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED', 'REJECTED'].includes(this.model.applicationStatus) && this.model.productionHeaderSignatureResult === '1'
      }
    },
    methods: {
      /**
       * ä¸»é¡µé¢ç‚¹å‡»æ‰§è¡Œå®¡æ‰¹æ—¶è§¦å‘
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      handleApprove(record) {
        this.fullScreen = true
        this.model = {}
        this.getBasicInformationByApi(record)
        this.getFlowChartImageByApi(record)
      },

      /**
       * ä¸»é¡µé¢ç‚¹å‡»è¯¦æƒ…时触发
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      handleDetail(record) {
        this.fullScreen = false
        this.model = Object.assign({}, record)
      },

      /**
       * èŽ·å–基础信息
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getBasicInformationByApi(record) {
        this.spinning = true
        const that = this
        getAction(this.url.queryById, { id: record.dataId })
          .then(res => {
            if (res.success) {
              that.model = Object.assign({}, res.result)
              that.model.dataId = record.dataId
              that.model.taskId = record.id
              that.model.userId = record.assignee
              that.model.instanceId = record.procInstId
            }
            else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
            }
          })
      },

      /**
       * èŽ·å–流程图
       * @param record ä¸»é¡µé¢åˆ—表行记录
       */
      getFlowChartImageByApi(record) {
        const { processDefinitionId, processInstanceId, processDefinitionKey } = record
        this.imageSrc = null
        downFile(this.url.diagramView, {
          processDefinitionId,
          processInstanceId,
          TaskDefinitionKey: processDefinitionKey
        }, 'get')
          .then((res => {
            this.imageSrc = window.URL.createObjectURL(new Blob([res]))
          }))
          .catch(err => {
            this.$notification.error({
              message: '消息',
              description: err.message
            })
          })
      },

      async handleOk() {
        const that = this
        // è§¦å‘表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = that.spinning = true

            postAction(this.url.approval, this.model)
              .then((res) => {
                if (res.success) {
                  that.$notification.success({
                    message: '消息',
                    description: res.message
                  })
                  that.$emit('modalFormOk')
                  that.close()
                } else {
                  that.$notification.warning({
                    message: '消息',
                    description: res.message
                  })
                }
              })
              .finally(() => {
                that.confirmLoading = that.spinning = false
              })
          } else {
            return false
          }
        })
      },

      autocompleteForm(selectObj) {
        this.$set(this.model, 'equipmentId', selectObj.equipmentId)
        this.spinning = false
      },

      handleCancel() {
        this.close()
      },

      close() {
        this.$emit('close')
        this.visible = false
        this.$refs.form.clearValidate()
      }
    }
  }
</script>

<style scoped lang="less">
  /deep/ .ant-spin-nested-loading {
    height: 100%;

    .ant-spin-container {
      height: 100%;

      .ant-form {
        height: 100%;

        #outer-row {
          height: 100%;

          .scroll-col {
            height: 100%;
            overflow: auto;
          }
        }
      }
    }
  }
</style>

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

@@ -53,10 +53,10 @@

            <a-tabs :active-key="activeTabKey" @change="handleTabChange">
              <a-tab-pane :key="1" tab="安全装置检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.safetyEquipmentCheckList.length>0">
                <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source :height="300"
                          v-if="(disableSubmit&&detail.safetyEquipmentCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm'))||
                          (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source
                             :dataSource="detail.safetyEquipmentCheckList"
                             :columns="detail.safetyEquipmentCheckColumns">
                  <template v-slot:safetyEquipmentCheckResult="props">
@@ -93,11 +93,11 @@
              </a-tab-pane>

              <a-tab-pane :key="2" tab="设备精度检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.precisionCheckList.length>0">
                          v-if="(disableSubmit&&detail.precisionCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm'))||
                         (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable2" rowNumber bordered
                             alwaysEdit keep-source :height="300"
                             alwaysEdit keep-source
                             :dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
                  <template v-slot:precisionCheckResult="props">
                    <a-input-number v-model="props.row.precisionCheckResult"
@@ -132,11 +132,11 @@
              </a-tab-pane>

              <a-tab-pane :key="3" tab="其他检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.otherCheckList.length>0">
                          v-if="(disableSubmit&&detail.otherCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm'))||
                          (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable3" rowNumber bordered
                             alwaysEdit keep-source :height="300"
                             alwaysEdit keep-source
                             :dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
                  <template v-slot:otherCheckResult="props">
                    <a-textarea v-model="props.row.otherCheckResult" :rows="1"
@@ -323,7 +323,7 @@
    name: 'TechnicalStatusEvaluationApprovalModal',
    mixins: [JVxeTableModelMixin],
    components: {
      TechnicalStatusEquipmentSelect,
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {

 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/leanOut/EquipmentLeanOutApprovalModal.vue

ÎļþÒÑɾ³ý

 src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue

ÎļþÒÑɾ³ý

 src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue

ÎļþÒÑɾ³ý

 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)

 src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue

ÎļþÒÑɾ³ý

 src/views/flowable/workflow/weekMaintenance/WeekMaintenanceBatchApprovalModal.vue

ÎļþÒÑɾ³ý