From b5812cecf98745f4b36a8bf72ff082c3220ef1d6 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期五, 02 八月 2024 14:32:07 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html
---
module/md/page/customer/page/evaluation_management.html | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/module/md/page/customer/page/evaluation_management.html b/module/md/page/customer/page/evaluation_management.html
index 518268d..8e083f9 100644
--- a/module/md/page/customer/page/evaluation_management.html
+++ b/module/md/page/customer/page/evaluation_management.html
@@ -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", 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: [],
@@ -153,10 +153,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_);
}
}
@@ -259,7 +267,7 @@
width: "1100px",
height: "520px",
icon: "icon-product",
- text: "鎺ㄥ箍鍟嗕俊鎭�" + (row.customer_code ? ("-" + row.customer_code) : ""),
+ 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,
--
Gitblit v1.8.0