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/InboundOrderList.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/tms/InboundOrderList.vue b/src/views/tms/InboundOrderList.vue
index 214521c..99bc473 100644
--- a/src/views/tms/InboundOrderList.vue
+++ b/src/views/tms/InboundOrderList.vue
@@ -18,7 +18,7 @@
/>
</a-form-item>
</a-col>
- <a-col :md="6" :sm="8">
+ <!-- <a-col :md="6" :sm="8">
<a-form-item label="缁忔墜浜�">
<j-search-select-tag
placeholder="璇烽�夋嫨缁忔墜浜�"
@@ -26,7 +26,7 @@
dict="sys_user,realname,id,del_flag!=1"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
</a-form>
</div>
@@ -49,6 +49,7 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
@change="handleTableChange"
>
<!--鐘舵�佹爮涓�у睍绀�-->
@@ -169,6 +170,7 @@
scopedSlots: { customRender: 'action' },
},
],
+ loading:false
}
},
computed: {
@@ -190,6 +192,7 @@
click: (e) => {
//灏嗗綋鍓嶉�変腑鐨勮褰曚紶鍒板瓙椤甸潰
this.$bus.$emit('getToolingStorageData', record)
+ this.onSelectChange(record.id.split(","), [record]);
//鐐瑰嚮褰撳墠琛屽彉鑹�
let oldList = document.querySelectorAll('.checked-td-of-add-table')
if (oldList) {
@@ -205,6 +208,10 @@
},
}
},
+ onSelectChange(selectedRowKeys, selectionRows) {
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
+ },
handleEdit: function (record) {
this.$refs.modalForm.edit(record)
this.$refs.modalForm.title = '缂栬緫'
@@ -217,6 +224,7 @@
},
handleSubmit(record) {
let that = this;
+ that.loading = true
getAction(that.url.submit, { id:record.id}).then((res) => {
if (res.success) {
that.$message.success(res.message);
@@ -224,6 +232,8 @@
} else {
that.$message.warning(res.message);
}
+ }).finally(() => {
+ that.loading = false
})
},
},
--
Gitblit v1.9.3