From 8f9dce08ec70dc436b86a782e7bcb13872e52390 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 20 八月 2024 20:06:24 +0800
Subject: [PATCH] 调整

---
 module/fee/page/fee_execute.html |   45 ++++++++++++---------------------------------
 1 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/module/fee/page/fee_execute.html b/module/fee/page/fee_execute.html
index aa2d175..dad83b9 100644
--- a/module/fee/page/fee_execute.html
+++ b/module/fee/page/fee_execute.html
@@ -14,7 +14,7 @@
 				new ListVue({
 					el: "#vbody",
 					data: {
-						dataname: "fee_guide_settle_execute",
+						dataname: "fee_task_execute",
 						title: "鎵ц鍗�",
 						orderby: "",
 						filterfieldClick: {},
@@ -158,31 +158,8 @@
 										notclick_val: "",//涓嶅彲鐐瑰嚮鐨勫��,1銆佹槸鏁扮粍["11","22"]锛�2銆佷互鈥�;鈥濆垎闅旂殑瀛楃涓�"111;222"
 										notclick_bindfield: [],//褰撹瀛楁鍊肩瓑浜庢寚瀹氬瓧娈靛�兼椂涓嶅彲鐐瑰嚮["filterfield": "111"]
 										onclick: function(obj) {//鏁版嵁鍊肩偣鍑讳簨浠�
-											var sceneCode_ = "browse";
 											//濡傛灉鏄垱寤轰汉涓旀槸褰曞叆鐘舵�佹垨閫�鍥炵姸鎬佸垯鏄紪杈戠姸鎬�
-											if (obj.row.creator_id == window.top.vue.userinfo.id && (obj.row.state_code == "Input" || obj.row.state_code == "input" || obj.row.state_code == "Rejected")) {
-												sceneCode_ = "edit";
-											}
-											
-											var config = {
-												totab: true, //true: 浠ab瀵艰埅鐨勬柟寮忔墦寮�
-												width: "1100px",
-												height: "520px",
-												icon: "icon-product",
-												text: "鍟嗕笟淇℃伅 " + (obj.row.name ? obj.row.name : ""),
-												id: "customer_edit_browse" + obj.row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-												url: "module/md/page/customer/page/customer_edit.html",
-												data: obj.row,
-												delta: {closeCode:"1"},
-												sceneCode: sceneCode_,//"refuseedit",//"approval", //"add"//"browse",
-												callback: function(obj, callback) {
-													me.onQuery();
-													if (callback) {
-														callback();
-													}
-												}
-											};
-											me.doPopupByPublic(config);
+											me.editData("browse", obj.row);
 										},
 									},	
 								},
@@ -193,11 +170,12 @@
 							var me = this;
 							me.selectedrow = obj.row;
 						},
-						
-						editData(sceneCode) {
+						addData() {
+							this.editData("add", {});
+						},
+						editData(sceneCode, row) {
 							var me = this;
-							var row = me.selectedrow;
-							if(!row){
+							if(sceneCode == "edit" && !row){
 								Root.message({
 									type: 'warning',
 									message: '璇烽�夋嫨涓�鏉℃暟鎹�'
@@ -209,9 +187,9 @@
 								width: "900px",
 								height: "500px",
 								icon: "icon-product",
-								text: "鏁伴噺鍗曠紪杈�",
-								id: "popup_edit_fee_qty" + sceneCode + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
-								url: "module/fee/page/popup/popup_edit_fee_qty.html",
+								text: "鎵ц鍗曠紪杈�",
+								id: "popup_edit_fee_execute" + sceneCode + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+								url: "module/fee/page/popup/popup_edit_fee_execute.html",
 								data: row,
 								delta: {},
 								sceneCode: sceneCode,//"refuseedit",//"approval", //"add"//"browse",
@@ -280,7 +258,8 @@
 					
 					<div :class="page_title == 'right' ? 'h_page_button_left' : 'h_page_button_right'">
 						<el-button-group style="margin-left: 3px;">
-							<el-button :disabled="!(selectedrow.id)" @click="editData('edit') " :icon="buttonsconfig.alter.icon":icon="buttonsconfig.alter.icon">{{buttonsconfig.alter.name}}</el-button>
+							<el-button  @click="addData() " :icon="buttonsconfig.add.icon">{{buttonsconfig.add.name}}</el-button>
+							<el-button :disabled="!(selectedrow.id)" @click="editData('edit', selectedrow) " :icon="buttonsconfig.alter.icon">{{buttonsconfig.alter.name}}</el-button>
 						</el-button-group>
 						
 						<el-button v-show="cbuttons_r.export ? cbuttons_r.export : false" @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>

--
Gitblit v1.8.0