设备归属功能增加

cuikaidong

2025-05-26 5546db8dd730b8b6be737021b607be417a3b63fb

设备归属功能增加

 src/views/eam/dispose/EamEquipmentLeanOutList.vue

@@ -86,7 +86,7 @@
            </a-dropdown>
          </template>
           <template v-else>
              <a @click="handleDetail(record)">详情</a>
             <a href="javascript:;" @click="handleDetail(record)">详情</a>
          </template>
        </span>


 src/views/eam/dispose/EamEquipmentTransferList.vue

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

    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
    <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 :lg='7' :md='8' :sm='24' :xl='6'>
            <a-form-item label='设备编号'>
              <lx-search-equipment-select v-model='queryParam.equipmentId'
                                          placeholder='请输入设备编号或名称搜索'></lx-search-equipment-select>
            </a-form-item>

          </a-col>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
            <a-form-item label='单据号'>
              <a-input v-model='queryParam.code' placeholder='请输入单据号'></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.code"></a-input>
          <template v-if='toggleSearchStatus'>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='调出部门'>
                <a-input v-model='queryParam.oldDepartId' placeholder='请输入调出部门'></a-input>
            </a-form-item>
          </a-col>
        <template v-if="toggleSearchStatus">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备ID">
              <a-input placeholder="请输入设备ID" v-model="queryParam.equipmentId"></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.oldDepartId"></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.newDepartId"></a-input>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='调入部门'>
                <a-input v-model='queryParam.newDepartId' placeholder='请输入调入部门'></a-input>
            </a-form-item>
          </a-col>
          </template>
          <a-col :xl="6" :lg="7" :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="primary" @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>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
            <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
              <a-button icon='search' type='primary' @click='searchQuery'>查询</a-button>
              <a-button icon='reload' style='margin-left: 8px' type='primary' @click='searchReset'>重置</a-button>
<!--              <a style='margin-left: 8px' @click='handleToggleSearch'>-->
<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
<!--              </a>-->
            </span>
          </a-col>

@@ -49,54 +46,67 @@
    </div>

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <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>
    <div class='table-operator'>
      <a-button icon='plus' type='primary' @click='handleAdd'>新增</a-button>
      <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-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 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"
        ref='table'
        :columns='columns'
        :dataSource='dataSource'
        :loading='loading'
        :pagination='ipagination'
        :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
        :scroll="{ x: 'max-content' }"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
        class='j-table-force-nowrap'
        rowKey='id'
        size='middle'
        @change='handleTableChange'>

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
        <span slot='action' slot-scope='text, record'>
          <template v-if="record.transferStatus === 'WAIT_SUBMIT'">
              <a-popconfirm title='确定提交吗?' @confirm='() => handleSubmit(record.id)'>
              <a>提交</a>
            </a-popconfirm>
              <a-divider type='vertical' />

          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
            <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 @click='handleEdit(record)'>编辑</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title='确定删除吗?' @confirm='() => handleDelete(record.id)'>
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
            </template>
          <template v-else>
            <a href='javascript:;' @click='handleDetail(record)'>详情</a>
          </template>
        </span>

      </a-table>
@@ -104,7 +114,7 @@
    <!-- table区域-end -->

    <!-- è¡¨å•åŒºåŸŸ -->
    <eamEquipmentTransfer-modal ref="modalForm" @ok="modalFormOk"></eamEquipmentTransfer-modal>
    <eamEquipmentTransfer-modal ref='modalForm' @ok='modalFormOk'></eamEquipmentTransfer-modal>
  </a-card>
</template>

