From 2278ff7c0401f7f97e168a0943192357c1999cbf Mon Sep 17 00:00:00 2001
From: tom <tom.he@highdatas.com>
Date: 星期六, 03 八月 2024 13:50:15 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html
---
module/visit/page/visit_schedule_list.html | 78 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/module/visit/page/visit_schedule_list.html b/module/visit/page/visit_schedule_list.html
index 393fc15..a0ced22 100644
--- a/module/visit/page/visit_schedule_list.html
+++ b/module/visit/page/visit_schedule_list.html
@@ -15,7 +15,7 @@
pageVue = new TabTableVue({
el: "#vbody",
data: {
- title: "鍖婚櫌绠＄悊",
+ title: "鎷滆杩涘害",
//Tab椤硅缃�
/*
schedule 杩涘害姹囨��
@@ -24,8 +24,8 @@
*/
tabs_d: [
{code: "schedule", name: "杩涘害姹囨��", dataname: "v_customer_promotion", filterTxt: "", orderby: ""},
- {code: "detail", name: "杩涘害鏄庣粏", dataname: "", filterTxt: "md_terminal_promotion", orderby: ""},
- {code: "warning", name: "棰勮鍒楄〃", dataname: "", filterTxt: "md_terminal_promotion_detail", orderby: ""},
+ {code: "detail", name: "杩涘害鏄庣粏", dataname: "md_terminal_promotion", filterTxt: "", orderby: ""},
+ {code: "warning", name: "棰勮鍒楄〃", dataname: "md_terminal_promotion_detail", filterTxt: "", orderby: ""},
],
d_tabs: {
hospital: true,
@@ -206,6 +206,11 @@
filterFields_.push(filter_f);
}
})
+
+ me.selectTabObj.tableData.map(d=>{
+ d.val_ratio = 50
+ })
+
if (!me.selectTabObj.filterFields || (me.selectTabObj.filterFields && me.selectTabObj.filterFields.length == 0)) {
me.selectTabObj.filterFields = clone(filterFields_);
me.selectTabObj.tableFields = clone(tableFields_);
@@ -238,40 +243,41 @@
}
};
//杈栧尯鍙樻洿
- var tablefieldClick_info = {
- //waiting
- hospital_code: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- me.showChangeInfo(obj);
+ var tablefieldClick_detail = {
+
+ code: { //瀛楁浜嬩欢璁剧疆
+ val: { //鏈夊�兼椂鐨勭偣鍑讳簨浠�
+ notclick_val: "", //涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
+ notclick_bindfield: [], //褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
+ onclick: function(obj) { //鏁版嵁鍊肩偣鍑讳簨浠�
+ me.showInfo(obj)
},
},
},
- state_name: {//鐘舵��
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: ["鑽夌","鑽夌"],
- notclick_bindfield: [],
- onclick: function(obj) {
- var config = {
- totab: false,
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "娴佺▼姝ラ",
- id: "popup_workflow_step_user" + obj.row.id,
- url: "module/tool/page/popup_workflow_step_user.html?v=2023020703",
- data: obj.row,
- delta: {},
- sceneCode: "browse",
- callback: function(obj, callback) {
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
+ is_clinical: {
+ chart: {
+ type: "progress",// 杩涘害鏉＄被鍨�
+ field: "val_ratio",//杩涘害鍊煎瓧娈�
+ progresswidth: 20,//绮楀害
+ isshowtext: true,//鏄惁鏄剧ず鍊�
+ istextinside: true//鏄惁鍦ㄨ繘搴︽潯鍐呮樉绀哄��
+ }
+ },
+ is_clinical_purchase: {
+ chart: {
+ type: "progress",
+ field: "val_ratio",
+ progresswidth: 10,
+ isshowtext: true
+ }
+ },
+ is_formal_purchase: {
+ chart: {
+ type: "progress",
+ field: "val_ratio",
+ progresswidth: 10,
+ isshowtext: false
+ }
},
};
//鍖婚櫌鎺堟潈鍒楄〃
@@ -371,8 +377,8 @@
var filterfieldClick = {};
//鍖婚櫌绠＄悊鍒楄〃-杈栧尯鍖婚櫌tab
- if (this.selectTabObj.code == "hospital") {
- this.selectTabObj.tablefieldClick = tablefieldClick_hospital;
+ if (this.selectTabObj.code == "detail") {
+ this.selectTabObj.tablefieldClick = tablefieldClick_detail;
}
//杈栧尯鏂板/鍙樻洿-杈栧尯瀹℃壒涓�佸叏閮ㄨ緰鍖虹敵璇穞ab
else if (this.selectTabObj.code == "infoUnderApproval" || this.selectTabObj.code == "infoAll") {
--
Gitblit v1.8.0