From c55a2113b5825a6545f09229261f7cbb43f9ab18 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期四, 15 八月 2024 15:09:02 +0800
Subject: [PATCH] 调整

---
 module/md/page/terminal/page/popup/popup_hospital_log.html |  492 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 module/approval/page/my_approval_list.html                 |    2 
 login.html                                                 |    2 
 forgot.html                                                |    6 
 4 files changed, 497 insertions(+), 5 deletions(-)

diff --git a/forgot.html b/forgot.html
index 93eac19..1cbb388 100644
--- a/forgot.html
+++ b/forgot.html
@@ -6,7 +6,7 @@
 	<meta http-equiv="Pragma" content="no-cache">
 	<meta http-equiv="Cache-control" content="no-cache">
 	<meta http-equiv="Cache" content="no-cache">
-	<title>缁堢鎺ㄥ箍骞冲彴</title>
+	<title>钀ラ攢涓�浣撳寲杩愯惀骞冲彴</title>
 	<link href="./forgot.css?v=2024062302" rel="stylesheet">
 	<link href="./img/org/head.png" rel="shortcut icon" type="image/x-icon">
 	
@@ -43,9 +43,9 @@
 				<div style="margin-left: 4%;">
 					<img class="header-logo" src="./img/org/gp_logo.png" height="60">
 					<div class="header-label" >
-						<label class="header-label-cn">缁堢鎺ㄥ箍骞冲彴 {{servertype}}</label>
+						<label class="header-label-cn">钀ラ攢涓�浣撳寲杩愯惀骞冲彴 {{servertype}}</label>
 						<br/>
-						<label class="header-label-en">TerminalPromotionPlatform</label>
+						<label class="header-label-en">MarketingIntegratedOperationPlatform</label>
 						<br/>
 						<br/>
 						<div style="height: 1px; overflow: hidden;">&nbsp;</div>
diff --git a/login.html b/login.html
index 7bb7200..2e29a08 100644
--- a/login.html
+++ b/login.html
@@ -6,7 +6,7 @@
 	<meta http-equiv="Pragma" content="no-cache">
 	<meta http-equiv="Cache-control" content="no-cache">
 	<meta http-equiv="Cache" content="no-cache">
-	<title>缁堢鎺ㄥ箍骞冲彴</title>
+	<title>钀ラ攢涓�浣撳寲杩愯惀骞冲彴</title>
 	<link href="./login.css?v=2024073101" rel="stylesheet">
 	<link href="./css/picture.css" rel="stylesheet">
 	<link href="./img/org/head.png" rel="shortcut icon" type="image/x-icon">
diff --git a/module/approval/page/my_approval_list.html b/module/approval/page/my_approval_list.html
index 5ba9ab4..ea75866 100644
--- a/module/approval/page/my_approval_list.html
+++ b/module/approval/page/my_approval_list.html
@@ -625,7 +625,7 @@
 								height: "520px",
 								icon: "icon-product",
 								text: me.selectednode.name + (me.selectednode.textfield ? ("-" + row[me.selectednode.textfield]) : ""),
-								id: me.selectednode.id + row.id,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
+								id: me.selectednode.id + row.id + sceneCode,//totab: true鏃堕渶璁剧疆锛岀敤浜庡垽鏂槸鍚﹀凡鎵撳紑姝ら〉闈�
 								url: me.selectednode.pageurl,
 								data: row,
 								delta: me.selectednode,