@@ -112,12 +122,16 @@
  import '@/assets/less/TableExpand.less'
  import EamEquipmentTransferModal from './modules/EamEquipmentTransferModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@api/manage'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'


  export default {
    name: "EamEquipmentTransferList",
  name: 'EamEquipmentTransferList',
    mixins:[JeecgListMixin],
    components: {
      EamEquipmentTransferModal
    EamEquipmentTransferModal,
    LxSearchEquipmentSelect
    },
    data () {
      return {
@@ -129,94 +143,131 @@
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
          fixed: 'left',
          align: 'center',
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            return parseInt(index) + 1
            }
           },
           {
            title: '删除标记',
            align:"center",
            dataIndex: 'delFlag'
           },
           {
            title: '单据号',
            align:"center",
          align: 'center',
          fixed: 'left',
            dataIndex: 'code'
           },
           {
            title: '设备ID',
            align:"center",
            dataIndex: 'equipmentId'
          title: '设备编号',
          align: 'center',
          fixed: 'left',
          dataIndex: 'equipmentCode'
        },
        {
          title: '设备名称',
          align: 'center',
          fixed: 'left',
          dataIndex: 'equipmentName'
           },
           {
            title: '调出部门',
            align:"center",
            dataIndex: 'oldDepartId'
          align: 'center',
          dataIndex: 'oldDepartId_dictText'
           },
           {
            title: '调入部门',
            align:"center",
            dataIndex: 'newDepartId'
          align: 'center',
          dataIndex: 'newDepartId_dictText'
           },
           {
            title: '申请人',
            align:"center",
            dataIndex: 'reportUser'
          align: 'center',
          dataIndex: 'reportUser_dictText'
           },
           {
            title: '变动原因',
            align:"center",
          align: 'center',
            dataIndex: 'transferReason'
           },
           {
            title: '变动状态',
            align:"center",
            dataIndex: 'transferStatus'
          align: 'center',
          dataIndex: 'transferStatus_dictText'
           },
           {
            title: '变动日期',
            align:"center",
          align: 'center',
            dataIndex: 'transferTime'
           },
           {
            title: '审核人',
            align:"center",
            dataIndex: 'approvalUser'
          align: 'center',
          dataIndex: 'approvalUser_dictText'
        },
        {
          title: '审核意见',
          align: 'center',
          dataIndex: 'approvalComment'
           },
           {
            title: '审核时间',
            align:"center",
          align: 'center',
            dataIndex: 'approvalTime'
           },
           {
            title: '备注',
            align:"center",
          align: 'center',
            dataIndex: 'remark'
           },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },
          align: 'center',
          fixed: 'right',
          width: 150,
          scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/eam/eamEquipmentTransfer/list",
          delete: "/eam/eamEquipmentTransfer/delete",
          deleteBatch: "/eam/eamEquipmentTransfer/deleteBatch",
          exportXlsUrl: "eam/eamEquipmentTransfer/exportXls",
          importExcelUrl: "eam/eamEquipmentTransfer/importExcel",
       },
        list: '/eam/eamEquipmentTransfer/list',
        delete: '/eam/eamEquipmentTransfer/delete',
        deleteBatch: '/eam/eamEquipmentTransfer/deleteBatch',
        submit: '/eam/eamEquipmentTransfer/submit'
      }
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
    methods: {
     
    handleSubmit(id) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')
        return
      }
      let that = this
      this.loading = true
      getAction(that.url.submit, { id: id }).then((res) => {
        if (res.success) {
          //重新计算分页问题
          that.reCalculatePage(1)
          // that.$message.success(res.message);
          that.$notification.success({
            message: '消息',
            description: res.message
          })
          that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message: '消息',
            description: res.message
          })
        }
      }).finally(()=>{
        this.loading = false
      })
    }
    }
  }
</script>

 src/views/eam/dispose/modules/EamEquipmentLeanOutModal.vue

@@ -3,6 +3,7 @@
    :title="title"
    :width="800"
    :visible="visible"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
