From 872362acd0e306bb2150d72cce1b556d272e6ba5 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 25 六月 2025 10:01:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/inbound/InboundListRight.vue | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/src/views/tms/modules/inbound/InboundListRight.vue b/src/views/tms/modules/inbound/InboundListRight.vue
index d8c422b..9d15b9c 100644
--- a/src/views/tms/modules/inbound/InboundListRight.vue
+++ b/src/views/tms/modules/inbound/InboundListRight.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false">
+ <a-card :bordered="false" style="flex: 1;overflow:auto;max-height: 600px; min-height: 600px">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -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 -->
@@ -76,6 +76,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
class="j-table-force-nowrap"
+ :customRow="customRow"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
@@ -145,6 +146,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 +165,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 +179,8 @@
ParaTurningToolsList,
ParaCommonToolList,
ParaBladeList,
- InboundModel
+ InboundModel,
+ InboundApplyModelList
},
data () {
return {
@@ -184,8 +188,8 @@
/* 鍒嗛〉鍙傛暟 */
ipagination:{
current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '50'],
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '30'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
},
@@ -211,9 +215,14 @@
dataIndex: 'toolCode'
},
{
+ title:'宸ュ叿缂栧彿',
+ align:"center",
+ dataIndex: 'onlyCode'
+ },
+ {
title:'鍏ュ簱绫诲瀷',
align:"center",
- dataIndex: 'inStorehouseType'
+ dataIndex: 'inStorehouseTypeName'
},
{
title:'鍨嬪彿/鍥惧彿',
@@ -229,7 +238,7 @@
{
title:'鍏ュ簱鏁伴噺',
align:"center",
- dataIndex: 'inStorageQuantity'
+ dataIndex: 'inNumber'
},
// {
// title:'澶囨敞',
@@ -249,17 +258,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",
@@ -305,8 +314,12 @@
}
// 鎵撳紑鏂板妯℃�佹锛屽苟浼犻�掑綋鍓嶉�変腑鐨勮妭鐐�
this.$refs.modalForm.add(this.nodeSelected);
- this.$refs.modalForm.title = "鏂板閫氱敤鍙傛暟绫诲瀷宸ュ叿";
+ this.$refs.modalForm.title = "鏂板宸ュ叿鍏ュ簱";
this.$refs.modalForm.disableSubmit = false;
+ },
+
+ handleInbound() {
+ this.$refs.inboundApplyModelList.show();
},
handleDelete(id) {
deleteAction(this.url.delete, {id: id}).then((res) => {
@@ -324,6 +337,16 @@
modalFormOk() {
this.loadData(); // 鍒锋柊琛ㄦ牸鏁版嵁
this.$bus.$emit('queryTreeData') //鍒锋柊宸︿晶鏍�
+ },
+
+ customRow(record) {
+ return {
+ on: {
+ click: () => {
+ this.onSelectChange(record.id.split(","), [record]);
+ }
+ }
+ }
},
onSelectChange(selectedRowKeys) {
@@ -466,8 +489,11 @@
if (res.success) {
this.dataSource = res.result.records; // 鏇存柊琛ㄦ牸鏁版嵁
this.ipagination.total = res.result.total
+ //榛樿閫変腑绗竴鏉℃暟鎹�
+ this.selectedRowKeys[0] = res.result.records[0].id
+ this.onSelectChange(this.selectedRowKeys)
} else {
- this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
+ //this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
this.ipagination.total = 0
}
})
@@ -475,7 +501,7 @@
this.loading = false;
});
} else {
- this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
+ //this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
}
},
onClearSelected() {
--
Gitblit v1.9.3