From d7b6c8a258cbc483a59dc5fd68ba34a2423e7e27 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 31 十二月 2025 16:34:19 +0800
Subject: [PATCH] 修改
---
ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue b/ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue
index c86e5db..c0dd0d1 100644
--- a/ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue
+++ b/ui/admin-ui3/src/views/tms/collectionTmsQuotePlan/index.vue
@@ -163,6 +163,7 @@
let active = table.active;
if (Array.isArray(active)) active = active[0];
if (active) {
+ console.log(active)
Object.assign(form.value, {
projectId: active.id,
projectName: active.projectName,
@@ -173,7 +174,7 @@
});
}
},
- type: 'table',suffixIcon:'search',dataType: 'string',
+ type: 'table',suffixIcon:'search',dataType: 'object',
children:{
border: true,
searchMenuSpan: 5,
@@ -226,7 +227,7 @@
id = value[0]
}
getTmsProject(id).then(res=>{
- return callback(res.data||{})
+ return callback(res.data ? [res.data] : [])
})
}else{
listTmsProject({pageSize:page.pageSize,pageNum:page.currentPage,...data}).then(res=>{
@@ -451,44 +452,39 @@
form.value.items = [];
if (type === 'add'){
form.value.items = sys_quotation_items.value.map((item:any)=>{
- return { rowKey: randomId() ,freeName: item.label,unit: '娆�'}
+ return { rowKey: randomId() ,freeName: item.label,free: item.value,unit: '娆�'}
})
}
},
rowSaveBegin:(row:any,loading:any)=>{
- if (selectionList2.value.length == 0){
- proxy.$modal.msgError("璇疯嚦灏戦�夋嫨涓�鏉″簲鏀惰垂鐢ㄦ姤浠烽」");
- loading();
- throw new Error("璇疯嚦灏戦�夋嫨涓�鏉″簲鏀惰垂鐢ㄦ姤浠烽」");
+ if (selectionList2.value.length > 0){
+ let filter = selectionList2.value.filter((item:any)=>{
+ return !item.price || !item.currency
+ });
+ if (filter.length > 0){
+ proxy.$modal.msgError("璇峰~鍐欐墍鏈夊繀濉」");
+ loading();
+ throw new Error("璇峰~鍐欐墍鏈夊繀濉」")
+ }
+ row.quoteItems = selectionList2.value;
}
+
+
+ },
+ rowUpdateBegin(row:any,loading:any){
+ if (selectionList2.value.length > 0){
let filter = selectionList2.value.filter((item:any)=>{
- return !item.price || !item.currency
- });
+ return !item.price || !item.currency
+ });
if (filter.length > 0){
proxy.$modal.msgError("璇峰~鍐欐墍鏈夊繀濉」");
loading();
throw new Error("璇峰~鍐欐墍鏈夊繀濉」")
}
row.quoteItems = selectionList2.value;
-
- },
- rowUpdateBegin(row:any,loading:any){
- if (selectionList2.value.length == 0){
- proxy.$modal.msgError("璇疯嚦灏戦�夋嫨涓�鏉″簲鏀惰垂鐢ㄦ姤浠烽」");
- loading();
- throw new Error("璇疯嚦灏戦�夋嫨涓�鏉″簲鏀惰垂鐢ㄦ姤浠烽」");
-
}
- let filter = selectionList2.value.filter((item:any)=>{
- return !item.price || !item.currency
- });
- if (filter.length > 0){
- proxy.$modal.msgError("璇峰~鍐欐墍鏈夊繀濉」");
- loading();
- throw new Error("璇峰~鍐欐墍鏈夊繀濉」")
- }
- row.quoteItems = selectionList2.value;
+
},
handleEndOpenFunc:(type:string,res:any)=>{
if (type === 'edit'){
@@ -498,12 +494,12 @@
});
form.value.items = sys_quotation_items.value.map((item:any)=>{
let find = selectionList2.value.find((ele:any)=>
- ele.freeName === item.label
+ ele.free == item.value
);
if ( find){
return find;
}else{
- return { rowKey: randomId() ,freeName: item.label,unit: '娆�'}
+ return { rowKey: randomId() ,freeName: item.label,free: item.value,unit: '娆�'}
}
})
nextTick( ()=>{
--
Gitblit v1.8.0