@@ -15,12 +16,13 @@
          <a-input placeholder="编码系统自动生成" v-model="model.code" disabled />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备编号">
          <lx-search-equipment-select placeholder="请输入设备编号或名称搜索"
          <lx-search-equipment-select placeholder="请输入设备编号或名称搜索" :disabled="disableSubmit"
                                      v-model="model.equipmentId"></lx-search-equipment-select>
        </a-form-model-item>

        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanDepartId" label="借入车间">
          <a-tree-select v-model="model.leanDepartId"
                         :disabled="disableSubmit"
                         style="width: 100%"
                         :tree-data="treeData"
                         :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -31,10 +33,10 @@
          </a-tree-select>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanReason" label="借用原因">
          <a-textarea placeholder="请输入借用原因" v-model="model.leanReason" />
          <a-textarea placeholder="请输入借用原因" :disabled="disableSubmit" v-model="model.leanReason" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
          <a-textarea placeholder="请输入备注" v-model="model.remark" />
          <a-textarea placeholder="请输入备注" :disabled="disableSubmit" v-model="model.remark" />
        </a-form-model-item>
      </a-form-model>
    </a-spin>
@@ -98,8 +100,9 @@
        this.model = Object.assign({}, record)
        this.visible = true
        this.editable = true
        this.loadDetail(record.id)
        // this.loadDetail(record.id)
      },

      close () {
        this.$emit('close');
        this.visible = false;

 src/views/eam/dispose/modules/EamEquipmentScrapModal.vue

@@ -3,6 +3,7 @@
    :title="title"
    :width="800"
    :visible="visible"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"

 src/views/eam/dispose/modules/EamEquipmentSealUpModal.vue

@@ -3,6 +3,7 @@
    :title="title"
    :width="800"
    :visible="visible"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
@@ -15,14 +16,14 @@
          <a-input placeholder="编码系统自动生成" v-model="model.code" disabled />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备编号">
          <lx-search-equipment-select placeholder="请输入设备编号或名称搜索"
          <lx-search-equipment-select placeholder="请输入设备编号或名称搜索" :disabled="disableSubmit"
                                      v-model="model.equipmentId"></lx-search-equipment-select>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sealUpReason" label="封存原因">
          <a-input placeholder="请输入封存原因" v-model="model.sealUpReason" />
          <a-input placeholder="请输入封存原因" :disabled="disableSubmit" v-model="model.sealUpReason" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
          <a-input placeholder="请输入备注" v-model="model.remark" />
          <a-input placeholder="请输入备注" :disabled="disableSubmit" v-model="model.remark" />
        </a-form-model-item>

      </a-form-model>

 src/views/eam/dispose/modules/EamEquipmentTransferModal.vue

@@ -3,6 +3,7 @@
    :title="title"
    :width="800"
    :visible="visible"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
@@ -11,42 +12,33 @@
    
    <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="code" label="单据号">
          <a-input placeholder="请输入单据号" v-model="model.code" />
          <a-input placeholder="编码系统自动生成" v-model="model.code"  disabled/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备ID">
          <a-input placeholder="请输入设备ID" v-model="model.equipmentId" />
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="调出设备">
          <lx-search-equipment-select placeholder="请输入设备编号或名称搜索"
                                      v-model="model.equipmentId"  :disabled="disableSubmit"></lx-search-equipment-select>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldDepartId" label="调出部门">
          <a-input placeholder="请输入调出部门" v-model="model.oldDepartId" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newDepartId" label="调入部门">
          <a-input placeholder="请输入调入部门" v-model="model.newDepartId" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser" label="申请人">
          <a-input placeholder="请输入申请人" v-model="model.reportUser" />
<!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldDepartId" label="调出部门">-->
<!--          <a-input placeholder="请输入调出部门" v-model="model.oldDepartId" />-->
<!--        </a-form-model-item>-->
          <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newDepartId" label="调入车间">
            <a-tree-select v-model="model.newDepartId"
                           style="width: 100%"
                           :tree-data="treeData"
                           :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                           placeholder="请选择调入车间"
                           allow-clear
                           tree-default-expand-all
                           :disabled="editable || disableSubmit"
            >
            </a-tree-select>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="transferReason" label="变动原因">
          <a-input placeholder="请输入变动原因" v-model="model.transferReason" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="transferStatus" label="变动状态">
          <a-input placeholder="请输入变动状态" v-model="model.transferStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="transferTime" label="变动日期">
          <a-input placeholder="请输入变动日期" v-model="model.transferTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalUser" label="审核人">
          <a-input placeholder="请输入审核人" v-model="model.approvalUser" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalTime" label="审核时间">
          <a-input placeholder="请输入审核时间" v-model="model.approvalTime" />
          <a-input placeholder="请输入变动原因" v-model="model.transferReason"  :disabled="disableSubmit"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
          <a-input placeholder="请输入备注" v-model="model.remark" />
          <a-textarea placeholder="请输入备注" v-model="model.remark"  :disabled="disableSubmit"/>
        </a-form-model-item>
        
      </a-form-model>
@@ -55,11 +47,12 @@
</template>

<script>
  import { httpAction } from '@/api/manage'
  import moment from "moment"
  import { httpAction,getAction } from '@/api/manage'
  import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'

  export default {
    name: "EamEquipmentTransferModal",
    components: { LxSearchEquipmentSelect },
    data () {
      return {
        title:"操作",
@@ -73,22 +66,52 @@
          xs: { span: 24 },
          sm: { span: 16 },
        },

        labelColLong: {
          xs: { span: 24 },
          sm: { span: 4 }
        },
        wrapperColLong: {
          xs: { span: 24 },
          sm: { span: 18 }
        },
        treeData: [],
        confirmLoading: false,
        validatorRules:{
          newDepartId: [
            { required: true, message: '请选择调入车间' }
          ],
          equipmentId: [
            { required: true, message: '请选择设备！' }
          ],
          transferReason: [
            { required: true, message: '请输入变动原因！' }
          ],
        },
        url: {
          add: "/eam/eamEquipmentTransfer/add",
          edit: "/eam/eamEquipmentTransfer/edit",
          loadProductionOptions:'/mdc/mdcProduction/loadProductionTreeOptions',
        },
      }
    },
    created () {
      this.loadAllProductionTree();
    },
    methods: {
      loadAllProductionTree() {
        //加载车间选择树
        getAction(this.url.loadProductionOptions).then(res => {
          if (res.success) {
            this.treeData = [...res.result]
          }else {
            that.$message.warning(res.message)
          }
        })
      },
      add () {
        //初始化默认值
        this.edit({});
        this.visible = true;
      },
      edit (record) {
        this.model = Object.assign({}, record);

 src/views/flowable/workflow/FlowTodo.vue

@@ -138,6 +138,7 @@
    <equipment-seal-up-approval-modal ref="equipmentSealUpApprovalModelRef" @searchReset="searchReset" />
    <inbound-order-handle ref="inboundOrderApprovalModal" :selectInboundOrderData="selectInboundOrderData"
                                     @searchReset="searchReset"></inbound-order-handle>
    <equipment-transfer-approval-modal ref="equipmentTransferApprovalModelRef" @searchReset="searchReset" />
  </a-card>
</template>

@@ -159,10 +160,10 @@
import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import SecondMaintenanceApprovalModal
  from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue'
@@ -187,7 +188,8 @@
    ThirdMaintenanceApprovalModal,
    OutBoundOrderHandle,
    EquipmentSealUpApprovalModal,
    InboundOrderHandle
    InboundOrderHandle,
    EquipmentTransferApprovalModal
  },
  data() {
    return {
@@ -368,6 +370,9 @@
        case 'toolInStorageApproval':
          this.handleToolInStorage(item)
          break
        case 'equipment_transfer':
          this.handleEquipmentTransfer(item)
          break
        default:
          alert('没找到该流程')
      }
@@ -512,6 +517,12 @@
          this.$refs.inboundOrderApprovalModal.getAllApproveData(item)
      }
    },
    handleEquipmentTransfer(item) {
      this.$refs.equipmentTransferApprovalModelRef.visible = true
      this.$refs.equipmentTransferApprovalModelRef.title = item.name
      this.$refs.equipmentTransferApprovalModelRef.handleDetail(item)
      this.$refs.equipmentTransferApprovalModelRef.disableSubmit = false
    },
  }
}
</script>

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

