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/customer_list_account.html | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/module/md/page/customer/page/customer_list_account.html b/module/md/page/customer/page/customer_list_account.html
index 572f99e..a820d5f 100644
--- a/module/md/page/customer/page/customer_list_account.html
+++ b/module/md/page/customer/page/customer_list_account.html
@@ -730,7 +730,7 @@
code: "edit",isselected: true,classname: "",
disabled: function(selectRowList) {
var bo_ = true;
- if (selectRowList[0] && selectRowList[0].source == "DMS") {
+ if (selectRowList[0] && selectRowList[0].state_code == "Input") {
bo_ = false;
}
return bo_
@@ -740,17 +740,26 @@
}
},
{
- name: "寮�鎴�", isbuttonshow: me.cbuttons_r.accountOpen ? me.cbuttons_r.accountOpen : false,type:"success",icon: "el-icon-news",
+ name: "棰勫悎浣滅敵璇�", isbuttonshow: true,type:"success",icon: "el-icon-news",
code: "account",isselected: true,classname: "",
disabled: function(selectRowList) {
var bo_ = true;
- if (selectRowList[0] && selectRowList[0].source == "DMS" && !selectRowList[0].is_distributor) {
+ if (selectRowList[0] && selectRowList[0].state_code == "Prepared") {
bo_ = false;
}
return bo_
},
onclick: function(obj) {
- me.openCustomerUser('add')
+
+ // obj.selectedList
+ // me.closeData('browse', obj.selectedList[0]);
+ // me.commitData(obj.selectedList[0]);
+ obj.selectedList[0]['company_id'] = '1181'
+ obj.selectedList[0]['company_name'] = '姹囧畤鍒惰嵂'
+ obj.selectedList[0]['bu_id'] = 'BU-GM'
+ obj.selectedList[0]['bu_name'] = '鑲跨槫'
+ console.log(obj.selectedList[0])
+ me.openCustomerUser('add', obj.selectedList[0]);
}
},
// {
@@ -845,7 +854,7 @@
},
{
- name: "鍏虫埛", isbuttonshow: me.cbuttons_r.accountClose ? me.cbuttons_r.accountClose : false,type:"danger",icon: "el-icon-circle-close",
+ name: "閫�鍑�", isbuttonshow: me.cbuttons_r.accountClose ? me.cbuttons_r.accountClose : false,type:"danger",icon: "el-icon-circle-close",
code: "account",isselected: true,classname: "",
disabled: function(selectRowList) {
var bo_ = true;
@@ -939,6 +948,7 @@
me.openCustomerUser('edit', obj.selectedList[0]);
}
},
+
{
// name: "璇︽儏", // type: "primary", // icon: "el-icon-edit",
isbuttonshow: me.cbuttons_r.formdetail ? me.cbuttons_r.formdetail : false,
@@ -1337,7 +1347,7 @@
width: "1100px",
height: "520px",
icon: "icon-product",
- text: "瀹㈠晢淇℃伅" + (row.name ? row.name : ""),
+ text: "鎺ㄥ箍鍟嗕俊鎭�" + (row.name ? row.name : ""),
id: "customer_basic" + (row.id? row.id : "add"),//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
url: "module/md/page/customer/page/customer_basic.html",
data: row,
--
Gitblit v1.8.0