From 8f9dce08ec70dc436b86a782e7bcb13872e52390 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 20 八月 2024 20:06:24 +0800
Subject: [PATCH] 调整
---
module/flow/page/flow_sales_list.html | 341 +++++---------------------------------------------------
1 files changed, 31 insertions(+), 310 deletions(-)
diff --git a/module/flow/page/flow_sales_list.html b/module/flow/page/flow_sales_list.html
index 3c4f134..ee43c37 100644
--- a/module/flow/page/flow_sales_list.html
+++ b/module/flow/page/flow_sales_list.html
@@ -18,7 +18,7 @@
title: "閿�鍞祦鍚�",
//Tab椤硅缃�
tabs_d: [
- {code: "month", name: "鏈堟祦鍚�", dataname: "flow_month_sell", filterTxt: "", orderby: ""},
+ {code: "month", name: "鏈堟祦鍚�", dataname: "flow_month_sell_sum", filterTxt: "", orderby: ""},
{code: "daily", name: "鏃ユ祦鍚�", dataname: "flow_daily_sell", filterTxt: "", orderby: ""},
],
d_tabs: {
@@ -41,9 +41,10 @@
{isshow: "T", field: "org_code", name: "缁忛攢鍟嗙紪鐮�", filterfield:"", filteroperator: "like", type: ""},
{isshow: "T", field: "org_name", name: "缁忛攢鍟嗗悕绉�", filterfield:"", filteroperator: "like", type: ""},
],
+ dataversion: "鏈堝害鍒濈増",
default_filterObj: {
month: {
- dataversion: "鏈堝害鍒濈増"
+ // dataversion: "鏈堝害鍒濈増"
//year: new Date().getFullYear().toString(),
//month: (new Date().getMonth() + 1).toString(),
// month: dateFormat(new Date(), "yyyy-MM"),
@@ -218,163 +219,33 @@
tableFieldClick() {
var me = this;
//杈栧尯鍖婚櫌鍒楄〃
- var tablefieldClick_hospital = {
- code: {//瀛楁浜嬩欢璁剧疆
+ var tablefieldClick_month = {
+ // flow_month_sell_qty__qty_check
+ // flow_month_sell_qty__amt_check
+ // flow_month_sell_qty__qty_grant
+ // flow_month_sell_qty__amt_grant
+
+ flow_month_sell_qty__qty_check: {//瀛楁浜嬩欢璁剧疆
val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- me.showInfo(obj);
+ var filter_ = "_datano='"+ obj.row.datano +"'"
+ me.showInfo(obj, "v_fee_working_qty_task", filter_, "缁撶畻鏄庣粏");
+ },
+ },
+ },
+ flow_month_sell_qty__qty_grant: {//瀛楁浜嬩欢璁剧疆
+ val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
+ onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
+ var filter_ = "datano='"+ obj.row.datano +"'"
+ me.showInfo(obj, "v_fee_working_grant_task", filter_, "鎵ц鏄庣粏");
},
},
}
};
- //杈栧尯鍙樻洿
- var tablefieldClick_info = {
- //waiting
- hospital_code: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- me.showChangeInfo(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);
- },
- },
- },
- };
- //鍖婚櫌鎺堟潈鍒楄〃
- var tablefieldClick_org = {
- category_name: {//鎺堟潈浜у搧
- val: {
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [
- {
- field: "id",
- val: null,
- }
- ],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- me.showAuthInfo(obj.row)
- },
- },
- defaultval: {
- val: "鏌ョ湅",//绌哄�兼椂鐨勬樉绀哄��
- onclick: function(obj) {//榛樿鍊肩偣鍑讳簨浠�,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
- me.showAuthInfo(obj.row)
- }
- },
- },
- 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);
- },
- },
- },
- };
- //鎺堟潈鍙樻洿
- var tablefieldClick_auth = {
- 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);
- },
- },
- },
- type_name: {//鎺堟潈浜у搧
- val: {
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- me.showAuthChange(obj.row)
- },
- },
- defaultval: {
- val: "鏌ョ湅",//绌哄�兼椂鐨勬樉绀哄��
- onclick: function(obj) {//榛樿鍊肩偣鍑讳簨浠�,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
- me.showAuthChange(obj.row)
- }
- },
- },
- };
var filterfieldClick = {};
-
- //鍖婚櫌绠＄悊鍒楄〃-杈栧尯鍖婚櫌tab
- if (this.selectTabObj.code == "hospital") {
- this.selectTabObj.tablefieldClick = tablefieldClick_hospital;
- }
- //杈栧尯鏂板/鍙樻洿-杈栧尯瀹℃壒涓�佸叏閮ㄨ緰鍖虹敵璇穞ab
- else if (this.selectTabObj.code == "infoUnderApproval" || this.selectTabObj.code == "infoAll") {
- this.selectTabObj.tablefieldClick = tablefieldClick_info;
- }
- //鍖婚櫌鎺堟潈鍒楄〃-鍖婚櫌鎺堟潈tab
- else if (this.selectTabObj.code == "authorize") {
- this.selectTabObj.tablefieldClick = tablefieldClick_org;
- }
- //鎺堟潈鍙樻洿-鎺堟潈瀹℃壒涓�佸叏閮ㄦ巿鏉冪敵璇穞ab
- else if (this.selectTabObj.code == "authUnderApproval" || this.selectTabObj.code == "authAll") {
- this.selectTabObj.tablefieldClick = tablefieldClick_auth;
+ if (this.selectTabObj.code == "month") {
+ this.selectTabObj.tablefieldClick = tablefieldClick_month;
}
this.filterfieldClick = filterfieldClick;
@@ -465,173 +336,23 @@
}
},
- delDataPolicy(obj, row) {
- let me = this;
- let name_ = "璇ユ暟鎹�";
-
- if (!row.id) {
- Root.message({
- type: 'warning',
- message: '璇烽�夋嫨鍒犻櫎鏁版嵁'
- });
- return
- }
- if (row.md_hospital__name) {
- name_ = "_" + row.md_hospital__name + "_";
- }
-
- Root.confirm('纭畾鍒犻櫎' + name_ + '鍚楋紵', '鍒犻櫎鎻愮ず', {
- confirmButtonText: '鍒犻櫎',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- let param = {
- id: row.id,
- dataname: me.selectTabObj.dataname,
- }
- Server.call("root/data/deleteEntity", param, function(result) {
- Root.message({
- type: 'success',
- message: '鍒犻櫎鎴愬姛!'
- });
- me.onQuery();
- });
- }).catch(() => {
- Root.message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
- });
- });
- },
-
- commitData(obj) {
+ // 閫氱敤鏌ョ湅寮圭獥
+ showInfo(obj, dataname, filter, text) {
var me = this;
- Root.confirm('纭畾鎻愪氦杈栧尯鍖婚櫌' + obj.md_hospital__name + '鍚楋紵', '鎻愪氦鎻愮ず', {
- confirmButtonText: '鎻愪氦',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- var param = {
- dataname: me.selectTabObj.dataname,
- id: obj.id,
- to_state: "OpeningApproval"
- }
- console.log(me.selectTabObj)
- Server.call("root/data/commit", param, function(result) {
- console.log(result);
- if (result.success) {
- Root.message({
- type: 'success',
- message: '鎻愪氦鎴愬姛'
- });
- me.onQuery();
- }
- });
- }).catch(() => {
- Root.message({
- type: 'info',
- message: '宸插彇娑�'
- });
- });
- },
-
- openPolicy(sceneCode, row) {
- let me = this;
- var text = "";
-
- // type_code: "", // Standard鏍囧噯浠风洰琛ㄣ�丆ustomer缁忛攢鍟嗕环鐩〃
- if (sceneCode == "add") {
- }
- else if (sceneCode == "edit" || sceneCode == "browse") {
- if(!row){
- Root.message({
- type: 'warning',
- message: '璇烽�夋嫨涓�鏉℃暟鎹�'
- });
- return;
- }
-
- // if (row.customer_name) {
- // text = row.customer_name;
- // }
-
- }
-
var config = {
totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "900px",
- height: "320px",
- icon: "icon-product",
- text: "杈栧尯鍖婚櫌" + text,
- id: "popup_position_hospital" + row.id + sceneCode,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/terminal/page/popup/popup_position_hospital.html",
- data: row,
- delta: {dataname: me.selectTabObj.dataname,},
- sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
-
-
- //杈栧尯鍖婚櫌鏂板
- onAddData() {
- var me = this;
-
- var config = {
- totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "900px",
- height: "900px",
- icon: "icon-product",
- text: "鍖婚櫌绠＄悊淇℃伅",
- id: "hospital_list_info",//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/terminal/page/hospital_list_info.html",
- data: {},
- delta: {},
- sceneCode: "add",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- //isSales鎻愪氦鍚庡埛鏂�'杈栧尯瀹℃壒涓�'tab
- // if(me.isSales) {
- var tab = {
- name: 'infoUnderApproval',
- };
- me.activeTabName = 'infoUnderApproval';
- me.handleClick(tab);
- me.onQuery();
- // } else {
- // me.onQuery();
- // }
-
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
-
- //杈栧尯鍖婚櫌淇℃伅鏌ョ湅
- showInfo(obj) {
- var me = this;
-
- var config = {
- totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
width: "1200px",
height: "600px",
icon: "icon-product",
- text: obj.row.name + " 鍖婚櫌绠＄悊淇℃伅",
+ text: text,
id: "hospital_list_info" + "browse" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/terminal/page/hospital_list_info.html",
- data: obj.row,
+ url: "module/tool/page/popup_list_dataname.html",
+ data: {},
+ dataname: dataname,
+ filter: filter, // "sell_qty_id='"+ obj.row.id +"'",
delta: {},
sceneCode: "browse", //"add"//"browse",
callback: function(obj, callback) {
- me.onQuery();
if (callback) {
callback();
}
@@ -1015,7 +736,7 @@
<div style="float: right; margin-right: 18px;">
<el-button-group
- v-if="selectTabObj && selectTabObj.code == 'month' && selectTabObj.filterObj.dataversion == '鏈堝害鍒濈増'"
+ v-if="selectTabObj && selectTabObj.code == 'month' && dataversion == '鏈堝害鍒濈増'"
style="margin-left: 3px;">
<el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.biz_date)"
type="primary" @click="onAddSS" :icon="buttonsconfig.add.icon">鐢宠瘔</el-button>
@@ -1035,7 +756,7 @@
<span v-if="selectTabObj && selectTabObj.code == 'daily'">{{newdate_day}}</span>
<el-radio-group style="margin-left: 10px;"
v-if="selectTabObj && selectTabObj.filterObj && selectTabObj.code=='month'"
- v-model="selectTabObj.filterObj.dataversion" size="mini" fill="#4cb108">
+ v-model="dataversion" size="mini" fill="#4cb108">
<el-radio-button label="鏈堝害鍒濈増">鍒濈増</el-radio-button>
<el-radio-button label="鏈堝害缁堢増">缁堢増</el-radio-button>
</el-radio-group>
--
Gitblit v1.8.0