@@ -161,7 +161,7 @@
  },
  computed: {
    approvalDisable: function() {
      return ['SEALED', 'WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
      return ['WAIT_CHECK','SEALED', 'WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
    },
    returnDisable: function() {
      return ['SEALED', 'WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)

 src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,235 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :visible="visible"
    :confirmLoading="confirmLoading"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    centered
    cancelText="关闭">

    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> å½’属信息
        </a-divider>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="单据号">
              <a-input v-model="model.code" disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备编码">
              <lx-search-equipment-select placeholder="请输入设备编号或名称搜索"
                                          v-model="model.equipmentId" disabled></lx-search-equipment-select>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newDepartId_dictText" label="调入部门">
              <a-input v-model="model.newDepartId_dictText" disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldDepartId_dictText" label="调出部门">
              <a-input v-model="model.oldDepartId_dictText" disabled />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser_dictText" label="申请人">
              <a-input v-model="model.reportUser_dictText" disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="transferReason" label="变动原因">
              <a-input v-model="model.transferReason" disabled />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="备注">
              <a-textarea v-model="model.remark" disabled />
            </a-form-model-item>
          </a-col>
        </a-row>
        <div v-if="approvalDisable">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> ç®¡ç†å‘˜å°å­˜å®¡æ ¸
          </a-divider>
          <a-row :gutter="24">
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalDealType" label="审批类型">
                <j-dict-select-tag type="radio" v-model="model.approvalDealType" dictCode="approved_rejected"
                                   placeholder="请选择处理类型" :disabled="disableSubmit || initialAcceptanceDisable" />
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="审批意见">
                <a-textarea placeholder="请输入意见" v-model="model.approvalComment"
                            :disabled="disableSubmit || returnDisable" />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
import { getAction, httpAction } from '@/api/manage'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'

export default {
  name: 'EquipmentTransferApprovalModal',
  components: {
    LxSearchEquipmentSelect
  },
  props: {
    selectShenpiData: {
      type: Object
    }
  },
  data() {
    return {
      title: '操作',
      visible: false,
      editable: false,
      model: {},
      treeData: [],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 }
      },
      labelColLong: {
        xs: { span: 24 },
        sm: { span: 2 }
      },
      wrapperColLong: {
        xs: { span: 24 },
        sm: { span: 21 }
      },
      confirmLoading: false,
      spinning: false,
      imageSrc: null,
      validatorRules: {
        approvalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        unsealApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        approvalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        unsealApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        returnComment: [
          { required: true, message: '请输入归还备注!' }
        ],
        confirmComment: [
          { required: true, message: '请输入确认意见!' }
        ]
      },
      url: {
        queryById: '/eam/eamEquipmentTransfer/queryById',
        approval: '/eam/eamEquipmentTransfer/approval',
        loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions'
      },
      disableSubmit: false
    }
  },
  created() {
    this.loadAllProductionTree()
  },
  computed: {
    approvalDisable: function() {
      return ['WAIT_CHECK'].includes(this.model.transferStatus)
    },
  },
  methods: {
    async handleDetail(item) {
      this.initParams()
      this.model = {}
      let res = await getAction(this.url.queryById, { id: item.dataId })
      this.model = Object.assign({}, res.result)
      this.model.dataId = item.dataId
      this.model.taskId = item.id
      this.model.userId = item.assignee
      this.model.instanceId = item.procInstId
      this.model.values = item.variables
      this.spinning = false;
    },

    recordDetail(record) {
      console.log('record', record)
      this.initParams()
      this.model = Object.assign({}, record)
    },

    initParams() {
      this.visible = true
      this.spinning = true
    },

    async handleOk() {
      const that = this
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          that.confirmLoading = that.spinning = true
          let httpurl = this.url.approval
          let method = 'put'
          httpAction(httpurl, this.model, method).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('searchReset')
              that.close()
            } else {
              that.$message.warning(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()
    },
    loadAllProductionTree() {
      //加载车间选择树
      getAction(this.url.loadProductionOptions).then(res => {
        if (res.success) {
          this.treeData = [...res.result]
        } else {
          that.$message.warning(res.message)
        }
      })
    }
  }
}
</script>

<style lang="less" scoped>

</style>