From 81b38d5a642589397581e9c6e7428b305b01e035 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期三, 31 七月 2024 00:11:57 +0800
Subject: [PATCH] 协议

---
 module/md/page/customer/page/customer_list_agreement_edit.html |  163 +++++++++---------------------------------------------
 module/md/page/customer/page/customer_list_authorization.html  |   10 +-
 2 files changed, 32 insertions(+), 141 deletions(-)

diff --git a/module/md/page/customer/page/customer_list_agreement_edit.html b/module/md/page/customer/page/customer_list_agreement_edit.html
index 0631334..6fcdaa7 100644
--- a/module/md/page/customer/page/customer_list_agreement_edit.html
+++ b/module/md/page/customer/page/customer_list_agreement_edit.html
@@ -113,36 +113,36 @@
 									disabled: false
 								},
 							},
-							{code: "tab2", name: "鍖婚櫌鎺堟潈", dataname: "md_org_account_hospital", filterTxt: "1<>1", orderby: "", 
+							// {code: "tab2", name: "绛剧害鍖婚櫌", dataname: "md_org_account_hospital", filterTxt: "1<>1", orderby: "", 
+							// 	tableFields: [],
+							// 	tableData: [],
+							// 	tablefieldClick: {},
+							// 	tablebuttonClick: {},
+							// },
+							{code: "tab3", name: "绛剧害鍖婚櫌", dataname: "md_target_dealer", filterTxt: "1<>1", orderby: "",
 								tableFields: [],
 								tableData: [],
 								tablefieldClick: {},
 								tablebuttonClick: {},
 							},
-							{code: "tab3", name: "鎸囨爣", dataname: "md_target_dealer", filterTxt: "1<>1", orderby: "",
-								tableFields: [],
-								tableData: [],
-								tablefieldClick: {},
-								tablebuttonClick: {},
-							},
-							{code: "tab4", name: "浠锋牸鏀跨瓥", dataname: "md_prod_price_detail", filterTxt: "1<>1", orderby: "",
-								tableFields: [],
-								tableData: [],
-								tablefieldClick: {},
-								tablebuttonClick: {},
-							},
-							{code: "tab6", name: "涔拌禒鏀跨瓥", dataname: "agm_record_gift", filterTxt: "1<>1", orderby: "",
-								tableFields: [],
-								tableData: [],
-								tablefieldClick: {},
-								tablebuttonClick: {},
-							},
-							{code: "tab7", name: "鎶樻墸鏀跨瓥", dataname: "agm_record_rate", filterTxt: "1<>1", orderby: "",
-								tableFields: [],
-								tableData: [],
-								tablefieldClick: {},
-								tablebuttonClick: {},
-							},
+							// {code: "tab4", name: "浠锋牸鏀跨瓥", dataname: "md_prod_price_detail", filterTxt: "1<>1", orderby: "",
+							// 	tableFields: [],
+							// 	tableData: [],
+							// 	tablefieldClick: {},
+							// 	tablebuttonClick: {},
+							// },
+							// {code: "tab6", name: "涔拌禒鏀跨瓥", dataname: "agm_record_gift", filterTxt: "1<>1", orderby: "",
+							// 	tableFields: [],
+							// 	tableData: [],
+							// 	tablefieldClick: {},
+							// 	tablebuttonClick: {},
+							// },
+							// {code: "tab7", name: "鎶樻墸鏀跨瓥", dataname: "agm_record_rate", filterTxt: "1<>1", orderby: "",
+							// 	tableFields: [],
+							// 	tableData: [],
+							// 	tablefieldClick: {},
+							// 	tablebuttonClick: {},
+							// },
 							// {code: "tab5", name: "闄勪欢", dataname: "md_sku", filterTxt: "1<>1", orderby: ""},
 							
 						],
@@ -1485,56 +1485,6 @@
 								}
 							};
 							
-							this.TabObjMap["tab4"].formfieldClick = {
-								date_from: {
-									input: {
-										onchange:function(){
-											me.TabObjMap["tab4"].tableData = me.selectTabObj.tableData
-										}
-									}
-								},
-								date_to: {
-									input: {
-										onchange:function(){
-											me.TabObjMap["tab4"].tableData = me.selectTabObj.tableData
-										}
-									}
-								}
-							};
-							
-							this.TabObjMap["tab6"].formfieldClick = {
-								date_from: {
-									input: {
-										onchange:function(){
-											me.TabObjMap["tab6"].tableData = me.selectTabObj.tableData
-										}
-									}
-								},
-								date_to: {
-									input: {
-										onchange:function(){
-											me.TabObjMap["tab6"].tableData = me.selectTabObj.tableData
-										}
-									}
-								}
-							};
-							this.TabObjMap["tab7"].formfieldClick = {
-								date_from: {
-									input: {
-										onchange:function(){
-											me.TabObjMap["tab7"].tableData = me.selectTabObj.tableData
-										}
-									}
-								},
-								date_to: {
-									input: {
-										onchange:function(){
-											me.TabObjMap["tab7"].tableData = me.selectTabObj.tableData
-										}
-									}
-								}
-							};
-							
 							// this.TabObjMap["tab5"].formfieldClick = formfieldClick_tab5;
 						},
 						
@@ -2629,7 +2579,7 @@
 								:table-field-click="formfieldClick"
 							>
 							</h-form>
-
+							
 							<div v-if="formFields && formFields.length" style="padding: 5px 20px;">
 								<el-tabs v-model="activeTabName" @tab-click="handleClick" :before-leave="onTabBeforeLeave">
 									<el-tab-pane v-for="(tab, k) in tabs" :label="tab.name" :name="tab.code" :key="k"></el-tab-pane>
