From 04bf2cc9cd64a8df7047aaa56bb64ab69a78804b Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期日, 04 八月 2024 15:55:49 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html
---
module/md/page/customer/page/customer_list_account.html | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/module/md/page/customer/page/customer_list_account.html b/module/md/page/customer/page/customer_list_account.html
index 62d6210..91250fe 100644
--- a/module/md/page/customer/page/customer_list_account.html
+++ b/module/md/page/customer/page/customer_list_account.html
@@ -740,11 +740,11 @@
}
},
{
- name: "棰勫悎浣滅敵璇�", isbuttonshow: true,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].state_code == "Open") {
+ if (selectRowList[0] && (selectRowList[0].state_code == "Open" || selectRowList[0].state_code == "Prepared")) {
bo_ = false;
}
return bo_
@@ -777,18 +777,36 @@
// }
// },
- {
- isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
- code: "repeal", isselected: true, classname:"",
+ // {
+ // isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
+ // code: "repeal", isselected: true, classname:"",
+ // disabled: function(selectRowList) {
+ // var bo_ = true ;
+ // if (selectRowList[0] && selectRowList[0].source == "DMS") {
+ // bo_ = false
+ // }
+ // return bo_;
+ // },
+ // onclick: function(obj) {
+ // me.repealDataPolicy(obj, obj.selectedList[0])
+ // }
+ // },
+ {
+ // name: "鍒犻櫎", // type: "primary", // icon: "el-icon-edit",
+ isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
+ code: "delete", isselected: true, classname: "",
disabled: function(selectRowList) {
- var bo_ = true ;
- if (selectRowList[0] && selectRowList[0].source == "DMS") {
- bo_ = false
- }
- return bo_;
+ var bo_ = true ;
+ if (selectRowList[0] && selectRowList[0].state_code == 'Input') {
+ bo_ = false
+ }
+ return bo_;
},
onclick: function(obj) {
- me.repealDataPolicy(obj, obj.selectedList[0])
+ me.delData()
+ // obj.selectedList
+ // me.closeData('browse', obj.selectedList[0]);
+ // me.closeData();
}
},
@@ -929,10 +947,10 @@
]
tablebuttonClick.WaitOpen = [
- {
- // name: "鎻愪氦", // type: "primary", // icon: "el-icon-edit",
+ {
+ name: "杞悎浣�", // type: "primary", // icon: "el-icon-edit",
isbuttonshow: me.cbuttons_r.commitData ? me.cbuttons_r.commitData : false, type: "success",
- code: "submit", isselected: true, classname: "",
+ code: "toCooperation", isselected: true, classname: "",
disabled: function(selectRowList) {
var bo_ = true ;
if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
@@ -1446,8 +1464,8 @@
},
commitnCustomerUser(sceneCode, row) {
var me = this;
- Root.confirm('鏄惁纭鎻愪氦', '鎻愪氦鎻愮ず', {
- confirmButtonText: '纭� 璁�',
+ Root.confirm('纭鎻愪氦姝ｅ紡鍚堜綔锛�', '鎻愪氦鎻愮ず', {
+ confirmButtonText: '杞� 鍚� 浣�',
cancelButtonText: '鍙� 娑�',
type: 'warning'
}).then(() => {
--
Gitblit v1.8.0