From 6ab830320b2508ee5f6a7be6cb18653e5d651f0d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 10 九月 2025 14:37:06 +0800
Subject: [PATCH] 1、DNC首页三维工艺生成产品结构树列表增加字符数超出省略功能 2、设备调拨列表详情改为查看流程详情
---
src/views/eam/dispose/EamEquipmentTransferList.vue | 418 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 249 insertions(+), 169 deletions(-)
diff --git a/src/views/eam/dispose/EamEquipmentTransferList.vue b/src/views/eam/dispose/EamEquipmentTransferList.vue
index dc1a648..dcd24af 100644
--- a/src/views/eam/dispose/EamEquipmentTransferList.vue
+++ b/src/views/eam/dispose/EamEquipmentTransferList.vue
@@ -6,38 +6,44 @@
<a-form layout='inline' @keyup.enter.native='searchQuery'>
<a-row :gutter='24'>
- <a-col :lg='7' :md='8' :sm='24' :xl='6'>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<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-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label='鍗曟嵁鍙�'>
<a-input v-model='queryParam.code' placeholder='璇疯緭鍏ュ崟鎹彿'></a-input>
</a-form-item>
</a-col>
- <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>
- <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 :lg='7' :md='8' :sm='24' :xl='6'>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍙樺姩鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鍙樺姩鐘舵��" dictCode="equipment_transfer_status"
+ v-model="queryParam.transferStatus"
+ allow-clear/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label='璋冨嚭閮ㄩ棬'>
+ <a-input v-model='queryParam.oldDepartId' placeholder='璇疯緭鍏ヨ皟鍑洪儴闂�'></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label='璋冨叆閮ㄩ棬'>
+ <a-input v-model='queryParam.newDepartId' placeholder='璇疯緭鍏ヨ皟鍏ラ儴闂�'></a-input>
+ </a-form-item>
+ </a-col>
+
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<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>-->
+ <!-- <a style='margin-left: 8px' @click='handleToggleSearch'>-->
+ <!-- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}-->
+ <!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
+ <!-- </a>-->
</span>
</a-col>
@@ -51,12 +57,12 @@
<a-dropdown v-if='selectedRowKeys.length > 0'>
<a-menu slot='overlay'>
<a-menu-item key='1' @click='batchDel'>
- <a-icon type='delete' />
+ <a-icon type='delete'/>
鍒犻櫎
</a-menu-item>
</a-menu>
<a-button style='margin-left: 8px'> 鎵归噺鎿嶄綔
- <a-icon type='down' />
+ <a-icon type='down'/>
</a-button>
</a-dropdown>
</div>
@@ -88,10 +94,10 @@
<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 class='ant-dropdown-link'>鏇村 <a-icon type='down'/></a>
<a-menu slot='overlay'>
<a-menu-item>
<a @click='handleEdit(record)'>缂栬緫</a>
@@ -115,165 +121,239 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<eamEquipmentTransfer-modal ref='modalForm' @ok='modalFormOk'></eamEquipmentTransfer-modal>
+
+ <!--瀹℃壒绐楀彛-->
+ <equipment-transfer-approval-modal ref="equipmentTransferApprovalModal"
+ :selectShenpiData="selectRowData"/>
</a-card>
</template>
<script>
-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'
+ 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'
+ import EquipmentTransferApprovalModal from '../../flowable/workflow/transfer/EquipmentTransferApprovalModal'
-export default {
- name: 'EamEquipmentTransferList',
- mixins: [JeecgListMixin],
- components: {
- EamEquipmentTransferModal,
- LxSearchEquipmentSelect
- },
- data() {
- return {
- description: '璁惧褰掑睘鍙樺姩绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- fixed: 'left',
- align: 'center',
- customRender: function(t, r, index) {
- return parseInt(index) + 1
+ export default {
+ name: 'EamEquipmentTransferList',
+ mixins: [JeecgListMixin],
+ components: {
+ EquipmentTransferApprovalModal,
+ EamEquipmentTransferModal,
+ LxSearchEquipmentSelect
+ },
+ data() {
+ return {
+ description: '璁惧褰掑睘鍙樺姩绠＄悊椤甸潰',
+ selectRowData: {},
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ fixed: 'left',
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '鍗曟嵁鍙�',
+ align: 'center',
+ fixed: 'left',
+ width: 100,
+ dataIndex: 'code'
+ },
+ {
+ title: '璁惧缂栧彿',
+ align: 'center',
+ fixed: 'left',
+ width: 100,
+ dataIndex: 'equipmentCode'
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ fixed: 'left',
+ width: 100,
+ dataIndex: 'equipmentName'
+ },
+ {
+ title: '璋冨嚭閮ㄩ棬',
+ align: 'center',
+ dataIndex: 'oldDepartId_dictText'
+ },
+ {
+ title: '璋冨叆閮ㄩ棬',
+ align: 'center',
+ dataIndex: 'newDepartId_dictText'
+ },
+ {
+ title: '鐢宠浜�',
+ align: 'center',
+ dataIndex: 'reportUser_dictText'
+ },
+ {
+ title: '鍙樺姩鍘熷洜',
+ align: 'center',
+ dataIndex: 'transferReason'
+ },
+ {
+ title: '鍙樺姩鐘舵��',
+ align: 'center',
+ dataIndex: 'transferStatus_dictText'
+ },
+ {
+ title: '鍙樺姩鏃ユ湡',
+ align: 'center',
+ dataIndex: 'transferTime'
+ },
+ {
+ title: '浣跨敤鍗曚綅棰嗗',
+ align: 'center',
+ dataIndex: 'useLeader_dictText'
+ },
+ {
+ title: '浣跨敤鍗曚綅棰嗗瀹℃牳绫诲瀷',
+ align: 'center',
+ dataIndex: 'useLeaderApprovalDealType_dictText'
+ },
+ {
+ title: '浣跨敤鍗曚綅棰嗗瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'useLeaderApprovalComment'
+ },
+ {
+ title: '浣跨敤鍗曚綅棰嗗瀹℃牳鏃堕棿',
+ align: 'center',
+ dataIndex: 'useLeaderApprovalTime'
+ },
+ {
+ title: '璋冨叆鍗曚綅棰嗗',
+ align: 'center',
+ dataIndex: 'transferLeader_dictText'
+ },
+ {
+ title: '璋冨叆鍗曚綅棰嗗瀹℃牳绫诲瀷',
+ align: 'center',
+ dataIndex: 'transferLeaderApprovalDealType_dictText'
+ },
+ {
+ title: '璋冨叆鍗曚綅棰嗗瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'transferLeaderApprovalComment'
+ },
+ {
+ title: '璋冨叆鍗曚綅棰嗗瀹℃牳鏃堕棿',
+ align: 'center',
+ dataIndex: 'transferLeaderApprovalTime'
+ },
+ {
+ title: '鏈哄姩鍔炵‘璁や汉',
+ align: 'center',
+ dataIndex: 'externalConfirm_dictText'
+ },
+ {
+ title: '鏈哄姩鍔炵‘璁ゆ椂闂�',
+ align: 'center',
+ dataIndex: 'externalConfirmTime'
+ },
+ {
+ title: '鏄惁闇�瑕佸叕鍙搁瀵煎鎵�',
+ align: 'center',
+ dataIndex: 'companyLeaderCheck_dictText'
+ },
+ {
+ title: '鍏徃棰嗗',
+ align: 'center',
+ dataIndex: 'companyLeader_dictText'
+ },
+ {
+ title: '鍏徃棰嗗瀹℃牳绫诲瀷',
+ align: 'center',
+ dataIndex: 'companyLeaderApprovalDealType_dictText'
+ },
+ {
+ title: '鍏徃棰嗗瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'companyLeaderApprovalComment'
+ },
+ {
+ title: '鍏徃棰嗗瀹℃牳鏃堕棿',
+ align: 'center',
+ dataIndex: 'companyLeaderApprovalTime'
+ },
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ fixed: 'right',
+ width: 150,
+ scopedSlots: { customRender: 'action' }
}
- },
- {
- title: '鍗曟嵁鍙�',
- align: 'center',
- fixed: 'left',
- width: 100,
- dataIndex: 'code'
- },
- {
- title: '璁惧缂栧彿',
- align: 'center',
- fixed: 'left',
- width: 100,
- dataIndex: 'equipmentCode'
- },
- {
- title: '璁惧鍚嶇О',
- align: 'center',
- fixed: 'left',
- width: 100,
- dataIndex: 'equipmentName'
- },
- {
- title: '璋冨嚭閮ㄩ棬',
- align: 'center',
- dataIndex: 'oldDepartId_dictText'
- },
- {
- title: '璋冨叆閮ㄩ棬',
- align: 'center',
- dataIndex: 'newDepartId_dictText'
- },
- {
- title: '鐢宠浜�',
- align: 'center',
- dataIndex: 'reportUser_dictText'
- },
- {
- title: '鍙樺姩鍘熷洜',
- align: 'center',
- dataIndex: 'transferReason'
- },
- {
- title: '鍙樺姩鐘舵��',
- align: 'center',
- dataIndex: 'transferStatus_dictText'
- },
- {
- title: '鍙樺姩鏃ユ湡',
- align: 'center',
- dataIndex: 'transferTime'
- },
- {
- title: '瀹℃牳浜�',
- align: 'center',
- dataIndex: 'approvalUser_dictText'
- },
- {
- title: '瀹℃牳鎰忚',
- align: 'center',
- dataIndex: 'approvalComment'
- },
- {
- title: '瀹℃牳鏃堕棿',
- align: 'center',
- dataIndex: 'approvalTime'
- },
- {
- title: '澶囨敞',
- align: 'center',
- dataIndex: 'remark'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align: 'center',
- fixed: 'right',
- width: 150,
- scopedSlots: { customRender: 'action' }
+ ],
+ url: {
+ list: '/eam/eamEquipmentTransfer/list',
+ delete: '/eam/eamEquipmentTransfer/delete',
+ deleteBatch: '/eam/eamEquipmentTransfer/deleteBatch',
+ submit: '/eam/eamEquipmentTransfer/submit'
}
- ],
- url: {
- 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}`
- }
- },
- methods: {
- handleSubmit(id) {
- if (!this.url.submit) {
- this.$message.error('璇疯缃畊rl.submit灞炴��!')
- return
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
- 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
- })
+ },
+ methods: {
+ handleSubmit(id) {
+ if (!this.url.submit) {
+ this.$message.error('璇疯缃畊rl.submit灞炴��!')
+ return
}
- }).finally(()=>{
- this.loading = false
- })
+ 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
+ })
+ },
+
+ handleDetail(record) {
+ this.selectRowData = Object.assign({}, record)
+ this.$refs.equipmentTransferApprovalModal.recordDetail(record)
+ this.$refs.equipmentTransferApprovalModal.title = '璇︽儏'
+ this.$refs.equipmentTransferApprovalModal.disableSubmit = true
+ }
}
}
-}
</script>
<style scoped>
-@import '~@assets/less/common.less';
+ @import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3