diff --git a/module/md/page/terminal/page/popup/popup_hospital_log.html b/module/md/page/terminal/page/popup/popup_hospital_log.html
new file mode 100644
index 0000000..2b0722c
--- /dev/null
+++ b/module/md/page/terminal/page/popup/popup_hospital_log.html
@@ -0,0 +1,492 @@
+
+<!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: "md_hospital",
+						title: "缁堢鏇存敼淇℃伅",
+						newformData: {},
+						formAttr: {
+							istitle: false,
+							title: "琛ㄥ崟鍚嶇О",
+							columnnumber: 3,
+							labelwidth: "120px",
+							labelposition: "left",//"left",// right//top
+							size: "mini",
+							border: "10px solid #c6c6c600"
+						},
+						dataRequest: [
+							{
+								name: "md_geo_province",
+								dataname: "md_geo_province",
+								isnotoption: false, //true:涓嶆槸閫夐」
+								code:"id",//鏄笅鎷夐�夐」鏃惰缃�
+								label:"name",//鏄笅鎷夐�夐」鏃惰缃�
+								filter: "",
+								orderby: "name"
+							},
+							{
+								name: "md_geo_city",
+								dataname: "md_geo_city",
+								isnotoption: false, //true:涓嶆槸閫夐」
+								code:"id",//鏄笅鎷夐�夐」鏃惰缃�
+								label:"name",//鏄笅鎷夐�夐」鏃惰缃�
+								filter: "",
+								orderby: "name"
+							},
+							{
+								name: "md_geo_county",
+								dataname: "md_geo_county",
+								isnotoption: false, //true:涓嶆槸閫夐」
+								code:"id",//鏄笅鎷夐�夐」鏃惰缃�
+								label:"name",//鏄笅鎷夐�夐」鏃惰缃�
+								filter: "",
+								orderby: "name"
+							},
+						],
+						options_md_geo_province: [],
+						md_geo_city_obj: {},
+						md_geo_county_obj:{},
+						formFields: [],
+						
+						formData: {},
+						
+						//鎸夐敭鏉冮檺璁剧疆
+						isedit: false,//鎻愪氦鍓嶇紪杈戯紝淇濆瓨/鎻愪氦
+						isrefuseedit: false,//鎷掔粷鍚庣紪杈戯紝淇濆瓨/鍐嶆鎻愪氦
+						isapproval: false,//瀹℃壒锛屽悓鎰�/鎷掔粷/杞姙/閫�鍥�
+						
+						iscommit: false,//鎻愪氦鏍囪
+						
+						//寮圭獥鍙傛暟
+						popupParames: {},
+						//瀛楁璁剧疆
+						tablefieldClick: {},
+						formfieldClick: {},
+						dheight: null
+					},
+					created() {
+						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") {//鏂板
+								
+								//鍔ㄦ�佽幏鍙栭粯璁ゆ暟鎹�
+								var newEntity_ = {
+									name: "newEntity",
+									url: "root/data/newEntity",
+									paramsobj: {dataname: this.dataname},
+									isnotoption: true, //true:涓嶆槸閫夐」
+								}
+								this.dataRequest.push(newEntity_);
+								this.isedit = true;
+							}
+							else if (this.popupParames.sceneCode == "browse") {//鍙
+								this.formAttr.disabled = true;
+							}
+							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;
+						var title_h = 0;
+						if (me.popupParames.totab){
+							title_h = 42;
+						}
+						me.dheight = document.documentElement.clientHeight - 50 - title_h;
+						
+						//棰勫姞杞芥暟鎹�
+						if (this.dataRequest && this.dataRequest.length) {
+							var result = {};
+							this.loadRequestData(this.dataRequest, result, function(data) {
+								me.dataRequestObj = data;
+								//棰勫姞杞芥暟鎹悗缁欏摢浜涘瓧娈佃缃畂ptions鎴杅ormatterjson
+								if (me.dataRequestObj.md_geo_province) {
+									me.options_md_geo_province = me.dataRequestObj.md_geo_province
+								}
+								if (me.dataRequestObj.md_geo_city) {
+									var md_geo_city_obj_ = {};
+									var	options_md_geo_city_ = [] 
+									var options_md_geo_city_ = clone(me.dataRequestObj.md_geo_city)
+									options_md_geo_city_.map(o=>{
+										if (!md_geo_city_obj_[o.province]) {
+											md_geo_city_obj_[o.province] = []
+										}
+										md_geo_city_obj_[o.province].push(o)
+									})
+									me.md_geo_city_obj = clone(md_geo_city_obj_)
+								}
+								if (me.dataRequestObj.md_geo_county) {
+									var md_geo_county_obj_ = {};
+									var	options_md_geo_county_ = [] 
+									var options_md_geo_county_ = clone(me.dataRequestObj.md_geo_county)
+									options_md_geo_county_.map(o=>{
+										if (!md_geo_county_obj_[o.city]) {
+											md_geo_county_obj_[o.city] = []
+										}
+										md_geo_county_obj_[o.city].push(o)
+									})
+									me.md_geo_county_obj = clone(md_geo_county_obj_)
+								}
+								if (me.dataRequestObj.newEntity) {
+									var formData = clone(me.dataRequestObj.newEntity.data[me.dataname]);
+									// formData.product_category_name = [];
+									if (me.newformData) {
+										let formData_ = clone(formData);
+										
+										for (var k in me.newformData) {
+											if (!formData_[k]) {
+												formData_[k] = me.newformData[k];
+											}
+										}
+								
+										me.formData = formData_;
+									}
+								}
+								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;
+							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 formFields_ = [];
+									
+									metas.map(f=>{
+										f.isshow = "T";
+										if (f.field == "province") {
+											f.options = me.options_md_geo_province;
+										}
+										if (f.field == "code") {
+											f.disabled = true
+										}
+										if (f.field == "is_active") {
+											f.optionsgroup = "truefalse"
+										}
+										formFields_.push(clone(f));
+									})
+									if (!me.formFields || (me.formFields && me.formFields.length == 0)) {
+										me.formFields = clone(formFields_);
+										
+										//瀛楁鏁扮粍杞瓧娈祇bj锛岀洰鐨勪负浜嗙瓫閫夋椂鑾峰彇瀛楁灞炴��
+										me.fieldsToFieldsObj();
+										
+										//璁剧疆瀛楁浜嬩欢
+										me.tableFieldClick();
+									}
+									me.formData = getDataByFields(me.formData, me.formFields);
+									
+									if (me.rowData[me.dataname]) {
+										me.formData = clone(me.rowData[me.dataname]);
+									}
+								}
+							})
+						},
+						
+						tableFieldClick() {
+							var me = this;
+							//琛ㄦ牸瀛楁浜嬩欢璁剧疆
+							this.tablefieldClick = {};
+						
+							//琛ㄥ崟瀛楁浜嬩欢璁剧疆
+							this.formfieldClick = {
+								province: {//瀛楁浜嬩欢璁剧疆
+									select: {
+										onchange: function(obj, refreshCallback) {//涓嬫媺灞曞紑浜嬩欢
+											obj.data.province = obj.selectoption.value || "";
+                                            obj.data.city = "";
+                                            obj.data.county = "";
+											refreshCallback();
+											// me.$set(me.tabsobj.DDWL, "formData",  me.tabsobj.DDWL.formData);
+											// var formData_ = clone(me.tabsobj.DDWL.formData);
+                                            // me.tabsobj.DDWL.formData = formData_;
+										},
+									},
+								},
+								city: {//瀛楁浜嬩欢璁剧疆
+									visible: {
+										onchange: function(obj,row,callback) {//涓嬫媺灞曞紑浜嬩欢
+											if (me.formData.province) {
+												var formFields_ = clone(me.formFields);
+												formFields_.map(f=>{
+													if (f.field == "city") {
+														if (me.md_geo_city_obj[me.formData.province] && me.md_geo_city_obj[me.formData.province].length) {
+															f.options = clone(me.md_geo_city_obj[me.formData.province])
+														}	
+													}
+												})
+											}
+											me.formFields = clone(formFields_);
+										}
+									},
+									select: {
+                                        onchange: function(obj,refreshCallback) {//涓嬫媺灞曞紑浜嬩欢
+											obj.data.city = obj.selectoption.value || "";
+                                            obj.data.county = "";
+											refreshCallback()
+                                        },
+                                    },
+								},
+								county: {
+                                    visible: {
+                                        onchange: function(fieldObj, row, callback) {//涓嬫媺灞曞紑浜嬩欢
+                                            let param_p = {
+                                                dataname: "md_geo_city",
+                                                filter: "name='" + row.city + "'",
+                                            }
+                                            Server.call("root/data/getEntitySet", param_p, function(resultp) {
+                                                if (resultp && resultp.data) {
+                                                    let param_ = {
+                                                        dataname: "md_geo_county",
+                                                        filter:"city_id='" + resultp.data.entityset[0].id + "'",
+                                                    }
+                                                    Server.call("root/data/getEntitySet", param_, function(result) {
+                                                        if (result && result.data) {
+                                                            var options_ = result.data.entityset;
+                                                            for(var i=0; i<options_.length;i++) {
+                                                                options_[i].code = options_[i].name;
+                                                                options_[i].value = options_[i].name;
+                                                            }
+															var formFields_ = clone(me.formFields);
+															formFields_.map(f=>{
+																if (f.field == "county") {
+																	f.options = options_;
+																}
+															})
+															me.formFields = clone(formFields_);
+                                                            //閲嶆柊璁剧疆閫夋嫨椤�
+                                                            // if (callback) {
+                                                            //     var obj_ = {
+                                                            //         options: options_
+                                                            //     };
+                                                            //     callback(obj_);
+                                                            // }
+                                                        }
+                                                    });
+                                                }
+                                            });
+                                        },
+                                    },
+									select: {
+										onchange: function(obj,refreshCallback) {//涓嬫媺灞曞紑浜嬩欢
+											obj.data.county = obj.selectoption.value
+											refreshCallback()
+										}
+									}
+                                },		
+							}
+						},
+						
+						//鎻愪氦
+						submitRowTable() {
+							//蹇呭~椤规牎楠�
+							var bo1 = this.$refs.form1.checkForm();
+							if(!bo1){
+								Root.message({
+									type: 'error',
+									message: '璇峰~鍐欏繀濉」'
+								}); 
+								return;
+							} 
+							this.iscommit = true;
+							this.saveRowTable();
+						},
+						
+						//淇濆瓨
+						saveRowTable() {
+							var me = this;
+							var bo1 = this.$refs.form1.checkForm();
+							if(!bo1){
+								Root.message({
+									type: 'error',
+									message: '璇峰~鍐欏繀濉」'
+								}); 
+								return;
+							} 
+							
+							var operator_ = "saveEntity";//淇濆瓨
+						
+							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];
+								// }
+							}
+							// if(me.iscommit) {
+							// 	// operator_ = "commit";//鎻愪氦
+							// 	entity.state_code = "Open"
+							// 	entity.state_name = "鐢熸晥"
+							// }
+							let param = {
+								dataname: this.dataname,
+								data: {},
+							}
+							param.data[this.dataname] = entity;
+							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();
+									}
+								}
+							});
+						},
+						
+					}
+				});
+			};
+			
+			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 v-if="popupParames.totab" 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 style="position: absolute; top:40px; bottom: 50px; left: 0px; right: 0px;  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>
+					</div>
+					<div class="el-dialog__footer" style="position: absolute; bottom: 0px;  left: 0px; right: 0px;">
+						<el-button size="small" type="default" @click="closeDialog">鍙� 娑�</el-button>
+						<el-button size="small" v-if="isedit || isrefuseedit" type="primary" :loading="loading_save" @click="saveRowTable":icon="buttonsconfig.save.icon">{{buttonsconfig.save.name}}</el-button>
+						<!-- <el-button size="small" v-if="isedit" type="success" :loading="loading_submit" @click="submitRowTable":icon="buttonsconfig.submit.icon">{{buttonsconfig.submit.name}}</el-button> -->
+						<el-button size="small" v-if="isrefuseedit" type="success" @click="">鍐嶆鎻愪氦</el-button>
+						
+						<el-button size="small" v-if="isapproval" type="success" @click="">閫� 杩�</el-button>
+						<el-button size="small" v-if="isapproval" type="danger" @click="">鎷� 缁�</el-button>
+						<el-button size="small" v-if="isapproval" type="primary" @click="">杞� 鍔�</el-button>
+						<el-button size="small" v-if="isapproval" type="success" @click="">閫� 鍥�</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>
+	<!-- Code injected by live-server -->
+</body>
+</html>

--
Gitblit v1.8.0