From a0dadc84e4a819607e1b2b34534bb0b0ae73a7a8 Mon Sep 17 00:00:00 2001
From: tom <tom.he@highdatas.com>
Date: 星期五, 16 八月 2024 12:31:21 +0800
Subject: [PATCH] 调整
---
module/fee/page/fee_qty.html | 992 +++----------------
module/fee/page/fee_payment.html | 732 +-------------
module/fee/page/popup/popup_fee_payment.html | 985 +++++++++++++++++++
module/fee/page/popup/popup_fee_qty.html | 265 +++++
4 files changed, 1,494 insertions(+), 1,480 deletions(-)
diff --git a/module/fee/page/fee_payment.html b/module/fee/page/fee_payment.html
index cbe8ac5..9547052 100644
--- a/module/fee/page/fee_payment.html
+++ b/module/fee/page/fee_payment.html
@@ -19,11 +19,35 @@
dataname: "agm_agreement",
//Tab椤硅缃�
tabs_d: [//agm_agreement
- {code: "Input", name: "璐圭敤鍗曠敵璇�", dataname: "agm_agreement", filterTxt: " (agm_agreement.state_code='Input' or agm_agreement.state_code='Rejected' or agm_agreement.state_code='OpeningApproval')", orderby: "agm_agreement.update_time desc",},
- {code: "Open", name: "鐢熸晥", dataname: "agm_agreement", filterTxt: " agm_agreement.state_code='Open'", orderby: "agm_agreement.update_time desc", },
- {code: "Close", name: "缁堟", dataname: "agm_agreement", filterTxt: " (agm_agreement.state_code='Closed' or date_to < NOW())", orderby: "agm_agreement.update_time desc",},
- {code: "All", name: "鍏ㄩ儴", dataname: "agm_agreement", filterTxt: "1=1", orderby: "agm_agreement.update_time desc",},
+ {code: "Input", name: "璐圭敤鍗曠敵璇�", dataname: "fee_payment", filterTxt: "state_code='Input'", orderby: "",},
+ {code: "Open", name: "鐢熸晥", dataname: "fee_payment", filterTxt: "state_code='Open'", orderby: "", },
+ {code: "Close", name: "缁堟", dataname: "fee_payment", filterTxt: "state_code='Repeal'", orderby: "",},
+ {code: "All", name: "鍏ㄩ儴", dataname: "fee_payment", filterTxt: "1=1", orderby: "",},
],
+ default_tableFields: [
+ { field: "state_name", name: "鐘舵��", isshow: "T", width: "80",input_type_filter:"select",filter_field:"state_code",inputtype:"capsuletag",options_pattern:"{^鑽夌^:^info^,^鐢熸晥^:^success^,^瀹℃壒涓璣:^warning^}"},
+ // { field: "state_name", name: "鐘舵��", isshow: "T", width: "80"},
+ { field: "state_code", name: "鐘舵��", isshow: "F", width: "80" },
+ { field: "id", name: "璐圭敤鍗曠紪鍙�", isshow: "T", width: "120", isfilter: true },
+ { field: "province", name: "鐪佷唤", isshow: "T" ,width: "100"},
+ { field: "rate", name: "璐圭巼", isshow: "T" ,width: "100"},
+ { field: "amt_rate", name: "浠樻姣斾緥", isshow: "T" ,width: "100"},
+ { field: "customer_code", name: "鏈嶅姟渚涘簲鍟嗙紪鐮�", isshow: "T" ,width: "110"},
+ { field: "customer_name", name: "鏈嶅姟渚涘簲鍟�", isshow: "T" ,width: "200",align:"left"},
+ { field: "amt", name: "搴斾粯閲戦", isshow: "T" ,width: "100",formatter:'formatter_money'},
+ { field: "other_deduction", name: "鍏朵綑鎵ｆ", isshow: "T", align: "center", width: "100",formatter:'formatter_money' },
+ { field: "after_deduction_amt", name: "鎵ｆ鍚庨噾棰�", isshow: "T", align: "center", width: "100",formatter:'formatter_money' },
+ { field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center", width: "100" },
+ { field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center", width: "100" ,formatter:'formatter_date'},
+ { field: "order_state", name: "灏炬鐘舵��", isshow: "T", align: "center", width: "100" },
+ { field: "order_code", name: "鍏宠仈棣栨鍗曞彿", isshow: "T", align: "center", width: "100", isfilter: true },
+ { field: "province_order_code", name: "鐪佺骇璐圭敤鍗曞彿", isshow: "T", align: "center", width: "100", isfilter: true },
+ { field: "payment", name: "浠樻閲戦", isshow: "T", align: "center", width: "100",formatter:'formatter_money' },
+ { field: "payment_date", name: "浠樻鏃堕棿", isshow: "T", align: "center", width: "100", isfilter: true ,formatter:'formatter_date'},
+ { field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center", width: "100" },
+ ],
+
+
// d_tabs: {
// Input: true,
// Working: true,
@@ -87,46 +111,19 @@
me.tableButtonClick();
this.doQueryByTab(function(result, callback) {//鏌ヨ鍚庣殑鍥炶皟锛岀敤浜庤幏鍙栧瓧娈电殑
if (result.meta && result.meta[me.selectTabObj.dataname] && result.meta[me.selectTabObj.dataname].fields) {
- var metas = clone(result.meta[me.selectTabObj.dataname].fields);
+ // var metas = clone(result.meta[me.selectTabObj.dataname].fields);
var filterFields_ = [];
var tableFields_ = [];
- metas.map(f=>{
- f.isshow = "T";
+ me.default_tableFields.map(f=>{
- if (me.selectTabObj.code == 'Input') {
- if (f.field == 'contract_attachment_name') {
- f.isshow = "F";
- }
- }
-
- if (me.isCustomer && (f.field == "contact_department" || f.field == "contact_phone"
- || f.field == "template_attachment_name" || f.field == "logistics_code"
- || f.field == "creator_name" || f.field == "create_time" || f.field == "update_time"
- )) {
- f.isshow = "F"
- f.isfilter = false
- }
-
- if (me.isCustomer && me.selectTabObj.code != "Close" && (f.field == "suspend_date" || f.field == "suspend_remark")) {
- f.isshow = "F"
- f.isfilter = false
- }
-
- if (f.isfilter) {
- filterFields_.push(clone(f));
- }
- else {
- var filter_f = clone(f);
- filter_f.isshow = "F";
- filterFields_.push(filter_f);
- }
+ filterFields_.push(clone(f));
tableFields_.push(clone(f));
})
if (!me.selectTabObj.filterFields || (me.selectTabObj.filterFields && me.selectTabObj.filterFields.length == 0)) {
me.selectTabObj.filterFields = clone(filterFields_);
- me.selectTabObj.tableFields = clone(tableFields_);
+ me.selectTabObj.tableFields = clone(me.default_tableFields);
// me.selectTabObj.filterFields = clone(me.default_filterFields);
// me.selectTabObj.tableFields = clone(me.default_tableFields);
@@ -152,17 +149,15 @@
tablebuttonClick.Input = [
{
// name: "鏂板", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.add ? me.cbuttons_r.add : false,
+ isbuttonshow: true,
code: "add", isselected: false, classname: "",
onclick: function(obj) {
- // obj.selectedList
- me.openAgreement('add', obj.selectedList[0]);
+ me.openPayment('add')
}
},
{
- // name: "鎻愪氦", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.submit ? me.cbuttons_r.submit : false, type: "success",
- code: "submit", isselected: true, classname: "",
+ isbuttonshow:true, type: "success",
+ code: "edit", isselected: true, classname: "",
disabled: function(selectRowList) {
var bo_ = true;
if (selectRowList[0] && selectRowList[0].state_code == "Input") {
@@ -171,16 +166,12 @@
return bo_
},
onclick: function(obj) {
-
- // obj.selectedList
- // me.closeData('browse', obj.selectedList[0]);
- // me.commitData(obj.selectedList[0]);
- me.openAgreement('edit', obj.selectedList[0]);
+ me.openPayment('edit')
}
},
{
// name: "璇︽儏", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.formdetail ? me.cbuttons_r.formdetail : false,
+ isbuttonshow: true,
code: "formdetail", isselected: true, classname: "",
disabled: function(selectRowList) {
var bo_ = true;
@@ -191,28 +182,27 @@
},
onclick: function(obj) {
// obj.selectedList
- me.openAgreement('browse', obj.selectedList[0]);
+ me.openPayment('browse')
}
},
{
- // name: "缂栬緫", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.edit ? me.cbuttons_r.edit : false,
- code: "edit", isselected: true, classname: "",
- disabled: function(selectRowList) {
+ // name: "浣滃簾", // type: "primary", // icon: "el-icon-edit",
+ isbuttonshow: true, type: "danger",
+ code: "cancel", isselected: true, classname: "",
+ islistselected: true, // 鍙互澶氶��
+ disabled: function(selectRowList, selectedList) {
var bo_ = true;
- if (selectRowList[0] && selectRowList[0].state_code == "Input") {
+ if (selectedList.length) { // 鍙互澶氶��
bo_ = false;
}
return bo_
},
onclick: function(obj) {
- // obj.selectedList
- me.openAgreement('edit', obj.selectedList[0]);
}
},
{
// name: "鍒犻櫎", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
+ isbuttonshow: true, type: "danger",
code: "delete", isselected: true, classname: "",
disabled: function(selectRowList) {
var bo_ = true;
@@ -248,38 +238,6 @@
// }
// },
- {
- name: "鍗忚鎵撳嵃", type: "primary", icon: "el-icon-copy-document",
- isbuttonshow: me.cbuttons_r.PDFFile ? me.cbuttons_r.PDFFile : false,
- code: "PDFFile", isselected: true, classname: "",
- disabled: function(selectRowList, selectedList) {
- var bo_ = true;
- if (selectRowList[0] && selectRowList[0].comeback_attachment_id) {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- // obj.selectedList
- me.showFileImgByFileId(me.selectTabObj.selectedrow, 'comeback_attachment_name', 'comeback_attachment_id', me.dataname)
- }
- },
- {
- name: "鍗忚鍥炴寕", type: "primary", icon: "el-icon-copy-document",
- isbuttonshow: me.cbuttons_r.uploadFilePDF ? me.cbuttons_r.uploadFilePDF : false,
- code: "uploadFilePDF", isselected: true, classname: "",
- disabled: function(selectRowList, selectedList) {
- var bo_ = true;
- if (selectRowList[0]) {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- // obj.selectedList
- me.onPopupByUploadFile(me.selectTabObj.selectedrow, 'comeback_attachment_name', 'comeback_attachment_id', me.dataname)
- }
- },
{
name: "缁", type: "primary", icon: "el-icon-copy-document",
isbuttonshow: me.cbuttons_r.agmCopy ? me.cbuttons_r.agmCopy : false,
@@ -329,22 +287,7 @@
})
}
},
- {
- name: "鍙樻洿", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.change ? me.cbuttons_r.change : false,
- code: "change", isselected: true, classname: "",
- disabled: function(selectRowList) {
- var bo_ = true;
- if (selectRowList[0] && selectRowList[0].state_code == "Open") {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- // obj.selectedList
- me.openAgreement('change', obj.selectedList[0]);
- }
- },
+
{
// name: "浣滃簾", // type: "primary", // icon: "el-icon-edit",
isbuttonshow: me.cbuttons_r.repeal ? me.cbuttons_r.repeal : false, type: "danger",
@@ -540,159 +483,24 @@
var tablefieldClick = {};
//琛ㄦ牸瀛楁浜嬩欢璁剧疆
tablefieldClick = {
- agreement_no: {//瀛楁浜嬩欢璁剧疆
+ id: {//瀛楁浜嬩欢璁剧疆
val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
//鎵撳紑
- me.onShowData(obj);
+ me.openPayment('browse');
},
},
- defaultval: {
- val: "鏌ョ湅",//绌哄�兼椂鐨勬樉绀哄��
- onclick: function(obj) {//榛樿鍊肩偣鍑讳簨浠�,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
- me.onShowData(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);
- },
- },
- },
- template_attachment_name: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [{field:"contract_attachment_id", val: null}],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- //鎵撳紑
- me.showFileImgByFileId(obj.row, "template_attachment_name", "contract_attachment_id", me.dataname);
- },
- },
- },
- contract_attachment_name: {//瀛楁浜嬩欢璁剧疆
- defaultval: {
- val: "鍘熷崗璁笂浼�",//绌哄�兼椂鐨勬樉绀哄��
- onclick: function(obj) {//榛樿鍊肩偣鍑讳簨浠�,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
- me.onPopupByUploadFile(obj.row, "contract_attachment_name", "contract_attachment_id", me.dataname);
- }
- },
- val:{
- onclick: function(obj){
- me.showFileImgByFileId(obj.row, "contract_attachment_name", "contract_attachment_id", me.dataname);
- }
- },
- suffixval: {
- val: "鍘熷崗璁笂浼�",//鏈夊�兼椂鐨勫悗缂�锛屾鍚庣紑鍜屽崟浣嶅悗缂�涓嶅悓锛屽锛氳鎯咃紝鏇村锛屾煡鐪嬬瓑
- onclick: function(obj) {//鏈夊�兼椂鐨勫悗缂�鐐瑰嚮浜嬩欢,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
- me.onPopupByUploadFile(obj.row, "contract_attachment_name", "contract_attachment_id", me.dataname);
- }
- },
- },
-
- comeback_attachment_name: {//瀛楁浜嬩欢璁剧疆
- defaultval: {
- val: "鍗忚鍥炴寕",//绌哄�兼椂鐨勬樉绀哄��
- onclick: function(obj) {//榛樿鍊肩偣鍑讳簨浠�,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
- me.onPopupByUploadFile(obj.row, "comeback_attachment_name", "comeback_attachment_id", me.dataname);
- }
- },
- val:{
- onclick: function(obj){
- me.showFileImgByFileId(obj.row, "comeback_attachment_name", "comeback_attachment_id", me.dataname);
- }
- },
- suffixval: {
- val: "鍗忚鍥炴寕",//鏈夊�兼椂鐨勫悗缂�锛屾鍚庣紑鍜屽崟浣嶅悗缂�涓嶅悓锛屽锛氳鎯咃紝鏇村锛屾煡鐪嬬瓑
- onclick: function(obj) {//鏈夊�兼椂鐨勫悗缂�鐐瑰嚮浜嬩欢,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
- me.onPopupByUploadFile(obj.row, "comeback_attachment_name", "comeback_attachment_id", me.dataname);
- }
- },
+ // defaultval: {
+ // val: "鏌ョ湅",//绌哄�兼椂鐨勬樉绀哄��
+ // onclick: function(obj) {//榛樿鍊肩偣鍑讳簨浠�,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
+ // me.onShowData(obj);
+ // }
+ // },
},
};
-
- tablefieldClickBeforeOpen = {
- agreement_no: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- //鎵撳紑
- me.onShowData(obj);
- },
- },
- defaultval: {
- val: "鏌ョ湅",//绌哄�兼椂鐨勬樉绀哄��
- onclick: function(obj) {//榛樿鍊肩偣鍑讳簨浠�,姝や簨浠堕渶瑕佽缃畍al鎵嶆湁鏁�
- me.onShowData(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);
- },
- },
- },
- template_attachment_name: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [{field:"contract_attachment_id", val: null}],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- //鎵撳紑
- me.showFileImgByFileId(obj.row, "template_attachment_name", "contract_attachment_id", me.dataname);
- },
- },
- },
- };
-
- if (this.selectTabObj.code != 'Input') {
- this.selectTabObj.tablefieldClick = tablefieldClick;
- } else {
- this.selectTabObj.tablefieldClick = tablefieldClickBeforeOpen;
- }
+ this.selectTabObj.tablefieldClick = tablefieldClick;
},
onSuspend(callback) {
@@ -717,30 +525,31 @@
me.doPopupByPublic(config);
},
- onShowData(obj) {
- var me = this;
- var row = obj.row;
-
- //1. empty row
- if (!row || !row.id) {
- Root.message({
- type: 'warning',
- message: '璇烽�夋嫨瑕佹煡鐪嬬殑鏁版嵁'
- });
- return false;
+
+ openPayment(sceneCode){
+ let me = this;
+ var row = {};
+ if (sceneCode == "edit" || sceneCode == "browse") {
+ row = me.selectTabObj.selectedrow;
+ if (!row.id) {
+ Root.message({
+ type: 'warning',
+ message: '璇烽�夋嫨涓�鏉℃暟鎹�'
+ });
+ return;
+ }
}
-
var config = {
totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "900px",
- height: "900px",
+ width: "1100px",
+ height: "520px",
icon: "icon-product",
- text: "鍗忚璇︽儏",
- id: "apply_edit_b" + row.id,
- url: "module/md/page/customer/page/customer_list_agreement_edit.html",
+ text: "鍗曟嵁淇℃伅" + (row.name ? row.name : ""),
+ id: "fee_payment" + (row.id? row.id : "add"),//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+ url: "module/fee/page/popup/popup_fee_payment.html",
data: row,
delta: {},
- sceneCode: "browse", //"add"//"browse",
+ sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
callback: function(obj, callback) {
me.onQuery();
if (callback) {
@@ -751,89 +560,6 @@
me.doPopupByPublic(config);
},
- onAddData() {
- var me = this;
-
- var config = {
- totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- icon: "icon-product",
- text: "鍗忚淇℃伅",
- id: "apply_edit",//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/customer_list_agreement_edit.html",
- data: {},
- delta: {},
- sceneCode: "add",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
-
- commitData(obj) {
- var me = this;
- Root.confirm('纭畾鎻愪氦鍗忚' + obj.agreement_no + '鍚楋紵', '鎻愪氦鎻愮ず', {
- confirmButtonText: '鎻愪氦',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- var param = {
- dataname: me.selectTabObj.dataname,
- id: obj.id,
- // to_state: "OpeningApproval"
- }
- 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: '宸插彇娑�'
- });
- });
- },
-
- onEditData() {
- var me = this;
- var row = this.selectTabObj.selectedrow;;
-
- //1. empty row
- if (!row || !row.id) {
- Root.message({
- type: 'warning',
- message: '璇烽�夋嫨瑕佺紪杈戠殑鏁版嵁'
- });
- return false;
- }
-
- var config = {
- totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- icon: "icon-product",
- text: "鍗忚淇℃伅",
- id: "apply_edit" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/customer_list_agreement_edit.html",
- data: row,
- delta: {},
- sceneCode: "edit",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
delData: function(scope) {
let me = this;
var row = me.selectTabObj.selectedrow;
@@ -872,171 +598,6 @@
message: '宸插彇娑堝垹闄�'
});
});
- },
-
- //浣滃簾妯℃澘
- cancelConfirm() {
- let me = this;
- data = me.selectTabObj.selectedrow;
- Root.confirm('纭畾缁堟-' + data.agreement_no + '-鍚楋紵', '缁堟鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- me.onCancelData();
- }).catch(() => {
- Root.message({
- type: 'info',
- message: '宸插彇娑堢粓姝�'
- });
- });
- },
-
- onCancelData() {
- var me = this;
-
- let param = {
- dataname: me.dataname,
- data: {
- "agm_agreement" :{
- id: me.selectTabObj.selectedrow.id,
- date_suspend: "", // 缁堟鏃ユ湡
- remark_suspend: "", // 缁堟璇存槑
- state_code: "Cancel",
- state_name: "缁堟",
- }
- },
- }
-
- Server.call("root/data/saveEntity", param, function(result) {
- console.log(result);
- Root.message({
- type: 'success',
- message: '宸蹭綔搴�'
- });
- me.onQuery();
- });
- },
-
- showFileImgByFileId(row, filenamefield, fileidfield, dataname) {
- let me = this;
- var file_name = row[filenamefield];
- var file_id = row[fileidfield];
- if(file_id) {
- var fileid = file_id;
- let fileName = clone(file_name);
- let index1 = fileName.lastIndexOf(".");
- let index2 = fileName.length;
- let suffix = fileName.substring(index1, index2).toLowerCase(); //鍚庣紑鍚�
- if (suffix == ".png" || suffix == ".jpg" || suffix == ".pdf") {
- var row = {
- fileid: fileid,
- filename: fileName,
- dataname: dataname
- }
-
- var config = {
- totab: false,
- width: "1000px",
- height: 800,
- icon: "icon-product",
- text: "闄勪欢棰勮",
- id: "pdf_" + fileid,
- url: "module/tool/page/popup_file_pdf.html",
- data: row,
- delta: {},
- callback: function(obj, callback) {
- if (callback) {
- callback();
- }
- }
- };
- this.doPopupByPublic(config);
- }
- else {//鍙彲涓嬭浇锛屼笉鍙瑙�
- // handleDownloadUrl(fileid,false);
- handleDownload(fileid, dataname);
- }
- }
- },
-
- onPopupByUploadFile(row, filenamefield, fileidfield, dataname) {
- var me = this;
- if (row.state_code != 'Open') {
- Root.message({
- type: 'warning',
- message: '浠呯敓鏁堟暟鎹彲浠ヨ繘琛屽崗璁洖鎸�'
- });
- return;
- }
- var txt_ = "";
- var isexists = false;
- if (filenamefield == "comeback_attachment_name") { // 鍗忚鍥炴寕
- txt_ = "閲嶆柊杩涜鍗忚鍥炴寕灏嗘浛鎹㈠師鍥炴寕鍗忚";
- if (row.comeback_attachment_id) {
- isexists = true;
- }
- }
- else if (filenamefield == "contract_attachment_name") { // 鍗忚鍘熶欢
- txt_ = "閲嶆柊涓婁紶鍗忚鍘熶欢灏嗘浛鎹㈠師鍗忚鍘熶欢";
- if (row.contract_attachment_id) {
- isexists = true;
- }
- }
-
-
- if (isexists) {
- Root.confirm(txt_, '涓婁紶鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- me.doPopupByUploadFile(row, filenamefield, fileidfield, dataname);
- }).catch(() => {
- Root.message({
- type: 'info',
- message: '宸插彇娑堜笂浼�'
- });
- });
- } else {
- me.doPopupByUploadFile(row, filenamefield, fileidfield, dataname);
- }
- },
-
- doPopupByUploadFile(row, filenamefield, fileidfield, dataname) {
- var me = this;
- var analysistype_ = "";
- var delta_ = {filetypelist: []}//[".png", ".jpg", ".pdf"]
- var config = {
- totab: false,
- width: "500px",
- icon: "icon-product",
- text: "闄勪欢涓婁紶",
- id: "popupByUploadFile",
- url: "module/tool/page/popup_uploadFile.html",
- data: {
- dataName: dataname,
- fileidfieldName: fileidfield,
- id: row.id,
- fileNamefieldName: filenamefield
- },
- delta: delta_,
- callback: function(fileobj, callback) {
- me.$message({
- showClose: true,
- message: '涓婁紶鎴愬姛锛�',
- type: 'success'
- });
- row[filenamefield] =decodeURI(fileobj.row[0].name);
- row[fileidfield] = fileobj.row[0].id;
- me.onQuery();
-
- if (callback) {
- callback();
- }
- }
- };
- this.doPopupByPublic(config);
},
download() {
@@ -1134,144 +695,17 @@
};
me.doPopupByPublic(config);
},
-
-
+ rowClick(obj){
+ var me = this;
+ me.selectTabObj.selectedrow = obj.row;
+ },
selectionChange(obj){
var me = this;
- me.selectTabObj.selectedrows = obj;
+ me.selectedrows = obj;
},
saveShoppingcart(list) {
var me = this;
- me.selectTabObj.selectedrows = list;
- },
- onDownload() {
- let me = this;
- var ioname = ""
- var filename = '鍗忚瀵煎嚭' + String(new Date().getTime());
- var filter_ = "1 = 1";
- filter_ = this.getFilterData(filter_);
- if (me.selectTabObj.code == "Input") {
- ioname = "export_agm"
- filename = '鍗忚鐢宠瀵煎嚭' + String(new Date().getTime());
- }
- else if (me.selectTabObj.code == "Open") {
- ioname = "export_agm_apply"
- }
- let param = {
- sign: "agm_agreement",
- filename: filename,
- filter: filter_,
- ioname:ioname,
- orderby: "",
- token: Root.getToken()
- }
- window.top.vue.textdownloadForm(param);
- },
-
- editLogisticsCode() {
- var me = this;
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "500px",
- height: "300px",
- icon: "icon-product",
- text: "缂栬緫鐗╂祦鍗曞彿",
- id: "delivery_info_expresscode" + me.selectTabObj.selectedrow.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/agreement-popup/delivery_info_expresscode.html",
- data: me.selectTabObj.selectedrow,
- delta: {},
- sceneCode: "edit",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
-
- openAgreement(sceneCode, obj) {
- let me = this;
- var row = {}
- if (sceneCode == "edit" || sceneCode == "browse" || sceneCode == "change") {
- row = me.selectTabObj.selectedrow;
- if(!row){
- Root.message({
- type: 'warning',
- message: '璇烽�夋嫨涓�鏉℃暟鎹�'
- });
- return;
- }
- }
-
- var config = {
- totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "鍗忚璇︽儏" + (row.customer_name ? ("-" + row.customer_name) : ""),
- id: "customer_list_agreement_edit" + row.id + sceneCode,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/customer_list_agreement_edit.html",
- data: row,
- delta: {},
- sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- DownloadTemplate() {
- var pathurl = "";
- if (this.selectTabObj.code == "Input") {
- pathurl = "template/1.瀵煎叆妯℃澘/0_鍗忚鐢宠瀵煎叆.xlsx";
- }
- handleDownload(pathurl);
- },
-
-
- onPopupByUploadFileToDB() {
- var me = this;
- var delta_ = {
- filetypelist: [],
- isToDB: true,
- dataname: this.selectTabObj.dataname,
- tableFields: this.selectTabObj.tableFields,
- otherSave: "salesBizLogic/saveDealerTargetByImport",
- }
- var config = {
- totab: false,
- width: "500px",
- icon: "icon-product",
- text: "鏁版嵁鏂囦欢涓婁紶",
- id: "popup_uploadFileToDB",
- url: "module/tool/page/popup_uploadFileToDB.html",
- data: {
- uploadType: "dealertarget",
- tempTable: "temp_target_dealer",
- operate_type: "dealertarget",
- userid: me.userid,
- ioname:"",
- // position_id: me.position_id,
- },
- delta: delta_,
- callback: function(obj, callback) {
- me.$message({
- showClose: true,
- message: '涓婁紶鎴愬姛锛�',
- type: 'success'
- });
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- this.doPopupByPublic(config);
+ me.selectedrows = list;
},
}
@@ -1322,9 +756,7 @@
<el-button v-show="cbuttons_r.Renew" @click="onCopy" :disabled="!(selectedrows.length > 0)">鍗忚缁</el-button>
</el-button-group> -->
<el-button-group style="margin-left: 3px;">
- <el-button v-show="cbuttons_r.downloadTemplate && selectTabObj.code == 'Input'" @click="DownloadTemplate">妯℃澘涓嬭浇</el-button>
- <el-button v-show="cbuttons_r.import && selectTabObj.code == 'Input'" @click="onPopupByUploadFileToDB":icon="buttonsconfig.import.icon">{{buttonsconfig.import.name}}</el-button>
- <el-button v-show="cbuttons_r.export && (selectTabObj.code == 'Input' || selectTabObj.code == 'Open')" type="primary" @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
+ <el-button type="primary" @click="" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
</el-button-group>
</div>
</div>
diff --git a/module/fee/page/fee_qty.html b/module/fee/page/fee_qty.html
index 8e7deec..19441fe 100644
--- a/module/fee/page/fee_qty.html
+++ b/module/fee/page/fee_qty.html
@@ -19,11 +19,113 @@
title: "鏁伴噺鍗曠‘璁�",
//Tab椤硅缃�
tabs_d: [
- {code: "matched", name: "鍖归厤鏁伴噺鍗�", dataname: "md_org_customer", filterTxt: "", orderby: "md_org.update_time desc, md_org.code"},
- {code: "notmatched", name: "涓嶅尮閰嶆暟閲忓崟", dataname: "md_org_account", filterTxt: "(md_org_account.state_code='OpeningApproval' or md_org_account.state_code='Open' or md_org_account.state_code='CooperateApproval')", orderby: "md_org_account.update_time desc, md_org_account.code"},
- {code: "Open", name: "宸茬‘璁ゆ暟閲忓崟", dataname: "md_org_partnership", filterTxt: "md_org_account.state_code='Incooperation'", orderby: "md_org_account.update_time desc, md_org_account.code"},
+ {code: "matched", name: "鍖归厤鏁伴噺鍗�", dataname: "fee_qty", filterTxt: "state_code='Input'", orderby: ""},
+ {code: "notmatched", name: "涓嶅尮閰嶆暟閲忓崟", dataname: "fee_qty", filterTxt: "state_code='Refused'"},
+ {code: "Open", name: "宸茬‘璁ゆ暟閲忓崟", dataname: "fee_qty", filterTxt: "state_code='Comfirmed'", orderby: ""},
],
filterTxt: "",
+ default_tableFields: {
+ matched: [
+ { field: "state_name", name: "鐘舵��", isshow: "T", width: "80",input_type_filter:"select",filter_field:"state_code",inputtype:"capsuletag",options_pattern:"{^鑽夌^:^info^,^鐢熸晥^:^success^,^瀹℃壒涓璣:^warning^}"},
+ { field: "state_code", name: "鐘舵��", isshow: "F", width: "80",isnotfilter:'true' },
+ { field: "id", name: "纭鍗曞彿", isshow: "T", width: "120", isfilter: true },
+ { field: "sale_year", name: "閿�鍞勾浠�", isshow: "T", align: "center", width: "80" },
+ { field: "sale_month", name: "閿�鍞湀浠�", isshow: "T" ,width: "80"},
+ { field: "date", name: "閿�鍞棩鏈�", isshow: "T",width: "100",type:"date",formatter:"formatter_date"},
+ { field: "commit_year", name: "缁熻骞翠唤", isshow: "T",width: "80" },
+ { field: "commit_month", name: "缁熻鏈堜唤", isshow: "T", width: "80" },
+ { field: "type", name: "绫诲瀷", isshow: "T",},
+ { field: "sale_code", name: "鏈嶅姟鑱旂郴浜虹紪鐮�", isshow: "T", align: "center",width: "110" },
+ { field: "sale_name", name: "鏈嶅姟鑱旂郴浜�", isshow: "T", align: "center", width: "100" },
+ { field: "customer_code", name: "瀹㈡埛缂栫爜", isshow: "T", align: "center",width: "100" },
+ { field: "customer_name", name: "瀹㈡埛鍚嶇О", isshow: "T", align: "left",width: "150" , isfilter: true },
+ { field: "product", name: "浜у搧鍚嶇О", isshow: "T", align: "left" ,width: "200" },
+ { field: "spec", name: "瑙勬牸", isshow: "T", align: "center",width: "150" },
+ { field: "agreement_code", name: "鍗忚缂栧彿", isshow: "T",width: "100", align: "center", isfilter: true },
+ { field: "invoince_price", name: "寮�绁ㄤ环", isshow: "T", align: "center", },
+ { field: "settlement_price", name: "缁撶畻浣庝环", isshow: "T", align: "center", },
+ { field: "tax", name: "绋庣偣", isshow: "T", align: "center", },
+ { field: "policy", name: "鏀跨瓥", isshow: "T", align: "center", },
+ { field: "flow_qty", name: "娴佸悜鏁伴噺", isshow: "T", align: "center", },
+ { field: "comfirm_qyt", name: "纭鏁伴噺", isshow: "T", align: "center", },
+ { field: "return_qty", name: "搴旇繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "other_deduction", name: "鍏朵綑鎵ｆ", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "returned_qty", name: "瀹炶繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "deduction_remark", name: "鎵ｆ澶囨敞", isshow: "T", align: "left",width:'200' },
+ { field: "order_code", name: "璁㈠崟鍙�", isshow: "T", align: "center", isfilter: true,width:'120' },
+ { field: "order_total", name: "璁㈠崟閲戦", isshow: "T", align: "center",formatter:"formatter_money",width:'120' },
+ { field: "order_amt", name: "璁㈠崟鍗曚环", isshow: "T", align: "center",formatter:"formatter_money",width:'120' },
+ { field: "order_state", name: "璁㈠崟鐘舵��", isshow: "T", align: "center",width:'80' },
+ { field: "platform_information", name: "骞冲彴淇℃伅", isshow: "T", align: "center", },
+ { field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center", },
+ { field: "product_group", name: "浜у搧缁�", isshow: "T", align: "center", },
+ { field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center",formatter:"formatter_date",width: "100" },
+ { field: "pre_merger_customer", name: "鍚堝苟鍓嶅鎴�", isshow: "T", align: "center", width: "100" },
+ { field: "last_arrpove_time", name: "鏈�鍚庡鎵规椂闂�", isshow: "T", align: "center",formatter:"formatter_date",width: "100" },
+ { field: "agency_fee_state", name: "浠ｇ悊璐圭敤鍗曠姸鎬�", isshow: "T", align: "center",width: "110" },
+ { field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center", },
+ { field: "ferrze_remark", name: "鍐荤粨鍘熷洜", isshow: "T", align: "left", },
+ ],
+ notmatched:[
+ { field: "sale_year", name: "閿�鍞勾浠�", isshow: "T", align: "center", width: "80" },
+ { field: "sale_month", name: "閿�鍞湀浠�", isshow: "T" ,width: "80"},
+ { field: "commit_year", name: "缁熻骞翠唤", isshow: "T",width: "80" },
+ { field: "commit_month", name: "缁熻鏈堜唤", isshow: "T", width: "80" },
+ { field: "type", name: "绫诲瀷", isshow: "T",},
+
+ { field: "agreement_code", name: "鍗忚缂栧彿", isshow: "T",width: "100", align: "center", isfilter: true },
+ { field: "no_commit_remark", name: "鏈彁浜ゅ師鍥�", isshow: "T", align: "center", width:'150' },
+ { field: "customer_code", name: "瀹㈡埛缂栫爜", isshow: "T", align: "center",width: "100" },
+ { field: "customer_name", name: "瀹㈡埛鍚嶇О", isshow: "T", align: "left",width: "150" , isfilter: true },
+ { field: "product", name: "浜у搧鍚嶇О", isshow: "T", align: "left" ,width: "200" },
+ { field: "spec", name: "瑙勬牸", isshow: "T", align: "center",width: "150" },
+ { field: "sale_code", name: "鏈嶅姟鑱旂郴浜虹紪鐮�", isshow: "T", align: "center",width: "110" },
+ { field: "sale_name", name: "鏈嶅姟鑱旂郴浜�", isshow: "T", align: "center", width: "100" },
+ { field: "flow_qty", name: "娴佸悜鏁伴噺", isshow: "T", align: "center", },
+ { field: "order_code", name: "璁㈠崟鍙�", isshow: "T", align: "center", isfilter: true,width:'120' },
+ ],
+ Open: [
+ { field: "state_name", name: "鐘舵��", isshow: "T", width: "80",input_type_filter:"select",filter_field:"state_code",inputtype:"capsuletag",options_pattern:"{^鑽夌^:^info^,^鐢熸晥^:^success^,^瀹℃壒涓璣:^warning^}"},
+ { field: "state_code", name: "鐘舵��", isshow: "F", width: "80" },
+ { field: "id", name: "纭鍗曞彿", isshow: "T", width: "120", isfilter: true },
+ { field: "sale_year", name: "閿�鍞勾浠�", isshow: "T", align: "center", width: "80" },
+ { field: "sale_month", name: "閿�鍞湀浠�", isshow: "T" ,width: "80"},
+ { field: "date", name: "閿�鍞棩鏈�", isshow: "T",width: "100",type:"date",formatter:"formatter_date"},
+ { field: "commit_year", name: "缁熻骞翠唤", isshow: "T",width: "80" },
+ { field: "commit_month", name: "缁熻鏈堜唤", isshow: "T", width: "80" },
+ { field: "type", name: "绫诲瀷", isshow: "T",},
+ { field: "sale_code", name: "鏈嶅姟鑱旂郴浜虹紪鐮�", isshow: "T", align: "center",width: "110" },
+ { field: "sale_name", name: "鏈嶅姟鑱旂郴浜�", isshow: "T", align: "center", width: "100" },
+ { field: "customer_code", name: "瀹㈡埛缂栫爜", isshow: "T", align: "center",width: "100" },
+ { field: "customer_name", name: "瀹㈡埛鍚嶇О", isshow: "T", align: "left",width: "100" , isfilter: true },
+ { field: "product", name: "浜у搧鍚嶇О", isshow: "T", align: "left" ,width: "200" },
+ { field: "spec", name: "瑙勬牸", isshow: "T", align: "center",width: "150" },
+ { field: "agreement_code", name: "鍗忚缂栧彿", isshow: "T",width: "100", align: "center", isfilter: true },
+ { field: "invoince_price", name: "寮�绁ㄤ环", isshow: "T", align: "center", },
+ { field: "settlement_price", name: "缁撶畻浣庝环", isshow: "T", align: "center", },
+ { field: "tax", name: "绋庣偣", isshow: "T", align: "center", },
+ { field: "policy", name: "鏀跨瓥", isshow: "T", align: "center", },
+ { field: "flow_qty", name: "娴佸悜鏁伴噺", isshow: "T", align: "center", },
+ { field: "comfirm_qyt", name: "纭鏁伴噺", isshow: "T", align: "center", },
+ { field: "return_qty", name: "搴旇繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "other_deduction", name: "鍏朵綑鎵ｆ", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "returned_qty", name: "瀹炶繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "deduction_remark", name: "鎵ｆ澶囨敞", isshow: "T", align: "left",width:'200' },
+ { field: "order_code", name: "璁㈠崟鍙�", isshow: "T", align: "center", isfilter: true,width:'120' },
+ { field: "order_total", name: "璁㈠崟閲戦", isshow: "T", align: "center",formatter:"formatter_money",width:'120' },
+ { field: "order_amt", name: "璁㈠崟鍗曚环", isshow: "T", align: "center",formatter:"formatter_money",width:'120' },
+ { field: "order_state", name: "璁㈠崟鐘舵��", isshow: "T", align: "center",width:'80' },
+ { field: "platform_information", name: "骞冲彴淇℃伅", isshow: "T", align: "center", },
+ { field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center", },
+ { field: "product_group", name: "浜у搧缁�", isshow: "T", align: "center", },
+ { field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center",formatter:"formatter_date",width: "100" },
+ { field: "pre_merger_customer", name: "鍚堝苟鍓嶅鎴�", isshow: "T", align: "center", width: "100" },
+ { field: "last_arrpove_time", name: "鏈�鍚庡鎵规椂闂�", isshow: "T", align: "center",formatter:"formatter_date",width: "100" },
+ { field: "agency_fee_state", name: "浠ｇ悊璐圭敤鍗曠姸鎬�", isshow: "T", align: "center",width: "110" },
+ { field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center", },
+ { field: "ferrze_remark", name: "鍐荤粨鍘熷洜", isshow: "T", align: "left", },
+ ],
+ },
d_tabs: {
matched: true,
nccsy: true,
@@ -121,12 +223,11 @@
//璁剧疆宸ュ叿鏍忎簨浠�
this.doQueryByTab(function(result, callback) {//鏌ヨ鍚庣殑鍥炶皟锛岀敤浜庤幏鍙栧瓧娈电殑
if (result.meta && result.meta[me.selectTabObj.dataname] && result.meta[me.selectTabObj.dataname].fields) {
- var metas = clone(result.meta[me.selectTabObj.dataname].fields);
+ // var metas = clone(result.meta[me.selectTabObj.dataname].fields);
var filterFields_ = [];
var tableFields_ = [];
- metas.map(f=>{
- f.isshow = "T";
+ me.default_tableFields[me.activeTabName].map(f=>{
// f.issortable = "custom"
// if (me.selectTabObj.code == "matched") {
// if(f.field == 'state_detail_name' || f.field == 'actor' || f.field == 'business_need_code'){
@@ -138,27 +239,10 @@
// f.isshow = "F";
// }
// }
-
- if(me.selectTabObj.code == "distributorlist" && f.field == 'ncc_code'){
- f.isshow = "F";
- f.isfilter = false;
+ if (f.field != 'state_code') {
+ filterFields_.push(clone(f))
+
}
-
- if(f.field == 'category_code' || f.field == 'is_preload' || f.field == 'credit_amt' || f.field == 'credit_available' || f.field == 'order_date' || f.field == 'hope_delivery' || f.field == 'amt_available'){
- f.isshow = "F";
- }
- if (f.isfilter) {
- if (f.field == "state_name") {
- f.options = me.dataRequestObj.machine_state;
- }
- filterFields_.push(clone(f));
- }
- else {
- var filter_f = clone(f);
- filter_f.isshow = "F";
- filterFields_.push(filter_f);
- }
-
tableFields_.push(clone(f));
})
@@ -182,7 +266,7 @@
if (!me.selectTabObj.filterFields || (me.selectTabObj.filterFields && me.selectTabObj.filterFields.length == 0)) {
me.selectTabObj.filterFields = clone(filterFields_);
- me.selectTabObj.tableFields = clone(tableFields_);
+ me.selectTabObj.tableFields = clone(me.default_tableFields[me.activeTabName]);
//瀛楁鏁扮粍杞瓧娈祇bj锛岀洰鐨勪负浜嗙瓫閫夋椂鑾峰彇瀛楁灞炴��
me.fieldsToFieldsObj();
@@ -204,496 +288,9 @@
var filterfieldClick = {};
//琛ㄦ牸瀛楁浜嬩欢璁剧疆
tablefieldClick.All = {
-
- state_name: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "娴佺▼姝ラ",
- id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/tool/page/popup_workflow_step_user.html?v=2023020703",
- data: obj.row,
- delta: {machine_code: "Org_Account_Open", dataname: "md_org_account"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
- md_org__code: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var url = "customer_acct.html";
- if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
- url = "customer_close.html";
- }
- var row = {}
- if (me.activeTabName == "matched" || me.activeTabName == "distributorlist") { // 瀹㈠晢淇℃伅
- row = obj.row;
- }
- else if (me.activeTabName == "nccsy") { // NCC棣栬惀
- row = {
- id: obj.row.org_id,
- };
- }
- else {
- row = {
- id: obj.row.org_id,
- };
- }
-
- url = "customer_basic.html";
-
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "瀹㈠晢淇℃伅璇︽儏",
- id: "customer_acct" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/" + url,
- data: row,
- delta: {closeCode:"1"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
- code: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var url = "customer_basic_acct.html";
- if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
- url = "customer_close.html";
- }
- if (me.activeTabName == "matched" || me.activeTabName == "distributorlist") { // 瀹㈠晢淇℃伅
- url = "customer_basic.html";
- }
- else if (me.activeTabName == "nccsy") { // NCC棣栬惀
- url = "customer_ncc.html";
- }
-
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "80vh",
- icon: "icon-product",
- text: "瀹㈠晢淇℃伅璇︽儏",
- id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/" + url,
- data: obj.row,
- delta: {closeCode:"1"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
-
- name: {
- input: {
- valuekey: "name", // 杈撳叆妗嗘悳绱㈡椂鐨勯�夐」瀵瑰簲瀛楁
- onQuerySearch: function(obj, callback) { // 杈撳叆妗嗘悳绱簨浠�
- let param_ = {
- dataname: "md_org_customer",
- filter: obj.fieldobj.field + " like '%" + obj.inputstring + "%'",
- orderby: obj.fieldobj.field
- }
- Server.call("root/data/getEntitySet", param_, function(result) {
- var inputoptions_ = []
- if (result && result.data && result.data.entityset) {
- inputoptions_ = result.data.entityset;
- callback(inputoptions_)
- }
- else {
- callback(inputoptions_)
- }
-
- });
- }
- }
- }
};
+
-
- tablefieldClick.Change = {
- state_name: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: ["鑽夌","褰曞叆"],//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "娴佺▼姝ラ",
- id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/tool/page/popup_workflow_step_user.html?v=2023020703",
- data: obj.row,
- delta: {machine_code: "Org_Account_Open"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
- type_name: {//绫诲瀷
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",
- notclick_bindfield: [],
- onclick: function(obj) {
- //鎵撳紑
- // me.openBrowseDetail(obj)
- me.openChangeCustomerUser('browse', obj.row)
- },
- },
- },
-
- };
-
- tablefieldClick.matched = {
- state_name: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: ["鏈敓鏁�"],//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "600px",
- height: "450px",
- icon: "icon-product",
- text: "寮�鎴蜂俊鎭�",
- id: "popup_account_state" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/popup/page/popup_account_state.html",
- data: obj.row,
- // dataname:me.selectTabObj.dataname,
- filter:"org_id='" + obj.row.id + "'", //鏍囪瘑2锛氭棤瀵瑰簲鐨勫瓧娈佃繘琛岃繃婊�
- delta: {from: "customer_list_account"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
- md_org__code: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var url = "customer_acct.html";
- if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
- url = "customer_close.html";
- }
- /*
- tabs_d: [
- {code: "matched", name: "瀹㈠晢鍒楄〃", dataname: "md_org", filterTxt: "actor_id<>'Master'", orderby: "update_time desc, code"},
- {code: "nccsy", name: "NCC棣栬惀", dataname: "md_org_account_ncc", filterTxt: "1=1", orderby: "update_time desc, code"},
- {code: "notmatched", name: "寰呭紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Input'", orderby: "update_time desc, code"},
- {code: "Open", name: "宸插紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Open'", orderby: "update_time desc, code"},
- {code: "Close", name: "宸插叧闂�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Close'", orderby: "update_time desc, code"},
- {code: "All", name: "鍏ㄩ儴", dataname: "md_org_account", filterTxt: "1=1", orderby: "md_org_account.update_time desc, code"},
- {code: "Change", name: "鍙樻洿鐢宠", dataname: "md_org_account_change", orderby: "update_time desc"},
- ],
-
- */
- var row = {}
- if (me.activeTabName == "matched") { // 瀹㈠晢淇℃伅
- row = obj.row;
- }
- else if (me.activeTabName == "nccsy") { // NCC棣栬惀
- row = {
- id: obj.row.org_id,
- };
- }
-
- url = "customer_basic.html";
-
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "瀹㈠晢淇℃伅璇︽儏",
- id: "customer_acct" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/" + url,
- data: row,
- delta: {closeCode:"1"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
- code: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var url = "customer_acct.html";
- if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
- url = "customer_close.html";
- }
- /*
- tabs_d: [
- {code: "matched", name: "瀹㈠晢鍒楄〃", dataname: "md_org", filterTxt: "actor_id<>'Master'", orderby: "update_time desc, code"},
- {code: "nccsy", name: "NCC棣栬惀", dataname: "md_org_account_ncc", filterTxt: "1=1", orderby: "update_time desc, code"},
- {code: "notmatched", name: "寰呭紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Input'", orderby: "update_time desc, code"},
- {code: "Open", name: "宸插紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Open'", orderby: "update_time desc, code"},
- {code: "Close", name: "宸插叧闂�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Close'", orderby: "update_time desc, code"},
- {code: "All", name: "鍏ㄩ儴", dataname: "md_org_account", filterTxt: "1=1", orderby: "md_org_account.update_time desc, code"},
- {code: "Change", name: "鍙樻洿鐢宠", dataname: "md_org_account_change", orderby: "update_time desc"},
- ],
-
- */
- if (me.activeTabName == "matched") { // 瀹㈠晢淇℃伅
- url = "customer_basic.html";
- }
- else if (me.activeTabName == "nccsy") { // NCC棣栬惀
- url = "customer_ncc.html";
- }
-
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "瀹㈠晢淇℃伅璇︽儏",
- id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/" + url,
- data: obj.row,
- delta: {closeCode:"1"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
-
- name: {
- input: {
- valuekey: "name", // 杈撳叆妗嗘悳绱㈡椂鐨勯�夐」瀵瑰簲瀛楁
- onQuerySearch: function(obj, callback) { // 杈撳叆妗嗘悳绱簨浠�
- let param_ = {
- dataname: "md_org_customer",
- filter: obj.fieldobj.field + " like '%" + obj.inputstring + "%'",
- orderby: obj.fieldobj.field
- }
- Server.call("root/data/getEntitySet", param_, function(result) {
- var inputoptions_ = []
- if (result && result.data && result.data.entityset) {
- inputoptions_ = result.data.entityset;
- callback(inputoptions_)
- }
- else {
- callback(inputoptions_)
- }
-
- });
- }
- }
- }
-
- };
- tablefieldClick.nccsy = {
- state_name: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: ["DMS鏈紑鎴�"],//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "600px",
- height: "450px",
- icon: "icon-product",
- text: "寮�鎴蜂俊鎭�",
- id: "popup_account_state" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/popup/page/popup_account_state.html",
- data: obj.row,
- dataname: "md_org_account",
- filter:"md_org_account.org_ncc_id='" + obj.row.id + "'",//鏍囪瘑2锛氭病鏈夊彲鐐瑰嚮鐨勫��,寰呴獙璇�
- delta: {from: "customer_list_account"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
- md_org__code: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var url = "customer_acct.html";
- if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
- url = "customer_close.html";
- }
- /*
- tabs_d: [
- {code: "matched", name: "瀹㈠晢鍒楄〃", dataname: "md_org", filterTxt: "actor_id<>'Master'", orderby: "update_time desc, code"},
- {code: "nccsy", name: "NCC棣栬惀", dataname: "md_org_account_ncc", filterTxt: "1=1", orderby: "update_time desc, code"},
- {code: "notmatched", name: "寰呭紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Input'", orderby: "update_time desc, code"},
- {code: "Open", name: "宸插紑鎴�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Open'", orderby: "update_time desc, code"},
- {code: "Close", name: "宸插叧闂�", dataname: "md_org_account", filterTxt: "md_org_account.state_code='Close'", orderby: "update_time desc, code"},
- {code: "All", name: "鍏ㄩ儴", dataname: "md_org_account", filterTxt: "1=1", orderby: "md_org_account.update_time desc, code"},
- {code: "Change", name: "鍙樻洿鐢宠", dataname: "md_org_account_change", orderby: "update_time desc"},
- ],
-
- */
- var row = {}
- if (me.activeTabName == "matched") { // 瀹㈠晢淇℃伅
- row = obj.row;
- }
- else if (me.activeTabName == "nccsy") { // NCC棣栬惀
- row = {
- id: obj.row.org_id,
- };
- }
-
- url = "customer_basic.html";
-
- var config = {
- totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "瀹㈠晢淇℃伅璇︽儏",
- id: "customer_acct" + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/" + url,
- data: row,
- delta: {closeCode:"1"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
- code: {//瀛楁浜嬩欢璁剧疆
- val: {//鏈夊�兼椂鐨勭偣鍑讳簨浠�
- notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
- notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
- onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
- var url = "customer_acct.html";
- if (obj.row.state_code == 'CloseingApproval' || obj.row.state_code == 'Rejected' || obj.row.state_code == 'CloseingSaleInput' || obj.row.state_code == 'Closed') {
- url = "customer_close.html";
- }
-
- if (me.activeTabName == "matched") { // 瀹㈠晢淇℃伅
- url = "customer_basic.html";
- }
- else if (me.activeTabName == "nccsy") { // NCC棣栬惀
- url = "customer_ncc.html";
- }
-
- var config = {
- totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
- width: "1100px",
- height: "520px",
- icon: "icon-product",
- text: "瀹㈠晢淇℃伅璇︽儏",
- id: "customer_acct" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
- url: "module/md/page/customer/page/" + url,
- data: obj.row,
- delta: {closeCode:"1"},
- sceneCode: "browse",//"refuseedit",//"approval", //"add"//"browse",
- callback: function(obj, callback) {
- me.onQuery();
- if (callback) {
- callback();
- }
- }
- };
- me.doPopupByPublic(config);
- },
- },
- },
-
- name: {
- input: {
- valuekey: "name", // 杈撳叆妗嗘悳绱㈡椂鐨勯�夐」瀵瑰簲瀛楁
- onQuerySearch: function(obj, callback) { // 杈撳叆妗嗘悳绱簨浠�
- let param_ = {
- dataname: "md_org_customer",
- filter: obj.fieldobj.field + " like '%" + obj.inputstring + "%'",
- orderby: obj.fieldobj.field
- }
- Server.call("root/data/getEntitySet", param_, function(result) {
- var inputoptions_ = []
- if (result && result.data && result.data.entityset) {
- inputoptions_ = result.data.entityset;
- callback(inputoptions_)
- }
- else {
- callback(inputoptions_)
- }
-
- });
- }
- }
- }
-
- }
if (this.activeTabName == "Change") {
this.selectTabObj.tablefieldClick = tablefieldClick[this.activeTabName];
}
@@ -714,47 +311,46 @@
var tablebuttonClick = {};
tablebuttonClick.matched = [
{
- isbuttonshow: me.cbuttons_r.add ? me.cbuttons_r.add : false,type:"primary",
- code: "add",isselected: false,classname: "",
- onclick: function(obj) {
- me.openCustomer('add')
- }
- },
- {
- isbuttonshow: me.cbuttons_r.customerEdit ? me.cbuttons_r.customerEdit : false,type:"primary",
- code: "edit",isselected: true,classname: "",
- disabled: function(selectRowList) {
- var bo_ = true;
- if (selectRowList[0] && selectRowList[0].state_code == "Input") {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- me.openCustomer('edit')
- }
- },
- {
- 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" || selectRowList[0].state_code == "Prepared")) {
+ if (selectRowList[0] ) {
bo_ = false;
}
return bo_
},
onclick: function(obj) {
- // 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]);
+
+ }
+ },
+ {
+ name: "鍐荤粨", isbuttonshow: true,type:"danger",icon: "el-icon-news",
+ code: "account",isselected: true,classname: "",
+ disabled: function(selectRowList) {
+ var bo_ = true;
+ if (selectRowList[0]) {
+ bo_ = false;
+ }
+ return bo_
+ },
+ onclick: function(obj) {
+
+ }
+ },
+ {
+ name: "瑙ｉ櫎鍐荤粨", isbuttonshow: true,type:"warning",icon: "el-icon-news",
+ code: "account",isselected: true,classname: "",
+ disabled: function(selectRowList) {
+ var bo_ = true;
+ if (selectRowList[0]) {
+ bo_ = false;
+ }
+ return bo_
+ },
+ onclick: function(obj) {
+
}
},
// {
@@ -785,25 +381,7 @@
// 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].state_code == 'Input') {
- bo_ = false
- }
- return bo_;
- },
- onclick: function(obj) {
- me.delData()
- // obj.selectedList
- // me.closeData('browse', obj.selectedList[0]);
- // me.closeData();
- }
- },
+
// {
// // name: "缁堟", // type: "primary", // icon: "el-icon-edit",
@@ -832,166 +410,10 @@
// },
]
- tablebuttonClick.nccsy = [
- {
- name: "寮�鎴�", isbuttonshow: me.cbuttons_r.accountOpenNCC ? me.cbuttons_r.accountOpenNCC : false,type:"success",icon: "el-icon-news",
- code: "account",isselected: true,classname: "",
- disabled: function(selectRowList) {
- var bo_ = true;
- if (selectRowList[0]) {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- me.openCustomerUserByNCCId('add', obj.selectedList[0])
- }
- },
- ]
- tablebuttonClick.Open = [{
- name: "閲嶅彂閭欢", isbuttonshow: me.cbuttons_r.accountClose ? me.cbuttons_r.accountClose : false,type:"primary",icon: "el-icon-message",
- code: "account",isselected: true,classname: "",isloading: false,
- disabled: function(selectRowList) {
- var bo_ = true;
- if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- obj.buttonobj.isloading = true
- me.toAccountMail(obj.selectedList[0], function(){
- obj.buttonobj.isloading = false
- });
- }
- },
-
- {
- 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;
- if (selectRowList[0] && selectRowList[0].state_code == 'InCooperation') {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- // me.closeData();
- me.openCustomerUser('close', obj.selectedList[0])
- }
- },
- {
- name: "鍙樻洿", isbuttonshow: me.cbuttons_r.accountChange ? me.cbuttons_r.accountChange : false,type:"primary",icon: "el-icon-share",
- code: "change",isselected: true,classname: "",
- disabled: function(selectRowList) {
- var bo_ = true;
- if (selectRowList[0] && selectRowList[0].state_code == 'InCooperation') {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- me.openCustomerUser('change', obj.selectedList[0])
- }
- },
- // {
- // name: "缂栬緫", isbuttonshow: me.cbuttons_r.accountCloseEdit ? me.cbuttons_r.accountCloseEdit : false,type:"primary",icon: "el-icon-edit-outline",
- // code: "account",isselected: true,classname: "",
- // disabled: function(selectRowList) {
- // var bo_ = true;
- // if (selectRowList[0] && (selectRowList[0].state_code == 'Rejected' || selectRowList[0].state_code == 'CloseingSaleInput')) {
- // bo_ = false;
- // }
- // return bo_
- // },
- // onclick: function(obj) {
- // me.closeDataEdit();
- // }
- // },
- {
- name: "绛夌骇璁剧疆", type: "primary", icon: "el-icon-edit",
- // isbuttonshow: me.cbuttons_r.edit_degree ? me.cbuttons_r.edit_degree : false,
- isbuttonshow: true,
- code: "edit_degree", isselected: true, classname: "",
- disabled: function(selectRowList) {
- var bo_ = true;
- if (selectRowList[0]) {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- // var row = obj.selectedList[0];
- var fieldobjlist = [
- {isshow: "T", field: "degree", name: "绛夌骇", type: "input"}
- ]
- me.editFieldsByFieldList(fieldobjlist, obj.selectedList[0], function(suspendData){
- var selectedList_ = clone(obj.selectedList);
- selectedList_.map(row=>{
- fieldobjlist.map(f=>{
- row[f.field] = suspendData[f.field]
- })
- })
- me.onSaveDataByFieldLsit(selectedList_, me.selectTabObj.dataname, fieldobjlist, function(){
- me.onQuery();
- });
- });
- }
- },
- ]
-
tablebuttonClick.notmatched = [
- {
- name: "杞悎浣�", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.commitData ? me.cbuttons_r.commitData : false, type: "success",
- code: "toCooperation", isselected: true, classname: "",
- disabled: function(selectRowList) {
- var bo_ = true ;
- if (selectRowList[0] && selectRowList[0].state_code == 'Open') {
- bo_ = false
- }
- return bo_;
- },
- onclick: function(obj) {
-
- // obj.selectedList
- // me.closeData('browse', obj.selectedList[0]);
- // me.commitData(obj.selectedList[0]);
- me.commitnCustomerUser('edit', obj.selectedList[0]);
- }
- },
-
- {
- // name: "璇︽儏", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.formdetail ? me.cbuttons_r.formdetail : false,
- code: "formdetail", isselected: true, classname: "",
- onclick: function(obj) {
- // obj.selectedList
- me.openCustomerUser('browse', obj.selectedList[0]);
- }
- },
- {
- // name: "缂栬緫", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.accountEdit ? me.cbuttons_r.accountEdit : false,
- code: "edit", isselected: true, classname: "",
- disabled: function(selectRowList) {
- var bo_ = true ;
- if (selectRowList[0] && selectRowList[0].state_code == 'Input') {
- bo_ = false
- }
- return bo_;
- },
- onclick: function(obj) {
- // obj.selectedList
- me.openCustomerUser('edit', obj.selectedList[0]);
- }
- },
- {
- name: "绛夌骇璁剧疆", type: "primary", icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.edit_degree ? me.cbuttons_r.edit_degree : false,
- // isbuttonshow: true,
- code: "edit_degree", isselected: true, classname: "",
+ {
+ name: "鍐荤粨", isbuttonshow: true,type:"danger",icon: "el-icon-news",
+ code: "account",isselected: true,classname: "",
disabled: function(selectRowList) {
var bo_ = true;
if (selectRowList[0]) {
@@ -1000,121 +422,31 @@
return bo_
},
onclick: function(obj) {
- // var row = obj.selectedList[0];
- var fieldobjlist = [
- {isshow: "T", field: "degree", name: "绛夌骇", type: "input"}
- ]
- me.editFieldsByFieldList(fieldobjlist, obj.selectedList[0], function(suspendData){
- var selectedList_ = clone(obj.selectedList);
- selectedList_.map(row=>{
- fieldobjlist.map(f=>{
- row[f.field] = suspendData[f.field]
- })
- })
- me.onSaveDataByFieldLsit(selectedList_, me.selectTabObj.dataname, fieldobjlist, function(){
- me.onQuery();
- });
- });
+
}
},
{
- // name: "鍒犻櫎", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.delete ? me.cbuttons_r.delete : false, type: "danger",
- code: "delete", isselected: true, classname: "",
+ name: "瑙ｉ櫎鍐荤粨", isbuttonshow: true,type:"warning",icon: "el-icon-news",
+ code: "account",isselected: true,classname: "",
disabled: function(selectRowList) {
- var bo_ = true ;
- if (selectRowList[0] && selectRowList[0].state_code == 'Input') {
- bo_ = false
- }
- return bo_;
+ var bo_ = true;
+ if (selectRowList[0]) {
+ bo_ = false;
+ }
+ return bo_
},
onclick: function(obj) {
- me.delData()
- // obj.selectedList
- // me.closeData('browse', obj.selectedList[0]);
- // me.closeData();
+
}
},
+
]
- tablebuttonClick.All = [
- {
- // name: "璇︽儏", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.formdetail ? me.cbuttons_r.formdetail : false,
- code: "formdetail", isselected: true, classname: "",
- onclick: function(obj) {
- // obj.selectedList
- me.openCustomerUser('browse', obj.selectedList[0]);
- }
- },
- {
- name: "绛夌骇璁剧疆", type: "primary", icon: "el-icon-edit",
- isbuttonshow: me.cbuttons_r.edit_degree ? me.cbuttons_r.edit_degree : false,
- code: "edit_degree", isselected: true, classname: "",
- disabled: function(selectRowList) {
- var bo_ = true;
- if (selectRowList[0]) {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- // var row = obj.selectedList[0];
- var fieldobjlist = [
- {isshow: "T", field: "degree", name: "绛夌骇", type: "input"}
- ]
- me.editFieldsByFieldList(fieldobjlist, obj.selectedList[0], function(suspendData){
- var selectedList_ = clone(obj.selectedList);
- selectedList_.map(row=>{
- fieldobjlist.map(f=>{
- row[f.field] = suspendData[f.field]
- })
- })
- me.onSaveDataByFieldLsit(selectedList_, me.selectTabObj.dataname, fieldobjlist, function(){
- me.onQuery();
- });
- });
- }
- },
- ]
- tablebuttonClick.Change = [
- // {
- // 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;
- // if (selectRowList[0] && selectRowList[0].type_code == "close" && selectRowList[0].state_code == 'Input') {
- // bo_ = false;
- // }
- // return bo_
- // },
- // onclick: function(obj) {
- // // me.closeData();
- // me.openChangeCustomerUser('edit', obj.selectedList[0])
- // }
- // },
- {
- name: "缂栬緫", isbuttonshow: me.cbuttons_r.accountChange ? me.cbuttons_r.accountChange : false,type:"primary",icon: "el-icon-edit",
- code: "edit",isselected: true,classname: "",
- disabled: function(selectRowList) {
- var bo_ = true;
- if (selectRowList[0] && (selectRowList[0].state_code == 'Input')) {
- bo_ = false;
- }
- return bo_
- },
- onclick: function(obj) {
- me.openChangeCustomerUser('edit', obj.selectedList[0])
- }
- },
- ]
if (tablebuttonClick[this.activeTabName]) {
this.selectTabObj.tablebuttonClick = tablebuttonClick[this.activeTabName];
}
- else if (this.activeTabName == "distributorlist") {
- this.selectTabObj.tablebuttonClick = tablebuttonClick.matched;
- }
+
else {
this.selectTabObj.tablebuttonClick = []
}
@@ -1888,11 +1220,11 @@
<div :class="page_title == 'right' ? 'h_page_button_left' : 'h_page_button_right'">
- <div style="float: right;" v-show= "selectTabObj.code == 'nccsy'">
+ <div style="float: right;">
<!-- <el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id )" type="primary" @click="openCustomerUserByNCCId('add')" icon="el-icon-news">寮�鎴�</el-button> -->
<el-button-group style="margin-left: 3px;">
- <el-button v-show= "cbuttons_r.DownloadTemplate ? cbuttons_r.DownloadTemplate : false" type="primary" @click="DownloadTemplate" icon="el-icon-download">寮�鎴锋ā鏉夸笅杞�</el-button>
- <el-button v-show= "cbuttons_r.imports ? cbuttons_r.imports : false" type="primary" @click="onPopupByUploadFile" icon="el-icon-upload2">鎵归噺寮�鎴峰鍏�</el-button>
+ <el-button type="primary" @click="" icon="el-icon-download">瀵煎嚭纭鍗�</el-button>
+ <el-button type="primary" @click="" icon="el-icon-download">瀵煎嚭纭鍗曡垂鐢ㄦ槑缁�</el-button>
</el-button-group>
<el-button v-show= "cbuttons_r.synchronous ? cbuttons_r.synchronous : false" type="primary" @click="getNCC" :loading="loading_ncc" icon="el-icon-refresh-right">鍚屾NCC</el-button>
<!-- <el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id )" type="primary" @click="openCustomerNCC('add')" :icon="buttonsconfig.edit.icon">NCC{{buttonsconfig.edit.name}}</el-button> -->
@@ -1911,7 +1243,7 @@
<el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id && selectTabObj.selectedrow.state_code == 'Open')" type="danger" @click="closeData">鍏� 鎴�</el-button>
<el-button :disabled="!(selectTabObj.selectedrow && selectTabObj.selectedrow.id && (selectTabObj.selectedrow.state_code == 'Rejected' || selectTabObj.selectedrow.state_code == 'CloseingSaleInput'))" type="primary" @click="closeDataEdit">鍏虫埛缂栬緫</el-button>
</el-button-group> -->
- <el-button v-show= "cbuttons_r.onDownload ? cbuttons_r.onDownload : false" @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
+ <!-- <el-button v-show= "cbuttons_r.onDownload ? cbuttons_r.onDownload : false" @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button> -->
<!-- <el-button-group style="margin-left: 3px;">
<el-button disabled :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>
</el-button-group> -->
diff --git a/module/fee/page/popup/popup_fee_payment.html b/module/fee/page/popup/popup_fee_payment.html
new file mode 100644
index 0000000..72a3ff7
--- /dev/null
+++ b/module/fee/page/popup/popup_fee_payment.html
@@ -0,0 +1,985 @@
+
+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8"><meta http-equiv="Expires" content="0"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Cache-control" content="no-cache"><meta http-equiv="Cache" content="no-cache">
+ <title>鍐呴儴绉讳粨淇敼</title>
+
+ <script type="text/javascript">
+ var pageVue = null;
+ function loadJsCss(callback) {
+ var jscss_urls = [];
+ window.top.initJsCss(document, jscss_urls, callback);
+ };
+
+ function initVue() {
+ new FormVue({
+ el: "#vbody",
+ data: {
+ dataname: "fee_payment",
+ table_dataname: "fee_qty",
+ title: "鍗曟嵁淇℃伅",
+ dataRequest: [
+ ],
+ default_formFields: [
+ { field: "state_name", name: "鐘舵��", isshow: "F", width: "80",input_type_filter:"select",filter_field:"state_code",inputtype:"capsuletag",options_pattern:"{^鑽夌^:^info^,^鐢熸晥^:^success^,^瀹℃壒涓璣:^warning^}"},
+ // { field: "state_name", name: "鐘舵��", isshow: "T", width: "80"},
+ { field: "state_code", name: "鐘舵��", isshow: "F", width: "80" },
+ { field: "id", name: "璐圭敤鍗曠紪鍙�", isshow: "T", width: "120", },
+ { field: "province", name: "鐪佷唤", isshow: "T" ,width: "100"},
+ { field: "rate", name: "璐圭巼", isshow: "T" ,width: "100"},
+ { field: "amt_rate", name: "浠樻姣斾緥", isshow: "T" ,width: "100"},
+ { field: "customer_code", name: "鏈嶅姟渚涘簲鍟嗙紪鐮�", isshow: "T" ,width: "110"},
+ { field: "customer_name", name: "鏈嶅姟渚涘簲鍟�", isshow: "T" ,width: "200",align:"left"},
+ { field: "amt", name: "搴斾粯閲戦", isshow: "T" ,width: "100",formatter:'formatter_money'},
+ { field: "other_deduction", name: "鍏朵綑鎵ｆ", isshow: "T", align: "center", width: "100",formatter:'formatter_money' },
+ { field: "after_deduction_amt", name: "鎵ｆ鍚庨噾棰�", isshow: "T", align: "center", width: "100",formatter:'formatter_money' },
+ { field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center", width: "100" },
+ { field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center", width: "100" ,formatter:'formatter_date'},
+ { field: "order_state", name: "灏炬鐘舵��", isshow: "T", align: "center", width: "100" },
+ { field: "order_code", name: "鍏宠仈棣栨鍗曞彿", isshow: "T", align: "center", width: "100", },
+ { field: "province_order_code", name: "鐪佺骇璐圭敤鍗曞彿", isshow: "T", align: "center", width: "100", },
+ { field: "payment", name: "浠樻閲戦", isshow: "T", align: "center", width: "100",formatter:'formatter_money' },
+ { field: "payment_date", name: "浠樻鏃堕棿", isshow: "T", align: "center", width: "100", formatter:'formatter_date'},
+ { field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center", width: "100" },
+ ],
+ default_tableFields:[
+ { field: "state_name", name: "鐘舵��", isshow: "F", width: "80",input_type_filter:"select",filter_field:"state_code",inputtype:"capsuletag",options_pattern:"{^鑽夌^:^info^,^鐢熸晥^:^success^,^瀹℃壒涓璣:^warning^}"},
+ { field: "state_code", name: "鐘舵��", isshow: "F", width: "80" },
+ { field: "parent_id", name: "纭鍗曞彿", isshow: "T", width: "120", },
+ { field: "sale_year", name: "閿�鍞勾浠�", isshow: "T", align: "center", width: "80" },
+ { field: "sale_month", name: "閿�鍞湀浠�", isshow: "T" ,width: "80"},
+ { field: "date", name: "閿�鍞棩鏈�", isshow: "T",width: "100",type:"date",formatter:"formatter_date"},
+ { field: "commit_year", name: "缁熻骞翠唤", isshow: "T",width: "80" },
+ { field: "commit_month", name: "缁熻鏈堜唤", isshow: "T", width: "80" },
+ { field: "type", name: "绫诲瀷", isshow: "T",},
+ { field: "sale_code", name: "鏈嶅姟鑱旂郴浜虹紪鐮�", isshow: "T", align: "center",width: "110" },
+ { field: "sale_name", name: "鏈嶅姟鑱旂郴浜�", isshow: "T", align: "center", width: "100" },
+ { field: "customer_code", name: "瀹㈡埛缂栫爜", isshow: "T", align: "center",width: "100" },
+ { field: "customer_name", name: "瀹㈡埛鍚嶇О", isshow: "T", align: "left",width: "150",inputtype:'span'},
+ { field: "product", name: "浜у搧鍚嶇О", isshow: "T", align: "left" ,width: "200" },
+ { field: "spec", name: "瑙勬牸", isshow: "T", align: "center",width: "150" },
+ { field: "agreement_code", name: "鍗忚缂栧彿", isshow: "T",width: "100", align: "center", },
+ { field: "invoince_price", name: "寮�绁ㄤ环", isshow: "T", align: "center", },
+ { field: "settlement_price", name: "缁撶畻浣庝环", isshow: "T", align: "center", },
+ { field: "tax", name: "绋庣偣", isshow: "T", align: "center", },
+ { field: "policy", name: "鏀跨瓥", isshow: "T", align: "center", },
+ { field: "flow_qty", name: "娴佸悜鏁伴噺", isshow: "T", align: "center", },
+ { field: "comfirm_qyt", name: "纭鏁伴噺", isshow: "T", align: "center", },
+ { field: "return_qty", name: "搴旇繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "other_deduction", name: "鍏朵綑鎵ｆ", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "returned_qty", name: "瀹炶繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "deduction_remark", name: "鎵ｆ澶囨敞", isshow: "T", align: "left",width:'200' },
+ { field: "order_code", name: "璁㈠崟鍙�", isshow: "T", align: "center", width:'120' },
+ { field: "order_total", name: "璁㈠崟閲戦", isshow: "T", align: "center",formatter:"formatter_money",width:'120' },
+ { field: "order_amt", name: "璁㈠崟鍗曚环", isshow: "T", align: "center",formatter:"formatter_money",width:'120' },
+ { field: "order_state", name: "璁㈠崟鐘舵��", isshow: "T", align: "center",width:'80' },
+ { field: "platform_information", name: "骞冲彴淇℃伅", isshow: "T", align: "center", },
+ { field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center", },
+ { field: "product_group", name: "浜у搧缁�", isshow: "T", align: "center", },
+ { field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center",formatter:"formatter_date",width: "100" },
+ { field: "pre_merger_customer", name: "鍚堝苟鍓嶅鎴�", isshow: "T", align: "center", width: "100" },
+ { field: "last_arrpove_time", name: "鏈�鍚庡鎵规椂闂�", isshow: "T", align: "center",formatter:"formatter_date",width: "100" },
+ { field: "agency_fee_state", name: "浠ｇ悊璐圭敤鍗曠姸鎬�", isshow: "T", align: "center",width: "110" },
+ { field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center", },
+ { field: "ferrze_remark", name: "鍐荤粨鍘熷洜", isshow: "T", align: "left", },
+ ],
+ options_wm_warehouse: [],
+
+ formAttr: {
+ istitle: false,
+ title: "琛ㄥ崟鍚嶇О",
+ columnnumber: 2,
+ labelwidth: "120px",
+ labelposition: "left",//"left",// right//top
+ size: "mini",
+ border: "5px solid #c6c6c600"
+ },
+ formFields: [],
+ newformData: {
+ code: createCode("YC"),
+ doc_date: createDate(),
+ create_time: createDatetime(),
+ state_code: "Input",
+ state_name: "鑽夌",
+ account_id:window.top.vue.userinfo.currentactor.target_id,
+ to_account_id:window.top.vue.userinfo.currentactor.target_id,
+ company_id:window.top.vue.userinfo.currentactor.company_id,
+ bu_name:window.top.vue.userinfo.currentactor.bu_name,
+ bu_id:window.top.vue.userinfo.currentactor.bu_id,
+ org_id:window.top.vue.userinfo.org.id,
+ org_code:window.top.vue.userinfo.org.code,
+ org_name:window.top.vue.userinfo.org.name,
+ creator_name: window.top.vue.userinfo.name,
+ },
+ formData: {},
+
+ isRefresh: true,
+ tablebuttonClick:[],
+ tableFields: [],
+ newTableData: {
+ create_time: createDatetime(),
+ creator_name: window.top.vue.userinfo.name,
+ },
+ tableData: [],
+ stock_qty:0,
+ //鎸夐敭鏉冮檺璁剧疆
+ isedit: false,//鎻愪氦鍓嶇紪杈戯紝淇濆瓨/鎻愪氦
+ isrefuseedit: false,//鎷掔粷鍚庣紪杈戯紝淇濆瓨/鍐嶆鎻愪氦
+ isapproval: false,//瀹℃壒锛屽悓鎰�/鎷掔粷/杞姙/閫�鍥�
+
+ iscommit: false,//鎻愪氦鏍囪
+
+ //寮圭獥鍙傛暟
+ popupParames: {},
+ //瀛楁璁剧疆
+ tablefieldClick: {},
+ formfieldClick: {},
+ dheight: 0,
+ checkarr:[],
+ delarr:[],
+ iscustomer: false,
+ tableAttr:{}
+ },
+ created() {
+ this.tableButtonClick();
+ if (window.top.vue.userinfo && window.top.vue.userinfo.org && window.top.vue.userinfo.org.is_account) {
+ this.iscustomer = true;
+ }
+ this.dheight = document.documentElement.clientHeight - 92;
+ this.popupParames = clone(Root.popupParames);
+ this.title = this.popupParames.title || this.popupParames.text
+ if (this.popupParames.data) {
+ this.formData = clone(this.popupParames.data);
+ }
+
+ if (this.popupParames.sceneCode) {
+ if (this.popupParames.sceneCode == "add") {//鏂板
+ if (this.newformData) {
+ let formData_ = clone(this.formData);
+
+ for (var k in this.newformData) {
+ formData_[k] = this.newformData[k];
+ }
+ this.formData = formData_;
+ }
+
+ // if (this.newTableData) {
+ // this.tableData.push(clone(this.newTableData));
+ // }
+
+ this.isedit = true;
+ }
+ else if (this.popupParames.sceneCode == "browse") {//鍙
+ this.formAttr.disabled = true;
+ this.isedit = false;
+ }
+ else if (this.popupParames.sceneCode == "edit") {//缂栬緫
+ this.isedit = true;
+ }
+ else if (this.popupParames.sceneCode == "approval") {//瀹℃壒
+ this.formAttr.disabled = true;
+ this.isapproval = true;
+ }
+ else if (this.popupParames.sceneCode == "refuseedit") {//鎷掔粷鍚庣殑缂栬緫
+ this.isrefuseedit = true;
+ }
+ }
+ },
+
+ mounted() {
+ var me = this;
+ me.tableButtonClick();
+
+ // this.tableAttr.toolbarobj={};
+ // this.$set(tableAttr , 'toolbarobj', '');
+ //棰勫姞杞芥暟鎹�
+ if (this.dataRequest && this.dataRequest.length) {
+ var result = {};
+ this.loadRequestData(this.dataRequest, result, function(data) {
+ me.dataRequestObj = data;
+ //棰勫姞杞芥暟鎹悗缁欏摢浜涘瓧娈佃缃畂ptions鎴杅ormatterjson
+ if(me.dataRequestObj.wm_warehouse){
+ me.options_wm_warehouse = me.dataRequestObj.wm_warehouse
+ }
+ me.initData();
+
+ });
+ }
+ else {
+ this.initData();
+ }
+
+ // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+ this.$nextTick(() => {
+ hideLoading();
+
+ //閲嶆柊璁剧疆寮圭獥瀹介珮
+ this.$nextTick(function(){
+ //let w_ = this.$refs.popup_body.offsetWidth + "px";
+ let w_ = "900px";
+ let h_ = this.$refs.popup_body.offsetHeight + "px";
+ Root.setPopupWH(w_, h_);
+ })
+ });
+ },
+
+ methods:{
+ //鍏抽棴寮圭獥
+ closeDialog() {
+ var me = this;
+ if (me.popupParames.totab){
+ Root.tab.removeItem(Root.tab.selected);
+ Root.tab.open(me.popupParames.parentOption, false);
+ }
+ else {
+ Root.hidePopup();
+ }
+ },
+ //鍏抽棴鍓嶈皟鍥炶皟
+ saveAfter() {
+ var me = this;
+ if(this.popupParames.callback) {
+ let obj = {
+ //row: this.formData
+ }
+ this.popupParames.callback(obj, function() {
+ me.closeDialog();
+ });
+ }
+ else {
+ me.closeDialog();
+ }
+ },
+
+ initData() {
+
+ let me = this
+ var id_ = null;
+ me.tableButtonClick();
+
+ if (this.formData.id) {
+ id_ = this.formData.id;
+ }
+
+ this.getRowDataById(id_, function(result) {//鏌ヨ鍚庣殑鍥炶皟锛岀敤浜庤幏鍙栧瓧娈电殑
+ if (result.meta && result.meta[me.dataname] && result.meta[me.dataname].fields) {
+ var metas = clone(result.meta[me.dataname].fields);
+ var table_dataname_ = "";
+ for (var dataname_ in result.meta) {
+ if (dataname_ != me.dataname && !table_dataname_) {
+ table_dataname_ = dataname_;
+ }
+ }
+ var table_metas = [];
+ if (table_dataname_) {
+ me.table_dataname = table_dataname_;
+ table_metas = clone(result.meta[table_dataname_].fields);
+
+ }
+
+ var formFields_ = [];
+ var tableFields_ = [];
+ metas.map(f=>{
+ f.isshow = "T";
+ // if(f.field == "org_code" || f.field == "org_name"){
+ // if(me.iscustomer){
+ // f.isshow = "F";
+ // }
+ // }
+ if (f.field == "from_warehouse_name") {
+ f.options = me.options_wm_warehouse;
+ }
+ if (f.field == "to_warehouse_name") {
+ f.options = me.options_wm_warehouse;
+ }
+ formFields_.push(clone(f));
+ })
+ table_metas.map(f=>{
+ f.isshow = "T";
+
+ if (f.field == "stock_type") {
+ f.options = me.dataRequestObj.wm_stock_type
+ var formatterjson_ = {};
+ me.dataRequestObj.wm_stock_type.map(r=>{
+ formatterjson_[r.code] = r.name;
+ })
+ f.formatterjson = formatterjson_
+
+ }
+ if (f.field == "qty") {
+
+ f.inputkeys = "number";//鎸夐敭姝ｆ暣鏁�
+ var f_stock_qty = {isshow: "T", field: "stock_qty", name: "鍙敤鏁伴噺", align: "right",width: "100"}
+ tableFields_.push(clone(f_stock_qty));
+ }
+ tableFields_.push(clone(f));
+ })
+
+ if (!me.formFields || (me.formFields && me.formFields.length == 0)) {
+ me.formFields = clone(me.default_formFields);
+ me.tableFields = clone(me.default_tableFields);
+
+
+ }
+ }
+ if (me.rowData[me.dataname]) {
+ me.formData = me.rowData[me.dataname];
+ }
+ if (me.rowData[me.table_dataname]) {
+ me.tableData = me.rowData[me.table_dataname];
+ }
+ })
+
+ me.tableButtonClick();
+
+ //瀛楁鏁扮粍杞瓧娈祇bj锛岀洰鐨勪负浜嗙瓫閫夋椂鑾峰彇瀛楁灞炴��
+ me.fieldsToFieldsObj();
+
+ //璁剧疆瀛楁浜嬩欢
+ me.tableFieldClick();
+
+ },
+
+ tableFieldClick() {
+ var me = this;
+ //琛ㄥ崟瀛楁浜嬩欢璁剧疆
+ this.formfieldClick = {
+ org_name: {
+ popup: {
+ onclick: function(obj) {//寮圭獥鐐瑰嚮浜嬩欢
+ //鎵撳紑
+ me.tablePopup_customerList()
+ }
+ },
+ },
+ from_warehouse_name: {
+ visible: {
+ onchange: function(obj) {
+ // me.formData.from_warehouse_name//杩欐槸鍑轰粨椤�
+ var formFields_ = [];
+ var options_ = []
+ formFields_ = clone(me.formFields)
+ me.options_wm_warehouse.map(f=>{
+ if(f.name != me.formData.to_warehouse_name && f.account_id == me.formData.account_id) {
+ options_.push(clone(f))
+ }
+ })
+ formFields_.map(f=>{
+ if(f.field == "from_warehouse_name") {
+ f.options = clone(options_)
+ }
+ })
+ me.formFields = clone(formFields_)
+ if(me.formData.from_warehouse_name) {
+ Root.confirm('鏇存崲绉诲嚭浠撳簱灏嗕細閲嶇疆鏄庣粏锛屾槸鍚︾户缁紵', '鏇存崲鎻愮ず', { //涓嬫媺鎻愮ず
+ confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ showCancelButton:false,
+ type: 'warning'
+ }).then(() => {
+ return
+ }).catch(() => {
+ return
+ });
+ }
+
+ }
+ },
+ select: {
+ onchange: function(obj) {
+ me.tableData = []
+ obj.data.from_warehouse_name = obj.selectoption.name//灏嗛�変腑椤硅祴鍊�
+ obj.data.from_warehouse_id = obj.selectoption.id
+ obj.data.from_warehouse_code = obj.selectoption.code
+
+ }
+ }
+
+ },
+ to_warehouse_name: {
+ visible: {
+ onchange: function(obj) {
+ var formFields_ = [];
+ var options_ = []
+ formFields_ = clone(me.formFields)
+ me.options_wm_warehouse.map(f=>{
+ if(f.name != me.formData.from_warehouse_name && f.account_id == me.formData.to_account_id) {//杩欐槸鍑轰粨椤�
+ options_.push(clone(f))
+ }
+
+ })
+ formFields_.map(f=>{
+ if(f.field == "to_warehouse_name") {
+ f.options = clone(options_)
+ }
+ })
+ me.formFields = clone(formFields_)
+
+ }
+ },
+ select: {
+ onchange: function(obj){
+ obj.data.to_warehouse_name = obj.selectoption.name
+ obj.data.to_warehouse_id = obj.selectoption.id
+ obj.data.to_warehouse_code = obj.selectoption.code
+ }
+ }
+ },
+ };
+
+ //琛ㄦ牸瀛楁浜嬩欢璁剧疆
+ this.tablefieldClick = {
+ material_name: {
+ popup: {
+ onclick: function(obj) {//寮圭獥鐐瑰嚮浜嬩欢
+ //鎵撳紑
+ me.tablepopup_productlist(obj);
+ }
+ },
+ },
+ qty: {
+ input: {
+ onchange: function(obj) {//杈撳叆鏇存敼浜嬩欢
+ // if (obj.row.batch_sn) {//鏈夊簭鍒楀彿
+ // //涓嶈兘澶т簬1涓斾笉鑳藉皬浜�0
+ // if (obj.row.qty > 1) {
+ // Root.message({
+ // type: 'warning',
+ // message: '瀛樺湪搴忓垪鍙风殑鏁伴噺涓嶅彲澶т簬1'
+ // });
+ // me.$set(obj.row, "qty", 1);
+ // }
+ // else if (obj.row.qty < 0) {
+ // Root.message({
+ // type: 'warning',
+ // message: '瀛樺湪搴忓垪鍙风殑鏁伴噺涓嶅彲灏忎簬0'
+ // });
+ // me.$set(obj.row, "qty", 0);
+ // }
+ // }
+ if (obj.row.stock_qty) {//鍙敤鏁�
+ if (obj.row.qty > obj.row.stock_qty) {
+ Root.message({
+ type: 'warning',
+ message: '鏁伴噺涓嶅彲澶т簬鍙敤鏁�'
+ });
+ me.$set(obj.row, "qty", 0);
+ }
+ }
+ //灏嗙被浼尖��00099鈥欎箣绫荤殑鏁板瓧锛屽墠闈㈢殑0閮藉垹鎺�
+ if (obj.row.qty && obj.row.qty.length > 1) {
+ var p = 0;
+ for (q = 0; q <= (obj.row.qty.length + p); q++) {
+ if (obj.row.qty[0]*1 == 0) {
+ obj.row.qty = obj.row.qty.substring(1);
+ p ++;
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ },
+ },
+ };
+ },
+ // 璁剧疆琛ㄦ牸宸ュ叿鏍忔寜閿簨浠�
+ tableButtonClick() {
+ var me = this;
+ var tablebuttonclick = [];
+ tablebuttonclick = [
+ {
+ name:"鏂板鏄庣粏",
+ isbuttonshow: me.isedit, type: "primary",
+ code: "addDetail", isselected: false, classname:"",
+
+ onclick: function(obj) {
+ // if(!me.formData.from_warehouse_name || !me.formData.to_warehouse_name){
+ // Root.message({
+ // type: 'warning',
+ // message: '璇峰厛閫夋嫨浠撳簱'
+ // });
+ // return;
+ // }
+ // me.tablepopup_productlist(obj)
+ me.tablepopup_feelist("add", obj, function(popupobj){
+ // let row_ = clone(me.formData)
+ var tableData_ = clone(me.tableData);
+ if (popupobj.list && popupobj.list.length) {
+ popupobj.list.map(row => {
+ var newrow = {
+ parent_id: row.id,
+ sale_year: row.sale_year,
+ sale_month: row.sale_month,
+ date: row.date,
+ commit_year: row.commit_year,
+ commit_month: row.commit_month,
+ type: row.type,
+ sale_code: row.sale_code,
+ sale_name: row.sale_name,
+ customer_code: row.customer_code,
+ customer_name: row.customer_name,
+ product: row.product,
+ spec: row.spec,
+ agreement_code: row.agreement_code,
+ invoince_price: row.invoince_price,
+ settlement_price: row.settlement_price,
+ tax: row.tax,
+ policy: row.policy,
+ flow_qty: row.flow_qty,
+ comfirm_qyt: row.comfirm_qyt,
+ return_qty: row.return_qty,
+ other_deduction: row.other_deduction,
+ returned_qty: row.returned_qty,
+ deduction_remark: row.deduction_remark,
+ order_code: row.order_code,
+ order_total: row.order_total,
+ order_amt: row.order_amt,
+ order_state: row.order_state,
+ platform_information: row.platform_information,
+ applicant: row.applicant,
+ product_group: row.product_group,
+ apply_date: row.apply_date,
+ pre_merger_customer: row.pre_merger_customer,
+ last_arrpove_time: row.last_arrpove_time,
+ agency_fee_state: row.agency_fee_state,
+ freeze: row.freeze,
+ ferrze_remark: row.ferrze_remark,
+ }
+
+ tableData_.unshift(clone(newrow));
+ })
+ }
+ me.tableData = clone(tableData_)
+ })
+
+ }
+ },
+ {
+ isbuttonshow: me.isedit, type: "danger",
+ code: "delete", isselected: true, classname:"",
+ disabled: function(selectRowList) {
+ var bo_ = true ;
+ if (selectRowList[0]) {
+ bo_ = false
+ }
+ return bo_;
+ },
+ onclick: function(obj) {
+ var row = obj.selectedList[0];
+ var txt = clone(row.product_name);
+ me.deleteDataById(row.id, "wm_movement_detail", "銆�" + txt + "銆�", function(){
+ me.tableData.splice(obj.selectRowIndex, 1);
+ })
+ }
+ }
+ ]
+ me.tablebuttonClick = tablebuttonclick
+
+ },
+
+
+
+ tablepopup_feelist(sceneCode, obj , callback) {
+ var me = this;
+ var data_ = {};
+ var delta_ = {};
+ console.log(obj);
+
+ //鎺掗櫎宸查�夌墿鏂�
+ // me.tableData.map(row=>{
+ // if (row.batch_sn) {
+ // var key_ = me.formData.from_warehouse_id + "_" + row.product_code + "_" + row.batch_no + "_" + row.batch_sn
+ // delta_[key_] = true
+ // }
+ // else if (row.product_code) {
+ // var key_ = me.formData.from_warehouse_id + "_" + row.product_code + "_" + row.batch_no
+ // delta_[key_] = true
+ // }
+ // })
+ var config = {
+ totab: false, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
+ width: "800px",
+ height: "520px",
+ icon: "icon-product",
+ text: "鏄庣粏閫夋嫨",
+ id: "popup_fee_qty",//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+ url: "module/fee/page/popup/popup_fee_qty.html",
+ data: data_,
+ delta: delta_,
+ // filter: "org_id='"+ me.selectedrow.org_id + "' and bu_id='" + me.selectedrow.bu_id + "'",
+ filter: "state_code='Input'" ,
+ sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
+ callback: function(popupobj, popupcallback) {
+ callback(popupobj);
+ if (popupcallback) {
+ popupcallback();
+ }
+ }
+ };
+ me.doPopupByPublic(config);
+ },
+ deleteDataById(id, dataname, confirm_txt, callback){
+ var me = this;
+ var formData_ = clone(me.formData);
+ Root.confirm('纭畾鍒犻櫎璇�' + confirm_txt + '鍚楋紵', '鍒犻櫎鎻愮ず', {
+ confirmButtonText: '鍒犻櫎',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ if (id) {
+ let param = {
+ dataname: dataname,
+ id: id
+ }
+ Server.call("root/data/deleteEntity", param, function(result) {
+ console.log(result);
+ if (result && result.data) {
+ callback();
+ }
+ });
+ }
+ else {
+ callback();
+ }
+
+ }).catch(() => {
+ Root.message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
+
+ },
+
+ GFG_Fun() {
+ var suiji = Math.random().toString(36).slice(2);
+ return suiji;
+ },
+
+ addTableData() {
+ var me = this
+ // if(!this.formData.from_warehouse_name || !this.formData.to_warehouse_name){
+ // Root.message({
+ // type: 'warning',
+ // message: '璇峰厛閫夋嫨浠撳簱'
+ // });
+ // return;
+ // }
+ },
+
+ delData(scope) {
+ let me = this;
+ let row = scope.row;
+ let index_ = scope.$index;
+
+ Root.confirm('纭畾鍒犻櫎璇ユ暟鎹悧锛�', '鍒犻櫎鎻愮ず', {
+ confirmButtonText: '鍒犻櫎',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ me.rowChange(row, "del", me.table_dataname);
+ }).catch(() => {
+ Root.message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
+ },
+
+ rowChange(row, type, tablename) {
+ var me = this;
+ if (type == "add") {
+ this.tableData.unshift(row);
+ }
+ else if (type == "del") {
+ if (row.id) {
+ let param = {
+ dataname: tablename,
+ id: row.id
+ }
+
+ Server.call("root/data/deleteEntity", param, function(result) {
+ console.log(result);
+ if (result && result.data) {
+ me.tableData.remove(row);
+
+ Root.message({
+ type: 'success',
+ message: '鍒犻櫎鎴愬姛!'
+ });
+ }
+ });
+ }
+ else {
+ this.tableData.remove(row);
+ }
+ }
+ else {
+
+ }
+ },
+
+ //鎻愪氦
+ submitRowTable() {
+ var me = this;
+ var bo_ = true;
+ var batch_no_ = true;
+ if (this.iscommit) {
+ return
+ }
+
+ if (me.tableData.length == 0) {
+ bo_ = false;
+ Root.message({
+ type: 'warning',
+ message: '璇峰厛娣诲姞鏄庣粏鏁版嵁'
+ });
+ return
+ }
+
+ me.tableData.map(r=>{
+ if (r.qty == null || r.qty === "" || isNaN(r.qty) || r.qty == 0) {
+ bo_ = false;
+ }
+ if (r.batch_no == null || r.batch_no === "") {
+ batch_no_ = false;
+ }
+ })
+ if (!bo_) {
+ Root.message({
+ type: 'error',
+ message: '鏄庣粏涓瓨鍦ㄦ暟閲忎负绌虹殑鏁版嵁'
+ });
+ return
+ }
+
+ // if (!batch_no_) {
+ // Root.message({
+ // type: 'error',
+ // message: '鏄庣粏涓瓨鍦ㄦ壒鍙蜂负绌虹殑鏁版嵁'
+ // });
+ // return
+ // }
+
+
+ this.iscommit = true;
+ this.saveRowTable();
+ },
+
+ //淇濆瓨
+ saveRowTable() {
+ var me = this;
+ var operator_ = "saveEntity";//淇濆瓨
+ if(me.iscommit) {
+ operator_ = "Commit";//鎻愪氦
+ }
+
+ var entity_ = clone(this.formData);
+ var entity = {};
+ for (var r in entity_) {
+ if (entity_[r] || entity_[r] == "" || entity_[r] == false || entity_[r] == 0) {
+ entity[r] = entity_[r];
+ }
+ }
+
+ var tableData_ = [];
+ this.tableData.map(r=>{
+ var row_ = {};
+ for (var k in r) {
+ if (r[k]) {
+ row_[k] = r[k];
+ }
+ }
+ tableData_.push(row_);
+ })
+
+ if (tableData_.length == 0) {
+ Root.message({
+ type: 'warning',
+ message: '璇峰厛娣诲姞鏄庣粏鏁版嵁'
+ });
+ return
+ }
+
+ var bo_ = true;
+ var batch_no_ = true;
+ tableData_.map(r=>{
+ if (r.qty == null || r.qty === "" || isNaN(r.qty) || r.qty == 0) {
+ bo_ = false;
+ }
+ if (r.batch_no == null || r.batch_no === "") {
+ batch_no_ = false;
+ }
+ })
+ if (!bo_) {
+ Root.message({
+ type: 'error',
+ message: '鏄庣粏涓瓨鍦ㄦ暟閲忎负绌虹殑鏁版嵁'
+ });
+ return
+ }
+
+ let param = {
+ dataname: this.dataname,
+ data: {},
+ }
+ param.data[this.dataname] = entity;
+ param.data[this.table_dataname] = tableData_;
+
+ if (this.formData.id) {
+ param.id = this.formData.id
+ }
+
+ Server.call("root/data/" + operator_, param, function(result) {
+ console.log(result);
+ if (result.success) {
+ if(me.iscommit){
+ me.iscommit = false;
+ Root.message({
+ type: 'success',
+ message: '鎻愪氦鎴愬姛'
+ });
+ me.saveAfter();
+ }
+ else {
+ Root.message({
+ type: 'success',
+ message: '淇濆瓨鎴愬姛'
+ });
+ me.saveAfter();
+ }
+ }
+ }, function(errorresult) {
+ console.log("閿欒淇℃伅", errorresult);
+
+ if (errorresult.messages && errorresult.messages.count && errorresult.messages.count.error) {
+ me.iscommit = false;
+ if (errorresult.messages.list) {
+ var config = {
+ totab: false,
+ // width: "1200px",
+ // height: 800,
+ icon: "icon-product",
+ text: "閿欒淇℃伅",
+ url: "module/tool/page/popup_error_messages.html",
+ data: {},
+ delta: errorresult.messages.list,
+ callback: function(obj, callback) {
+ if (callback) {
+ callback();
+ }
+ }
+ };
+ me.doPopupByPublic(config);
+ }
+ }
+ else {
+ if (me.iscommit) {
+ Root.message({
+ type: 'error',
+ message: '鎻愪氦澶辫触'
+ });
+ me.iscommit = false;
+ }
+ else {
+ Root.message({
+ type: 'error',
+ message: '淇濆瓨澶辫触'
+ });
+ }
+
+ }
+ });
+ },
+
+ }
+ });
+ };
+
+ loadJsCss(function () {
+ initVue();
+ });
+ </script>
+ <style>
+ /* 鍦╲ue.js涓� v-cloak 杩欎釜鎸囦护鏄槻姝㈤〉闈㈠姞杞芥椂鍑虹幇 vuejs 鐨勫彉閲忓悕鑰岃璁＄殑 */
+ [v-cloak] {
+ display: none !important;
+ }
+ </style>
+
+ </head>
+
+ <body style="margin: 0px;">
+ <div v-cloak id="vbody">
+ <div id="page_root">
+ <div ref="popup_body" style="padding: 0 20px;">
+ <div class="el-dialog__header">
+ <div class="dialog-title">
+ <i class="iconfont icon-customermanagement"></i>
+ <span> {{title}}</span>
+ </div>
+ </div>
+ <div :style="{height: dheight + 'px', 'overflow-y': 'auto'}">
+ <div class="el-dialog__body">
+ <h-form
+ ref="form1"
+ :form-attr="formAttr"
+ :table-fields="formFields"
+ :form-data="formData"
+ :table-field-click="formfieldClick"
+ >
+ </h-form>
+
+ <div class="h_dialog__body">
+ <div v-if="isedit || isrefuseedit" style=" text-align: right; margin-top: 20px;">
+ <!-- 宸ュ叿鏍� -->
+ <!-- <div style=" display: inline-block; width: 90px;">
+ <el-button-group style="display: flex;justify-content: center;"> -->
+ <!-- <el-button>鎵归噺瀵煎叆</el-button>
+ <el-button type = "danger" @click="delDetail">鍒� 闄�</el-button>
+ <el-button>瀵煎叆妯℃澘涓嬭浇</el-button> -->
+ <!-- <el-button @click="addTableData">鏂板鏄庣粏</el-button> -->
+ <!-- </el-button-group>
+ </div> -->
+ </div>
+ <h-table
+ v-if="isRefresh && tableFields.length"
+ ref="table1"
+ :table-fields="tableFields"
+ :table-data="tableData"
+ :is-within-edit-table-data="isedit || isrefuseedit"
+ :is-pagination="false"
+ :is-highlight-row="true"
+ :isdraggableorder="false"
+ :isfilterfield="false"
+ :table-field-click="tablefieldClick"
+ :table-buttons-click="tablebuttonClick"
+
+ v-on:get-data="getData"
+ v-on:del-data="delData"
+ >
+ </h-table>
+ </div>
+
+
+ </div>
+ </div>
+ <div class="el-dialog__footer">
+ <el-button size="small" type="default" @click="closeDialog">鍙� 娑�</el-button>
+ <el-button size="small" v-if="isedit || isrefuseedit" type="primary" @click="":icon="buttonsconfig.save.icon">{{buttonsconfig.save.name}}</el-button>
+ <el-button size="small" v-if="isedit" type="success" @click="" :icon="buttonsconfig.submit.icon">{{buttonsconfig.submit.name}}</el-button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div id="page_loading" style="position: absolute; top:0px; width: 100vw; height: 50vh;">
+ <div class="spinner">
+ <div class="cube1"></div>
+ <div class="cube2"></div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/module/fee/page/popup/popup_fee_qty.html b/module/fee/page/popup/popup_fee_qty.html
new file mode 100644
index 0000000..17ef75e
--- /dev/null
+++ b/module/fee/page/popup/popup_fee_qty.html
@@ -0,0 +1,265 @@
+
+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8"><meta http-equiv="Expires" content="0"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Cache-control" content="no-cache"><meta http-equiv="Cache" content="no-cache">
+ <title>鏁伴噺鍗曢�夋嫨寮圭獥</title>
+
+ <script type="text/javascript">
+ var pageVue = null;
+ function loadJsCss(callback) {
+ var jscss_urls = [];
+ window.top.initJsCss(document, jscss_urls, callback);
+ };
+
+ function initVue() {
+ new ListVue({
+ el: "#vbody",
+ data: {
+ dataname: "fee_qty", //"md_hospital",
+ title: "鏁伴噺鍗曢�夋嫨寮圭獥",
+ pageAttr: {
+ heightType: "popuppage"
+ },
+ default_tableFields: [
+ { field: "state_name", name: "鐘舵��", isshow: "T", width: "80",input_type_filter:"select",filter_field:"state_code",inputtype:"capsuletag",options_pattern:"{^鑽夌^:^info^,^鐢熸晥^:^success^,^瀹℃壒涓璣:^warning^}"},
+ { field: "state_code", name: "鐘舵��", isshow: "F", width: "80" },
+ { field: "id", name: "纭鍗曞彿", isshow: "T", width: "120", isfilter: true },
+ { field: "sale_year", name: "閿�鍞勾浠�", isshow: "T", align: "center", width: "80" },
+ { field: "sale_month", name: "閿�鍞湀浠�", isshow: "T" ,width: "80"},
+ { field: "date", name: "閿�鍞棩鏈�", isshow: "T",width: "100",type:"date",formatter:"formatter_date"},
+ { field: "commit_year", name: "缁熻骞翠唤", isshow: "T",width: "80" },
+ { field: "commit_month", name: "缁熻鏈堜唤", isshow: "T", width: "80" },
+ { field: "type", name: "绫诲瀷", isshow: "T",},
+ { field: "sale_code", name: "鏈嶅姟鑱旂郴浜虹紪鐮�", isshow: "T", align: "center",width: "110" },
+ { field: "sale_name", name: "鏈嶅姟鑱旂郴浜�", isshow: "T", align: "center", width: "100" },
+ { field: "customer_code", name: "瀹㈡埛缂栫爜", isshow: "T", align: "center",width: "100" },
+ { field: "customer_name", name: "瀹㈡埛鍚嶇О", isshow: "T", align: "left",width: "150" , isfilter: true },
+ { field: "product", name: "浜у搧鍚嶇О", isshow: "T", align: "left" ,width: "200" },
+ { field: "spec", name: "瑙勬牸", isshow: "T", align: "center",width: "150" },
+ { field: "agreement_code", name: "鍗忚缂栧彿", isshow: "T",width: "100", align: "center", isfilter: true },
+ { field: "invoince_price", name: "寮�绁ㄤ环", isshow: "T", align: "center", },
+ { field: "settlement_price", name: "缁撶畻浣庝环", isshow: "T", align: "center", },
+ { field: "tax", name: "绋庣偣", isshow: "T", align: "center", },
+ { field: "policy", name: "鏀跨瓥", isshow: "T", align: "center", },
+ { field: "flow_qty", name: "娴佸悜鏁伴噺", isshow: "T", align: "center", },
+ { field: "comfirm_qyt", name: "纭鏁伴噺", isshow: "T", align: "center", },
+ { field: "return_qty", name: "搴旇繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "other_deduction", name: "鍏朵綑鎵ｆ", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "returned_qty", name: "瀹炶繑閲戦", isshow: "T", align: "center",formatter:"formatter_money" },
+ { field: "deduction_remark", name: "鎵ｆ澶囨敞", isshow: "T", align: "left",width:'200' },
+ { field: "order_code", name: "璁㈠崟鍙�", isshow: "T", align: "center", isfilter: true,width:'120' },
+ { field: "order_total", name: "璁㈠崟閲戦", isshow: "T", align: "center",formatter:"formatter_money",width:'120' },
+ { field: "order_amt", name: "璁㈠崟鍗曚环", isshow: "T", align: "center",formatter:"formatter_money",width:'120' },
+ { field: "order_state", name: "璁㈠崟鐘舵��", isshow: "T", align: "center",width:'80' },
+ { field: "platform_information", name: "骞冲彴淇℃伅", isshow: "T", align: "center", },
+ { field: "applicant", name: "鐢宠浜�", isshow: "T", align: "center", },
+ { field: "product_group", name: "浜у搧缁�", isshow: "T", align: "center", },
+ { field: "apply_date", name: "鐢宠鏃堕棿", isshow: "T", align: "center",formatter:"formatter_date",width: "100" },
+ { field: "pre_merger_customer", name: "鍚堝苟鍓嶅鎴�", isshow: "T", align: "center", width: "100" },
+ { field: "last_arrpove_time", name: "鏈�鍚庡鎵规椂闂�", isshow: "T", align: "center",formatter:"formatter_date",width: "100" },
+ { field: "agency_fee_state", name: "浠ｇ悊璐圭敤鍗曠姸鎬�", isshow: "T", align: "center",width: "110" },
+ { field: "freeze", name: "鍐荤粨鐘舵��", isshow: "T", align: "center", },
+ { field: "ferrze_remark", name: "鍐荤粨鍘熷洜", isshow: "T", align: "left", },
+ ],
+ filterAttr: {
+ columnnumber: 3,
+ labelwidth: "100px",
+ labelposition: "right",//"left",//"right",
+ size: "medium",
+ border: "0px solid #c6c6c600"
+ },
+ filterfieldClick: {},
+ tablefieldClick: {},
+ formfieldClick: {},
+
+ selectedrows: [],
+ },
+ created() {
+ this.popupParames = clone(Root.popupParames);
+ this.title = this.popupParames.title || this.popupParames.text
+ if (this.popupParames.filter) {
+ this.filterTxt = this.popupParames.filter
+ }
+
+ if (this.popupParames.dataname) {
+ this.dataname = this.popupParames.dataname;
+ }
+
+ if (this.popupParames.sceneCode) {
+ if (this.popupParames.sceneCode == "add") {//鏂板
+ this.isedit = true;
+ }
+ }
+ },
+
+ mounted() {
+ //鑾峰彇鏁版嵁
+ this.initData();
+ this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+ hideLoading();
+ });
+ },
+
+ methods:{
+ //鍏抽棴寮圭獥
+ closeDialog() {
+ this.docloseDialog(true);
+ },
+
+ //鍏抽棴鍓嶈皟鍥炶皟
+ saveAfter() {
+ var me = this;
+ var selectedrows = this.$refs.table1.getShoppingcart();
+
+ if(this.popupParames.callback) {
+ let obj = {
+ list: clone(selectedrows)
+ // row: clone(this.selectedrow)
+ }
+ this.popupParames.callback(obj, function() {
+ me.docloseDialog();
+ });
+ }
+ else {
+ me.docloseDialog();
+ }
+ },
+
+ initData() {
+ var me = this;
+ this.onQuery(function(result, callback) {//鏌ヨ鍚庣殑鍥炶皟锛岀敤浜庤幏鍙栧瓧娈电殑
+ if (result.meta && result.meta[me.dataname] && result.meta[me.dataname].fields) {
+ // var metas = clone(result.meta[me.dataname].fields);
+ var filterFields_ = [];
+ var tableFields_ = [];
+
+ me.default_tableFields.map(f=>{
+ f.isshow = "T";
+
+ if (f.isfilter) {
+ filterFields_.push(clone(f));
+ }
+ else {
+ var filter_f = clone(f);
+ filter_f.isshow = "F";
+ }
+
+ tableFields_.push(clone(f));
+ })
+ if (!me.filterFields || (me.filterFields && me.filterFields.length == 0)) {
+ me.filterFields = clone(filterFields_);
+ me.tableFields = clone(me.default_tableFields);
+
+ //瀛楁鏁扮粍杞瓧娈祇bj锛岀洰鐨勪负浜嗙瓫閫夋椂鑾峰彇瀛楁灞炴��
+ me.fieldsToFieldsObj();
+
+ //璁剧疆瀛楁浜嬩欢
+ me.tableFieldClick();
+ }
+
+ }
+
+ if (callback) {
+ callback();
+ }
+ });
+ },
+
+ tableFieldClick() {
+ var me = this;
+ //绛涢�夊瓧娈典簨浠惰缃�
+ this.filterfieldClick = {
+ };
+ //琛ㄦ牸瀛楁浜嬩欢璁剧疆
+ this.tablefieldClick = {
+ };
+
+ //琛ㄥ崟瀛楁浜嬩欢璁剧疆
+ this.formfieldClick = {
+ };
+ },
+
+ selectionChange(obj){
+ var me = this;
+ me.selectedrows = obj;
+ },
+ saveShoppingcart(list) {
+ var me = this;
+ me.selectedrows = list;
+ },
+
+ onRowDblClick() {
+ if (this.isedit) {
+ this.saveAfter();
+ }
+ },
+
+ }
+ });
+ };
+
+ loadJsCss(function () {
+ initVue();
+ });
+ </script>
+ <style>
+ /* 鍦╲ue.js涓� v-cloak 杩欎釜鎸囦护鏄槻姝㈤〉闈㈠姞杞芥椂鍑虹幇 vuejs 鐨勫彉閲忓悕鑰岃璁＄殑 */
+ [v-cloak] {
+ display: none !important;
+ }
+ </style>
+
+ </head>
+
+ <body style="margin: 0px;">
+ <div v-cloak id="vbody">
+ <div id="page_root">
+ <div ref="popup_body" style="padding: 0 20px;">
+ <div class="h_dialog__body">
+ <h-table
+ v-if="isRefresh && tableFields.length"
+ ref="table1"
+ :table-fields="tableFields"
+ :table-data="tableData"
+ :pagesize="pagesize"
+ :pagenum="pagenum"
+ :total="total"
+ :table-height="tableHeight"
+ :table-field-click="tablefieldClick"
+ :is-highlight-row="isedit"
+ :is-show-index="false"
+ :filtersobj="filterObj"
+ :isdraggableorder="false"
+
+ v-on:get-data="getData"
+ v-on:row-click="rowClick"
+
+ :select-table-data="selectedrows"
+ :is-selection="true"
+ :isshow-shoppingcart="true"
+ v-on:selection-change="selectionChange"
+ v-on:save-shoppingcart="saveShoppingcart"
+ >
+ </h-table>
+ <!-- v-on:row-dblclick="rowDblclick" -->
+ </div>
+
+ <!-- 搴曢儴宸ュ叿鏍� -->
+ <div class="el-dialog__footer">
+ <el-button size="small" type="default" @click="closeDialog">鍙� 娑�</el-button>
+ <el-button size="small" v-if="isedit" type="primary" @click="saveAfter">纭� 瀹�</el-button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div id="page_loading" style="position: absolute; top:0px; width: 100vw; height: 50vh;">
+ <div class="spinner">
+ <div class="cube1"></div>
+ <div class="cube2"></div>
+ </div>
+ </div>
+
+ </body>
+</html>
--
Gitblit v1.8.0