From d289be3b10e9b259625ca9128b54bc62950c4e48 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 08 九月 2025 17:57:49 +0800
Subject: [PATCH] 出库状态改为生命周期 其他文档改为电子文档 电子文档新增指派设备结构树
---
src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentAssignModal.vue | 2
src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue | 2
src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue | 2
src/views/tms/OutboundDetailList.vue | 2
src/views/tms/modules/outBound/OutboundModal.vue | 2
src/views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue | 2
src/views/tms/modules/outBound/OutboundDetailModal.vue | 4 +-
src/views/tms/modules/outBound/OutboundOrderModal.vue | 2
src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue | 2
src/views/dashboard/modules/DncManagerSignage.vue | 2
src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue | 4 +-
src/views/dnc/common/DocumentInfo.vue | 2
src/views/tms/OutboundOrderList.vue | 2
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue | 4 +-
src/views/dnc/common/DocumentBatchDeleteModal.vue | 2
src/views/tms/modules/outBound/OutboundDetailSelectList.vue | 2
src/views/dnc/common/TableContextMenu.vue | 1
src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue | 24 ++++++------
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue | 2
src/views/dnc/common/ImportFileModal.vue | 2
src/views/tms/lossBound/modules/LossboundDetailModal.vue | 4 +-
src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue | 2
src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue | 18 +++++++-
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue | 2
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchModal.vue | 4 +-
src/views/tms/modules/outBound/OutboundOrderSelectList.vue | 2
src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue | 2
src/views/tms/modules/outBound/JSelectSharpenOutboundToolModal.vue | 2
src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue | 2
29 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/src/views/dashboard/modules/DncManagerSignage.vue b/src/views/dashboard/modules/DncManagerSignage.vue
index 8cde729..9d53be6 100644
--- a/src/views/dashboard/modules/DncManagerSignage.vue
+++ b/src/views/dashboard/modules/DncManagerSignage.vue
@@ -87,7 +87,7 @@
}
.left-container {
- width: 45%;
+ width: 40%;
height: 100%;
/deep/ .ant-card-body {
diff --git a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentAssignModal.vue b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentAssignModal.vue
index 07e7ef2..7d33dc2 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentAssignModal.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentAssignModal.vue
@@ -148,7 +148,7 @@
},
{ title: '璁惧缂栧彿', dataIndex: 'docCode', align: 'center' },
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
diff --git a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
index e8efdee..685236f 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
@@ -60,7 +60,7 @@
sorter: true
},
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
diff --git a/src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue b/src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue
index 443a97a..d7075e0 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue
@@ -56,7 +56,7 @@
sorter: true
},
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue
index 0788c06..a338e49 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue
@@ -131,7 +131,7 @@
},
{ title: '璁惧缂栧彿', dataIndex: 'docCode', align: 'center' },
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchModal.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchModal.vue
index 721a35f..3184850 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchModal.vue
@@ -1,5 +1,5 @@
<!--
- Description: 妫�绱㈢數瀛愭牱鏉縇ist
+ Description: 妫�绱㈢數瀛愭枃妗ist
Author: 浣滆�� liuyh
Date: 2025-02-27
-->
@@ -167,7 +167,7 @@
sorter: true
},
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue
index 19a6537..c8439c2 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue
@@ -1,5 +1,5 @@
<!--
- Description: 妫�绱㈢數瀛愭牱鏉縇ist
+ Description: 妫�绱㈢數瀛愭枃妗ist
Author: 浣滆�� liuyh
Date: 2025-02-27
-->
@@ -196,7 +196,7 @@
sorter: true
},
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
index c9d7509..3dcb935 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
@@ -58,7 +58,7 @@
sorter: true
},
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue
index c52f9bc..32481e2 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue
@@ -9,6 +9,9 @@
</a-table>
<DocumentModal ref="modalForm" @ok="modalFormOk"/>
+
+ <NcDocumentAssignModal :size="size" ref="documentAssignModalRef"
+ :currentDocumentInfo="currentRightClickedDocumentInfo"/>
</div>
</template>
@@ -16,10 +19,11 @@
import { getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import DocumentModal from '../../../../common/DocumentModal'
+ import NcDocumentAssignModal from '@views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue'
export default {
name: 'OtherDocumentTableList',
- components: { DocumentModal },
+ components: { NcDocumentAssignModal, DocumentModal },
mixins: [JeecgListMixin],
props: {
currentTreeNodeInfo: {
@@ -54,7 +58,7 @@
},
{ title: '璁惧缂栧彿', dataIndex: 'docCode', align: 'center' },
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
@@ -86,6 +90,7 @@
}
],
dataSource: [],
+ currentRightClickedDocumentInfo: {},
currentClickedDocumentInfo: {},
url: {
list: '/nc/doc/find/page'
@@ -95,7 +100,7 @@
watch: {
currentTreeNodeInfo: {
handler(value) {
- this.currentClickedDocumentInfo = {}
+ this.currentClickedDocumentInfo = this.currentRightClickedDocumentInfo = {}
},
immediate: true
}
@@ -143,6 +148,7 @@
on: {
contextmenu: event => {
event.preventDefault()
+ this.currentRightClickedDocumentInfo = Object.assign({ param: 'OTHER' }, record)
this.$emit('handleTableContextMenuOpen', { ...record, param: 'OTHER' })
},
click: () => {
@@ -181,6 +187,12 @@
this.$refs.modalForm.title = modalTitle
},
+ handleDocumentAssign(record, modalTitle) {
+ if (!this.$refs.documentAssignModalRef) return
+ this.$refs.documentAssignModalRef.title = modalTitle
+ this.$refs.documentAssignModalRef.visible = true
+ },
+
handleDelete() {
// 姝ゅ鍑芥暟涓哄睆钄絤ixins涓殑鍚屽悕鍑芥暟锛岄�氱敤鍑芥暟鍐欏湪鐖剁骇涓�
},
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
index a109dca..a8c541e 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
@@ -47,7 +47,7 @@
:size="containerSize"/>
</a-tab-pane>
- <a-tab-pane :key="4" tab="浣跨敤璁惧" v-if="currentLevelInfo.classificationId_dictText==='nc'">
+ <a-tab-pane :key="4" tab="浣跨敤璁惧">
<UseDocumentEquipmentTableList ref="useDocumentEquipmentTableRef" :currentDocumentInfo="currentLevelInfo"
:size="containerSize"/>
</a-tab-pane>
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue
index e0d1f7d..fc84f28 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue
@@ -16,7 +16,7 @@
</div>
</a-tab-pane>
- <a-tab-pane :key="2" tab="鍏朵粬鏂囨。">
+ <a-tab-pane :key="2" tab="鐢靛瓙鏂囨。">
<OtherDocumentTableList ref="otherDocumentTableListRef" :currentTreeNodeInfo="currentTreeNodeInfo"
@handleTableContextMenuOpen="handleTableContextMenuOpen" :size="tableContainerSize"/>
</a-tab-pane>
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue
index a38332e..22ba35a 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureTreeContextMenu.vue
@@ -36,8 +36,8 @@
{ label: '娣诲姞閮ㄤ欢', code: 'product_add_child', icon: 'plus', isCommonMethod: false },
{ label: '缂栬緫浜у搧淇℃伅', code: 'product_edit', icon: 'edit', isCommonMethod: false },
// { label: '瀵煎嚭鏂囨。', code: 'product_export', icon: 'export', isCommonMethod: true },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'product_other_import', icon: 'import', isCommonMethod: true },
- { label: '妫�绱㈢數瀛愭牱鏉�', code: 'product_search', icon: 'search', isCommonMethod: true },
+ { label: '瀵煎叆鐢靛瓙鏂囨。', code: 'product_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭枃妗�', code: 'product_search', icon: 'search', isCommonMethod: true },
{ label: '妫�绱C鏂囦欢', code: 'product_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鍒犻櫎', code: 'product_delete', icon: 'delete', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
@@ -49,8 +49,8 @@
{ label: '鍒涘缓宸ュ簭', code: 'component_add_relative', icon: 'plus', isCommonMethod: false },
{ label: '缂栬緫閮ㄤ欢淇℃伅', code: 'component_edit', icon: 'edit', isCommonMethod: false },
// { label: '瀵煎嚭鏂囨。', code: 'component_export', icon: 'export', isCommonMethod: true },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'component_other_import', icon: 'import', isCommonMethod: true },
- { label: '妫�绱㈢數瀛愭牱鏉�', code: 'component_search', icon: 'search', isCommonMethod: true },
+ { label: '瀵煎叆鐢靛瓙鏂囨。', code: 'component_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭枃妗�', code: 'component_search', icon: 'search', isCommonMethod: true },
{ label: '妫�绱C鏂囦欢', code: 'component_search_nc', icon: 'search', isCommonMethod: true },
{ label: '寮曠敤閮ㄤ欢', code: 'component_borrow', icon: 'plus', isCommonMethod: false },
{ label: '鍒犻櫎', code: 'component_delete', icon: 'delete', isCommonMethod: true },
@@ -63,8 +63,8 @@
// { label: '鍒涘缓宸ュ簭', code: 'parts_add_relative', icon: 'plus', isCommonMethod: false },
{ label: '缂栬緫闆朵欢淇℃伅', code: 'parts_edit', icon: 'edit', isCommonMethod: false },
// { label: '瀵煎嚭鏂囨。', code: 'parts_export', icon: 'export', isCommonMethod: true },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'parts_other_import', icon: 'import', isCommonMethod: true },
- { label: '妫�绱㈢數瀛愭牱鏉�', code: 'parts_search', icon: 'search', isCommonMethod: true },
+ { label: '瀵煎叆鐢靛瓙鏂囨。', code: 'parts_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭枃妗�', code: 'parts_search', icon: 'search', isCommonMethod: true },
{ label: '妫�绱C鏂囦欢', code: 'parts_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鍒犻櫎', code: 'parts_delete', icon: 'delete', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
@@ -74,8 +74,8 @@
{ label: '鍒涘缓宸ヨ壓瑙勭▼鐗堟湰', code: 'version_add', icon: 'plus', isCommonMethod: false },
{ label: '鍒涘缓宸ュ簭', code: 'version_add_child', icon: 'plus', isCommonMethod: false },
{ label: '缂栬緫宸ヨ壓瑙勭▼鐗堟湰淇℃伅', code: 'version_edit', icon: 'edit', isCommonMethod: false },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'version_other_import', icon: 'import', isCommonMethod: true },
- { label: '妫�绱㈢數瀛愭牱鏉�', code: 'version_search', icon: 'search', isCommonMethod: true },
+ { label: '瀵煎叆鐢靛瓙鏂囨。', code: 'version_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭枃妗�', code: 'version_search', icon: 'search', isCommonMethod: true },
{ label: '妫�绱C鏂囦欢', code: 'version_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鍒犻櫎', code: 'version_delete', icon: 'delete', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
@@ -89,8 +89,8 @@
{ label: '鍒犻櫎', code: 'process_delete', icon: 'delete', isCommonMethod: true },
// { label: '瀵煎嚭NC绋嬪簭', code: 'process_export', icon: 'export', isCommonMethod: true },
{ label: '瀵煎叆NC绋嬪簭', code: 'process_nc_import', icon: 'import', isCommonMethod: true },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'process_other_import', icon: 'import', isCommonMethod: true },
- { label: '妫�绱㈢數瀛愭牱鏉�', code: 'process_search', icon: 'search', isCommonMethod: true },
+ { label: '瀵煎叆鐢靛瓙鏂囨。', code: 'process_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭枃妗�', code: 'process_search', icon: 'search', isCommonMethod: true },
{ label: '妫�绱C鏂囦欢', code: 'process_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true },
{ label: '鍙戦�乶c绋嬪簭鑷充笁缁村伐鑹�', code: 'process_send_nc_to_plm', icon: 'import', isCommonMethod: true }
@@ -103,8 +103,8 @@
{ label: '鍒犻櫎', code: 'processStep_delete', icon: 'delete', isCommonMethod: true },
// { label: '瀵煎嚭NC绋嬪簭', code: 'processStep_export', icon: 'import', isCommonMethod: true },
{ label: '瀵煎叆NC绋嬪簭', code: 'processStep_nc_import', icon: 'import', isCommonMethod: true },
- { label: '瀵煎叆鍏朵粬鏂囨。', code: 'processStep_other_import', icon: 'import', isCommonMethod: true },
- { label: '妫�绱㈢數瀛愭牱鏉�', code: 'processStep_search', icon: 'search', isCommonMethod: true },
+ { label: '瀵煎叆鐢靛瓙鏂囨。', code: 'processStep_other_import', icon: 'import', isCommonMethod: true },
+ { label: '妫�绱㈢數瀛愭枃妗�', code: 'processStep_search', icon: 'search', isCommonMethod: true },
{ label: '妫�绱C鏂囦欢', code: 'processStep_search_nc', icon: 'search', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true },
{ label: '鍙戦�乶c绋嬪簭鑷充笁缁村伐鑹�', code: 'processStep_send_nc_to_plm', icon: 'import', isCommonMethod: true }
diff --git a/src/views/dnc/common/DocumentBatchDeleteModal.vue b/src/views/dnc/common/DocumentBatchDeleteModal.vue
index 1dc78b8..d493f63 100644
--- a/src/views/dnc/common/DocumentBatchDeleteModal.vue
+++ b/src/views/dnc/common/DocumentBatchDeleteModal.vue
@@ -82,7 +82,7 @@
},
{ title: '璁惧缂栧彿', dataIndex: 'docCode', align: 'center' },
{
- title: '鍑哄簱鐘舵��',
+ title: '鐢熷懡鍛ㄦ湡',
dataIndex: 'pullStatus_dictText',
key: 'pullStatus',
align: 'center',
diff --git a/src/views/dnc/common/DocumentInfo.vue b/src/views/dnc/common/DocumentInfo.vue
index 32a5336..c534d62 100644
--- a/src/views/dnc/common/DocumentInfo.vue
+++ b/src/views/dnc/common/DocumentInfo.vue
@@ -5,7 +5,7 @@
<a-descriptions-item label="鏂囨。鍚庣紑">{{currentLevelDetails.docSuffix}}</a-descriptions-item>
<a-descriptions-item label="鏂囨。鐘舵��">{{currentLevelDetails.docDispatchStatus_dictText}}</a-descriptions-item>
<a-descriptions-item label="绯荤粺鎸囧畾鐗堟湰">{{currentLevelDetails.publishVersion}}</a-descriptions-item>
- <a-descriptions-item label="鍑哄簱鐘舵��">{{currentLevelDetails.pullStatus_dictText}}</a-descriptions-item>
+ <a-descriptions-item label="鐢熷懡鍛ㄦ湡">{{currentLevelDetails.pullStatus_dictText}}</a-descriptions-item>
<a-descriptions-item label="鍑哄簱浜�">{{currentLevelDetails.pullUser_dictText}}</a-descriptions-item>
<a-descriptions-item label="鍒涘缓浜�">{{currentLevelDetails.createBy_dictText}}</a-descriptions-item>
<a-descriptions-item label="鍒涘缓鏃堕棿">{{currentLevelDetails.createTime}}</a-descriptions-item>
diff --git a/src/views/dnc/common/ImportFileModal.vue b/src/views/dnc/common/ImportFileModal.vue
index 475b8b4..3e01f80 100644
--- a/src/views/dnc/common/ImportFileModal.vue
+++ b/src/views/dnc/common/ImportFileModal.vue
@@ -78,7 +78,7 @@
},
/**
- * 鐐瑰嚮瀵煎叆鍏朵粬鏂囨。鏃惰Е鍙�
+ * 鐐瑰嚮瀵煎叆鐢靛瓙鏂囨。鏃惰Е鍙�
* @param treeNodeInfo 鐐瑰嚮鏍戣妭鐐瑰彸閿彍鍗曞鍏ョ▼搴忔椂浼犲叆鏍戣妭鐐逛俊鎭�
* @param tableRowInfo 鍙抽敭琛ㄦ牸琛屾椂浼犲叆琛屼俊鎭�
* @param modalTitle 寮圭獥鏍囬
diff --git a/src/views/dnc/common/TableContextMenu.vue b/src/views/dnc/common/TableContextMenu.vue
index a72765f..17e9385 100644
--- a/src/views/dnc/common/TableContextMenu.vue
+++ b/src/views/dnc/common/TableContextMenu.vue
@@ -73,6 +73,7 @@
//鍏跺畠鏂囨。
OTHER: [
{ label: '缂栬緫鏂囨。淇℃伅', code: 'document_edit', subMenu: [], icon: 'edit', isCommonMethod: false },
+ { label: '鎸囨淳鍒拌澶�', code: 'document_assign', subMenu: [], icon: 'cluster', isCommonMethod: false },
{ label: '瀵煎叆鏂囨。', code: 'document_other_import', subMenu: [], icon: 'import', isCommonMethod: true },
{ label: '涓嬭浇', code: 'document_download', subMenu: [], icon: 'download', isCommonMethod: true },
{ label: '鍒犻櫎', code: 'document_delete', subMenu: [], icon: 'delete', isCommonMethod: true },
diff --git a/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
index 09f1b0a..9e0de1d 100644
--- a/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
@@ -64,7 +64,7 @@
</a-row>
<a-row>
<a-col :span='span'>
- <a-form-model-item label='鍑哄簱鐘舵��' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
+ <a-form-model-item label='鐢熷懡鍛ㄦ湡' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
<a-input :disabled='coldisabled' v-model='tableRowRecord.pullStatus_dictText'></a-input>
</a-form-model-item>
</a-col>
diff --git a/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
index f0f148b..abe3d2f 100644
--- a/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
@@ -64,7 +64,7 @@
</a-row>
<a-row>
<a-col :span='span'>
- <a-form-model-item label='鍑哄簱鐘舵��' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
+ <a-form-model-item label='鐢熷懡鍛ㄦ湡' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
<a-input :disabled='coldisabled' v-model='tableRowRecord.pullStatus_dictText'></a-input>
</a-form-model-item>
</a-col>
diff --git a/src/views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue b/src/views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue
index 6e074b0..5d8f8df 100644
--- a/src/views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue
+++ b/src/views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue
@@ -64,7 +64,7 @@
</a-row>
<a-row>
<a-col :span='span'>
- <a-form-model-item label='鍑哄簱鐘舵��' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
+ <a-form-model-item label='鐢熷懡鍛ㄦ湡' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
<a-input :disabled='coldisabled' v-model='tableRowRecord.pullStatus_dictText'></a-input>
</a-form-model-item>
</a-col>
diff --git a/src/views/tms/OutboundDetailList.vue b/src/views/tms/OutboundDetailList.vue
index 7a4c8f0..5a3654b 100644
--- a/src/views/tms/OutboundDetailList.vue
+++ b/src/views/tms/OutboundDetailList.vue
@@ -196,7 +196,7 @@
dataIndex: 'outActualCount'
},
{
- title:'鍑哄簱鐘舵��',
+ title:'鐢熷懡鍛ㄦ湡',
align:"center",
dataIndex: 'status_dictText'
},
diff --git a/src/views/tms/OutboundOrderList.vue b/src/views/tms/OutboundOrderList.vue
index e6faa94..a00ebdc 100644
--- a/src/views/tms/OutboundOrderList.vue
+++ b/src/views/tms/OutboundOrderList.vue
@@ -188,7 +188,7 @@
dataIndex: 'outboundTime'
},
{
- title:'鍑哄簱鐘舵��',
+ title:'鐢熷懡鍛ㄦ湡',
align:"center",
dataIndex: 'outStatus_dictText'
},
diff --git a/src/views/tms/lossBound/modules/LossboundDetailModal.vue b/src/views/tms/lossBound/modules/LossboundDetailModal.vue
index adaba74..61cea61 100644
--- a/src/views/tms/lossBound/modules/LossboundDetailModal.vue
+++ b/src/views/tms/lossBound/modules/LossboundDetailModal.vue
@@ -33,9 +33,9 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚" :labelCol="labelCol"
+ <a-form-model-item label="鐢熷懡鍛ㄦ湡;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚" :labelCol="labelCol"
:wrapperCol="wrapperCol" prop="status">
- <a-input-number v-model="model.status" placeholder="璇疯緭鍏ュ嚭搴撶姸鎬�;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚"
+ <a-input-number v-model="model.status" placeholder="璇疯緭鍏ョ敓鍛藉懆鏈�;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚"
style="width: 100%" />
</a-form-model-item>
</a-col>
diff --git a/src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue b/src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue
index ea3a476..68c83c8 100644
--- a/src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue
+++ b/src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue
@@ -98,7 +98,7 @@
align:"center",
dataIndex: 'groupCompanySign'
},
-
+
// {
// title:'鍙敤搴撳瓨鏁伴噺',
// align:"center",
@@ -115,7 +115,7 @@
dataIndex: 'positionCode'
},
// {
- // title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
+ // title:'鐢熷懡鍛ㄦ湡;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
// align:"center",
// dataIndex: 'status'
// },
diff --git a/src/views/tms/modules/outBound/JSelectSharpenOutboundToolModal.vue b/src/views/tms/modules/outBound/JSelectSharpenOutboundToolModal.vue
index 1e6c7b6..11261f5 100644
--- a/src/views/tms/modules/outBound/JSelectSharpenOutboundToolModal.vue
+++ b/src/views/tms/modules/outBound/JSelectSharpenOutboundToolModal.vue
@@ -89,7 +89,7 @@
dataIndex: 'positionCode'
},
// {
- // title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
+ // title:'鐢熷懡鍛ㄦ湡;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
// align:"center",
// dataIndex: 'status'
// },
diff --git a/src/views/tms/modules/outBound/OutboundDetailModal.vue b/src/views/tms/modules/outBound/OutboundDetailModal.vue
index 0d06ebd..8789f6f 100644
--- a/src/views/tms/modules/outBound/OutboundDetailModal.vue
+++ b/src/views/tms/modules/outBound/OutboundDetailModal.vue
@@ -32,8 +32,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
- <a-input-number v-model="model.status"placeholder="璇疯緭鍏ュ嚭搴撶姸鎬�;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚" style="width: 100%" />
+ <a-form-model-item label="鐢熷懡鍛ㄦ湡;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+ <a-input-number v-model="model.status"placeholder="璇疯緭鍏ョ敓鍛藉懆鏈�;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
diff --git a/src/views/tms/modules/outBound/OutboundDetailSelectList.vue b/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
index 87c4314..b9e0a03 100644
--- a/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
+++ b/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
@@ -149,7 +149,7 @@
// dataIndex: 'outActualCount'
// },
{
- title:'鍑哄簱鐘舵��',
+ title:'鐢熷懡鍛ㄦ湡',
align:"center",
dataIndex: 'status_dictText'
},
diff --git a/src/views/tms/modules/outBound/OutboundModal.vue b/src/views/tms/modules/outBound/OutboundModal.vue
index 8312da4..22ccb64 100644
--- a/src/views/tms/modules/outBound/OutboundModal.vue
+++ b/src/views/tms/modules/outBound/OutboundModal.vue
@@ -189,7 +189,7 @@
scopedSlots: { customRender: 'useLife' },
},
// {
- // title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
+ // title:'鐢熷懡鍛ㄦ湡;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
// align:"center",
// dataIndex: 'status'
// },
diff --git a/src/views/tms/modules/outBound/OutboundOrderModal.vue b/src/views/tms/modules/outBound/OutboundOrderModal.vue
index 8171597..79506f7 100644
--- a/src/views/tms/modules/outBound/OutboundOrderModal.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderModal.vue
@@ -282,7 +282,7 @@
// scopedSlots: { customRender: 'useLife' },
// },
// {
- // title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
+ // title:'鐢熷懡鍛ㄦ湡;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
// align:"center",
// dataIndex: 'status'
// },
diff --git a/src/views/tms/modules/outBound/OutboundOrderSelectList.vue b/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
index 4358e5e..d4e5f81 100644
--- a/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
@@ -144,7 +144,7 @@
dataIndex: 'outboundTime'
},
{
- title:'鍑哄簱鐘舵��',
+ title:'鐢熷懡鍛ㄦ湡',
align:"center",
dataIndex: 'outStatus_dictText'
},
--
Gitblit v1.9.3