From 9d2d560dbe4fc6578b5aab8c82a1746f23c726b0 Mon Sep 17 00:00:00 2001
From: tom <tom.he@highdatas.com>
Date: 星期日, 04 八月 2024 17:51:07 +0800
Subject: [PATCH] 调整

---
 module/md/page/customer/page/evaluation_management.html |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/module/md/page/customer/page/evaluation_management.html b/module/md/page/customer/page/evaluation_management.html
index a65b3c4..6e996d3 100644
--- a/module/md/page/customer/page/evaluation_management.html
+++ b/module/md/page/customer/page/evaluation_management.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta charset="utf-8"><meta http-equiv="Expires" content="0"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Cache-control" content="no-cache"><meta http-equiv="Cache" content="no-cache">
-		<title>缁忛攢鍟嗘寚鏍�</title>
+		<title>鎺ㄥ箍鍟嗚瘎浼�</title>
 		
 		<script type="text/javascript">
 			var pageVue = null;
@@ -25,8 +25,8 @@
 							// // {code: "Closed", name: "澶辨晥", dataname:"so_implant", filterTxt: "state_code='Open'",},
 							// {code: "All", name: "鍏ㄩ儴", dataname: "md_target_dealer", filterTxt: "1 = 1", orderby: "update_time desc"},
 
-							{code: "Current", name: "褰撳墠璇勪及", dataname: "md_org", filterTxt: "1=1", orderby: ""},
-							{code: "History", name: "鍘嗗彶璇勪及", dataname: "md_org", filterTxt: "1=1", orderby: ""},
+							{code: "Current", name: "褰撳墠璇勪及", dataname: "md_org_account", filterTxt: "1=1 and md_org_account.state_code <> 'Input'", orderby: "update_time desc"},
+							{code: "History", name: "鍘嗗彶璇勪及", dataname: "md_org_account", filterTxt: "1=1", orderby: ""},
 							// {code: "Apply", name: "鎸囨爣鐢宠", dataname: "md_target_apply", filterTxt: "1 = 1", orderby: "update_time desc"},
 						],
 						tabs: [],
@@ -80,6 +80,8 @@
 							// },
 						],
 						dataRequestObj: {},
+						
+						isShowTab: false,
 					},
 					created() {},
 					
@@ -153,10 +155,18 @@
 									metas.map(f=>{
 										f.isshow = "T";
 										tableFields_.push(clone(f));
+										if (f.isfilter) {
+											filterFields_.push(clone(f));
+										}
+										else {
+											var filter_f = clone(f);
+											filter_f.isshow = "F";
+											filterFields_.push(filter_f);
+										}
 									})
 									if (!me.selectTabObj.filterFields || (me.selectTabObj.filterFields && me.selectTabObj.filterFields.length == 0)) {
-									me.selectTabObj.filterFields = clone(me.default_filterFields);
-									me.selectTabObj.tableFields = clone(me.default_tableFields);
+									me.selectTabObj.filterFields = clone(filterFields_);
+									me.selectTabObj.tableFields = clone(tableFields_);
 								}
 								}
 
@@ -234,7 +244,7 @@
 										return bo_
 									},
 									onclick: function(obj) {
-										me.openCustomer('browse',obj.selectedList[0])
+										me.openCustomerHistory('browse',obj.selectedList[0])
 									}
                                 }
                             ]
@@ -262,6 +272,40 @@
 								text: "鎺ㄥ箍鍟嗚瘎浼颁俊鎭�" + (row.customer_code ? ("-" + row.customer_code) : ""),
 								id: "evaluation_management_edit" + row.id + sceneCode,
 								url: "module/md/page/customer/page/evaluation_management_edit.html",
+								data: row,
+								delta: {},
+								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
+								callback: function(obj, callback) {
+									me.onQuery();
+									if (callback) {
+										callback();
+									}
+								}
+							};
+							me.doPopupByPublic(config);
+						},
+						openCustomerHistory(sceneCode, obj) {
+							let me = this;
+							var row = {}
+							if (sceneCode == "edit" || sceneCode == "browse") {
+								row = me.selectTabObj.selectedrow;
+								if(!row){
+									Root.message({
+										type: 'warning',
+										message: '璇烽�夋嫨涓�鏉℃暟鎹�'
+									});
+									return;
+								}
+							}
+							
+							var config = {
+								totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
+								width: "1100px",
+								height: "520px",
+								icon: "icon-product",
+								text: "鎺ㄥ箍鍟嗚瘎浼拌褰�" + (row.customer_code ? ("-" + row.customer_code) : ""),
+								id: "evaluation_management_edit" + row.id + sceneCode,
+								url: "module/md/page/customer/page/evaluation_history.html",
 								data: row,
 								delta: {},
 								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
@@ -309,7 +353,7 @@
 						</el-button-group>
 					</div>
 				</div>
-				<div>
+				<div v-show="isShowTab">
 					<el-tabs v-model="activeTabName" @tab-click="handleClick">
 						<el-tab-pane v-for="(tab, k) in tabs" :label="tab.name" :name="tab.code" :key="k"></el-tab-pane>
 					</el-tabs>

--
Gitblit v1.8.0