@@ -2684,66 +2634,7 @@
 									</h-table>
 									<!-- :is-edit-table-data="selectTabObj.isEditTableData" -->
 								</div>
-								<!-- 浠锋牸 -->
-								<div v-show="activeTabName == 'tab4'" class="h_dialog__body" style="padding: 0px;">
-									<h-table
-										v-if="isRefresh && selectTabObj.tableFields"
-										ref="table4"
-										:table-fields="selectTabObj.tableFields" 
-										:table-data="selectTabObj.tableData" 
-										:is-edit-table-data="selectTabObj.isEditTableData"
-										:is-within-edit-table-data="isedit"
-										:table-field-click="TabObjMap['tab4'].formfieldClick"
-										:is-pagination="false"
-										:isdraggableorder="false"
-										:isfilterfield="false"
-										:isbasicfilterfields="false"
-										:is-highlight-row="true"
-										
-										:table-buttons-click="selectTabObj.tablebuttonClick"
-									>
-									</h-table>
-								</div>
-								<!-- 涔拌禒鏀跨瓥 -->
-								<div v-show="activeTabName == 'tab6'" class="h_dialog__body" style="padding: 0px;">
-									<h-table
-										v-if="isRefresh && selectTabObj.tableFields"
-										ref="table6"
-										:table-fields="selectTabObj.tableFields" 
-										:table-data="selectTabObj.tableData" 
-										:is-edit-table-data="selectTabObj.isEditTableData"
-										:is-within-edit-table-data="isedit"
-										:table-field-click="TabObjMap['tab6'].formfieldClick"
-										:is-pagination="false"
-										:isdraggableorder="false"
-										:isfilterfield="false"
-										:isbasicfilterfields="false"
-										:is-highlight-row="true"
-										
-										:table-buttons-click="selectTabObj.tablebuttonClick"
-									>
-									</h-table>
-								</div>
-								<!-- 鎶樻墸鏀跨瓥 -->
-								<div v-show="activeTabName == 'tab7'" class="h_dialog__body" style="padding: 0px;">
-									<h-table
-										v-if="isRefresh && selectTabObj.tableFields"
-										ref="table6"
-										:table-fields="selectTabObj.tableFields" 
-										:table-data="selectTabObj.tableData" 
-										:is-edit-table-data="selectTabObj.isEditTableData"
-										:is-within-edit-table-data="isedit"
-										:table-field-click="TabObjMap['tab7'].formfieldClick"
-										:is-pagination="false"
-										:isdraggableorder="false"
-										:isfilterfield="false"
-										:isbasicfilterfields="false"
-										:is-highlight-row="true"
-										
-										:table-buttons-click="selectTabObj.tablebuttonClick"
-									>
-									</h-table>
-								</div>
+								
 							</div>
 						</div>
 					</div>
diff --git a/module/md/page/customer/page/customer_list_authorization.html b/module/md/page/customer/page/customer_list_authorization.html
index 3f4b0a1..9ab94e0 100644
--- a/module/md/page/customer/page/customer_list_authorization.html
+++ b/module/md/page/customer/page/customer_list_authorization.html
@@ -18,11 +18,11 @@
 						title: "鎺堟潈绠$悊",
 						//Tab椤硅缃�
 						tabs_d: [
-							{code: "Input", name: "鎺堟潈鐢宠", dataname: "md_org_account_hospital_apply", filterTxt: "(state_code='Input' or state_code='OpeningApproval')", orderby: "md_org_account_hospital_apply.date_to"},
-							{code: "Open", name: "鐢熸晥", dataname: "md_org_account_hospital", filterTxt: "apply_id is not null and md_org_account_hospital.state_code='Open'", orderby: "md_org_account_hospital.date_to"},
-							// {code: "Overdue", name: "閫炬湡", dataname: "agm_authorization", filterTxt: "", orderby: "update_time desc"},
-							{code: "Close", name: "缁堟", dataname: "md_org_account_hospital", filterTxt: "apply_id is not null and md_org_account_hospital.state_code='Closed'", orderby: "md_org_account_hospital.date_to"},
-							{code: "All", name: "鍏ㄩ儴", dataname: "md_org_account_hospital", filterTxt: "(md_org_account_hospital.state_code='Open' or md_org_account_hospital.state_code='Closed')", orderby: "md_org_account_hospital.date_to"},
+							{code: "agmAll", name: "鍚堝悓鍖婚櫌姹囨��", dataname: "md_org_account_hospital", filterTxt: "agreement_id is not null and (md_org_account_hospital.state_code='Open' or md_org_account_hospital.state_code='Closed')", orderby: "md_org_account_hospital.date_to"},
+							// {code: "Input", name: "鎺堟潈鐢宠", dataname: "md_org_account_hospital_apply", filterTxt: "(state_code='Input' or state_code='OpeningApproval')", orderby: "md_org_account_hospital_apply.date_to"},
+							// {code: "Open", name: "鐢熸晥", dataname: "md_org_account_hospital", filterTxt: "apply_id is not null and md_org_account_hospital.state_code='Open'", orderby: "md_org_account_hospital.date_to"},
+							// {code: "Close", name: "缁堟", dataname: "md_org_account_hospital", filterTxt: "apply_id is not null and md_org_account_hospital.state_code='Closed'", orderby: "md_org_account_hospital.date_to"},
+							{code: "All", name: "闈炲崗璁尰闄㈠妗�", dataname: "md_org_account_hospital", filterTxt: "apply_id is not null and (md_org_account_hospital.state_code='Open' or md_org_account_hospital.state_code='Closed')", orderby: "md_org_account_hospital.date_to"},
 						],
 						d_tabs: {
 							Input: true,

--
Gitblit v1.8.0