From bf4cb4fdbd57f1785cdd1ddeadfb20a835d5fb6f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 05 六月 2025 15:18:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/inbound/InboundListRight.vue | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/views/tms/modules/inbound/InboundListRight.vue b/src/views/tms/modules/inbound/InboundListRight.vue
index 66bb9f3..247a0ab 100644
--- a/src/views/tms/modules/inbound/InboundListRight.vue
+++ b/src/views/tms/modules/inbound/InboundListRight.vue
@@ -58,7 +58,7 @@
<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-button @click="handleInbound(nodeSelected)" type="primary" icon="plus">鐢宠鍗曞叆搴�</a-button>
+ <a-button @click="handleInbound" type="primary">鐢宠鍗曞叆搴�</a-button>
</div>
<!-- table鍖哄煙-begin -->
@@ -145,6 +145,7 @@
</a-tabs>
<inbound-model ref="modalForm" @ok="modalFormOk" :nodeSelected="nodeSelected"></inbound-model>
+ <inbound-apply-model-list ref="inboundApplyModelList"></inbound-apply-model-list>
</a-card>
</template>
@@ -163,6 +164,7 @@
import ParaCommonToolList from '.././baseTools/ParaCommonToolList'
import ParaBladeList from '.././baseTools/ParaBladeList'
import InboundModel from './InboundModel'
+ import InboundApplyModelList from './InboundApplyModelList.vue'
export default {
name: 'InboundListRight',
@@ -176,7 +178,8 @@
ParaTurningToolsList,
ParaCommonToolList,
ParaBladeList,
- InboundModel
+ InboundModel,
+ InboundApplyModelList
},
data () {
return {
@@ -211,9 +214,14 @@
dataIndex: 'toolCode'
},
{
+ title:'宸ュ叿缂栧彿',
+ align:"center",
+ dataIndex: 'onlyCode'
+ },
+ {
title:'鍏ュ簱绫诲瀷',
align:"center",
- dataIndex: 'inStorehouseType'
+ dataIndex: 'inStorehouseTypeName'
},
{
title:'鍨嬪彿/鍥惧彿',
@@ -229,7 +237,7 @@
{
title:'鍏ュ簱鏁伴噺',
align:"center",
- dataIndex: 'inStorageQuantity'
+ dataIndex: 'inNumber'
},
// {
// title:'澶囨敞',
@@ -249,17 +257,17 @@
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
- }
+ // {
+ // title: '鎿嶄綔',
+ // dataIndex: 'action',
+ // align:"center",
+ // fixed:"right",
+ // width:147,
+ // scopedSlots: { customRender: 'action' }
+ // }
],
url: {
- list: "/tms/inboundDetail/list",
+ list: "/tms/inStoreDetail/list",
paraHolesToolsList:"/tms/baseTools/paraHolesToolsList",
paraCommonToolList:"/tms/baseTools/paraCommonToolList",
paraThreadingToolList:"/tms/baseTools/paraThreadingToolList",
@@ -308,6 +316,10 @@
this.$refs.modalForm.title = "鏂板宸ュ叿鍏ュ簱";
this.$refs.modalForm.disableSubmit = false;
},
+
+ handleInbound() {
+ this.$refs.inboundApplyModelList.show();
+ },
handleDelete(id) {
deleteAction(this.url.delete, {id: id}).then((res) => {
if (res.success) {
--
Gitblit v1.9.3