From 00814401bba75825126baa6675e542ea3c82a5bb Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 14 三月 2025 12:19:39 +0800
Subject: [PATCH] 日期

---
 pages/modal/5601.vue |  834 +++++++++++++++++++++--------------------------------------
 1 files changed, 301 insertions(+), 533 deletions(-)

diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index a09008a..1082962 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -43,6 +43,18 @@
 					<!-- Switch寮�叧 -->
 					<switch class="input-switch" v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
 						:disabled="item.disabled" v-model="item.value" @change="onEnterChange(item)" />
+					<OIDatePicker v-if="item.name=='DatePicker'" :class="item.disabled?'input-disabled':''"
+						:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
+						:defaultToday="item.setting.defaultToday" :format="item.setting.format"
+						@change="onModelValue(item)" />
+					<OIDatePickerRange v-if="item.name=='DatePickerRange'" :rangeSeparator="item.setting.separator"
+						:format="item.setting.format" :class="item.disabled?'input-disabled':''"
+						:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
+						@change="onModelValue(item)" />
+					<OITimePicker v-if="item.name=='TimePicker'" :class="item.disabled?'input-disabled':''"
+						:disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder"
+						@change="onModelValue(item)" />
+
 				</uni-forms-item>
 				<!-- 鏍呮牸甯冨眬 -->
 				<uni-row v-else :gutter="item.setting.gutter">
@@ -88,7 +100,19 @@
 							<!-- Switch寮�叧 -->
 							<switch v-if="col.name=='Switch'" :class="col.disabled?'input-disabled':''"
 								:disabled="col.disabled" v-model="col.value" @change="onEnterChange(col)" />
+							<OIDatePicker v-if="col.name=='DatePicker'" :class="col.disabled?'input-disabled':''"
+								:disabled="col.disabled" v-model="col.value" :placeholder="col.placeholder"
+								:defaultToday="col.setting.defaultToday" :format="col.setting.format"
+								@change="onModelValue(col)" />
+							<OIDatePickerRange v-if="col.name=='DatePickerRange'"
+								:rangeSeparator="col.setting.separator" :format="col.setting.format"
+								:class="col.disabled?'input-disabled':''" :disabled="col.disabled" v-model="col.value"
+								:placeholder="col.placeholder" @change="onModelValue(col)" />
+							<OITimePicker v-if="col.name=='TimePicker'" :class="col.disabled?'input-disabled':''"
+								:disabled="col.disabled" v-model="col.value" :placeholder="col.placeholder"
+								@change="onModelValue(col)" />
 						</uni-forms-item>
+						<uni-forms-item v-else label=""></uni-forms-item>
 					</uni-col>
 				</uni-row>
 			</view>
@@ -115,38 +139,39 @@
 										@tap="onPanelClick(ii,style.form.htmlobjId)"
 										:id="'dvpanel'+style.form.htmlobjId"
 										:class="style.form.htmlobjId==active_id?'bk-active':''">
-										<div class="dv-panel-input">
-											<div class="dv-input" v-for="(item,index) in style.form.items">
+										<uni-forms class="dv-panel-form" label-align="right">
+											<div class="dv-panel-form-item" v-for="(item,index) in style.form.items">
 												<!-- 鏅�甯冨眬 -->
-												<view v-if="item.name!='Layout'">
-													<text class="txt_title"
-														:style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
+												<uni-forms-item v-if="item.name != 'Layout'"
+													:label="item.label ?item.label +'锛�:'' "
+													:label-width="item.labelWidth+'px'">
 													<span class="form-item-span"
 														v-if="item.disabled">{{item.value}}</span>
-													<input class="uni-input" v-if="!item.disabled"
+													<input v-else class="uni-input"
 														:type="item.name=='InputNumber'?'number':'text'"
 														v-model="item.value" :disabled="item.disabled"
 														:placeholder="item.placeholder" :maxlength="-1" />
-												</view>
+												</uni-forms-item>
 												<!-- 鏍呮牸甯冨眬 -->
-												<uni-row class="demo-uni-row" v-else :gutter="item.setting.gutter">
+												<uni-row v-else :gutter="item.setting.gutter">
 													<uni-col
-														:span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
-														v-for="(cols,key) in item.setting.colList">
-														<view v-if="cols!=null">
-															<text class="txt_title"
-																:style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
+														:span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : (24 / item.setting.col)"
+														v-for="(col,key) in item.setting.colList">
+														<uni-forms-item v-if="col!=null"
+															:label="col.label ? col.label +'锛�:''"
+															:label-width="col.labelWidth+'px'">
 															<span class="form-item-span"
-																v-if="cols.disabled">{{cols.value}}</span>
-															<input class="uni-input" v-if="!cols.disabled"
-																:type="cols.name=='InputNumber'?'number':'text'"
-																v-model="cols.value" :disabled="cols.disabled"
-																:placeholder="cols.placeholder" :maxlength="-1" />
-														</view>
+																v-if="col.disabled">{{col.value}}</span>
+															<input v-else class="uni-input"
+																:type="col.name=='InputNumber'?'number':'text'"
+																v-model="col.value" :disabled="col.disabled"
+																:placeholder="col.placeholder" :maxlength="-1" />
+														</uni-forms-item>
+														<uni-forms-item v-else label=""></uni-forms-item>
 													</uni-col>
 												</uni-row>
 											</div>
-										</div>
+										</uni-forms>
 										<div class="dv-panel-button"
 											v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0">
 
@@ -163,6 +188,7 @@
 												{{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
 											</button>
 										</div>
+
 									</div>
 								</checkbox-group>
 							</view>
@@ -238,11 +264,20 @@
 		getUIStyleInfo,
 		runCustomEvent,
 	} from "@/api/data.js"
+	import dayjs from "dayjs";
+	import OIDatePicker from '@/components/oi-date-time-picker/oi-date-picker.vue'
+	import OIDatePickerRange from '@/components/oi-date-time-picker/oi-date-picker-range.vue'
+	import OITimePicker from '@/components/oi-date-time-picker/oi-time-picker.vue'
 
 	export default {
 		name: "PageModal5601",
 		modules: {
 			Base64,
+		},
+		components: {
+			OIDatePicker,
+			OIDatePickerRange,
+			OITimePicker
 		},
 		data() {
 			return {
@@ -895,6 +930,10 @@
 				}
 
 			},
+			onModelValue(item) {
+				var attr = item.fieldId;
+				this.head_styledef.form.model[attr] = item.value;
+			},
 			classAttr_extButton(item) {
 				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�@@ -933,9 +972,9 @@
 						var detail_attr = {};
 						style.form.items.forEach(item => {
 							if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-								item.setting.colList.forEach(cols => {
-									if (cols != null) detail_attr[cols
-										.fieldId] = cols.value;
+								item.setting.colList.forEach(col => {
+									if (col != null) detail_attr[col
+										.fieldId] = col.value;
 								});
 							} else
 								detail_attr[item.fieldId] = item.value;
@@ -993,9 +1032,9 @@
 						var head_attr = {};
 						this.head_styledef.form.items.forEach(item => {
 							if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-								item.setting.colList.forEach(cols => {
-									if (cols != null) head_attr[cols
-										.fieldId] = cols.value;
+								item.setting.colList.forEach(col => {
+									if (col != null) head_attr[col
+										.fieldId] = col.value;
 								});
 							} else
 								head_attr[item.fieldId] = item.value;
@@ -1091,262 +1130,96 @@
 
 								if (result.result_type == 0 && result.action) {
 									result.action.forEach(item => {
-
-										if (item.action_type ==
-											"insert_subtable_page_row"
-										) { //鐮佺洏涓�-											$this.$data.param
-												.Show_Welcom_Page =
-												false;
+										if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+											$this.$data.param.Show_Welcom_Page = false;
 											var value = item.value;
 											$this.viewAceionRow(value);
 										} else if (item.action_type ==
-											"set_subtable_page_content"
-										) { //宸茬爜鐩�-											$this.$data.param
-												.Show_Welcom_Page =
-												false;
+											"set_subtable_page_content") { //宸茬爜鐩�+											$this.$data.param.Show_Welcom_Page = false;
 											var value = item.value;
-											const pageData = $this
-												.pageDetail.find((
-													page) => {
-													return value
-														.page_name ==
-														page.Name;
-												});
-											if (value.clear_confirm !=
-												false && value.clear ==
-												true &&
-												pageData && pageData
-												.DefList.length > 0
+											const pageData = $this.pageDetail.find((page) => {
+												return value.page_name == page.Name;
+											});
+											if (value.clear_confirm != false && value.clear == true &&
+												pageData && pageData.DefList.length > 0
 											) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹� 												uni.showModal({
-													title: this
-														.translateSys(
-															'tip'
-														),
-													content: this
-														.translate(
-															"are_you_sure_clear_first"
-														) +
-														this
-														.translateSys(
-															"quotation_mark_left"
-														) +
-														value
-														.page_name +
-														this
-														.translateSys(
-															"quotation_mark_right"
-														) +
-														this
-														.translate(
-															"are_you_sure_clear_last"
-														),
-													success: function(
-														res
-													) {
-														if (res
-															.confirm
-														) {
-															if (
-																pageData)
-																pageData
-																.DefList = [];
-															$this
-																.viewAceionContent(
-																	value
-																);
-														} else if (
-															res
-															.cancel
-														) {
-															if (
-																pageData)
-																pageData
-																.DefList = [];
-															$this
-																.viewAceionContent(
-																	value
-																);
+													title: this.translateSys('tip'),
+													content: this.translate(
+															"are_you_sure_clear_first") +
+														this.translateSys(
+															"quotation_mark_left") +
+														value.page_name +
+														this.translateSys(
+															"quotation_mark_right") +
+														this.translate(
+															"are_you_sure_clear_last"),
+													cancelText: $this.translateSys('ok'),
+													confirmText: $this.translateSys('cancel'),
+													success: function(res) {
+														if (res.cancel) {
+															if (pageData)
+																pageData.DefList = [];
+															$this.viewAceionContent(value);
+														} else if (res.confirm) {
+															if (pageData)
+																pageData.DefList = [];
+															$this.viewAceionContent(value);
 														}
 													}
 												});
 											} else {
 												if (pageData)
-													pageData
-													.DefList = [];
-												$this
-													.viewAceionContent(
-														value);
+													pageData.DefList = [];
+												$this.viewAceionContent(value);
 											}
-										} else if (item.action_type ==
-											"select_subtable_page_row"
-										) {
+										} else if (item.action_type == "select_subtable_page_row") {
 											// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
 											var value = item.value;
-											const pageData = $this
-												.pageDetail.find((
-													page) => {
-													return value
-														.page_name ==
-														page.Name;
-												});
-											if (pageData?.DefList) {
-												pageData.DefList
-													.forEach(ele => {
-
-														if (ele
-															.form
-															.objId ==
-															value
-															.row.id
-														) {
-															ele.SelBut_Checked =
-																true;
-															$this
-																.active_id =
-																ele
-																.form
-																.htmlobjId;
-															//鑷姩婊氬姩鍒版寚瀹氬厓绱�-															uni.createSelectorQuery()
-																.select(
-																	"#tabpanel" +
-																	value
-																	.page_name
-																) //瀵瑰簲澶栧眰鑺傜偣
-																.boundingClientRect(
-																	(
-																		container
-																	) => {
-																		uni.createSelectorQuery()
-																			.select(
-																				"#dvpanel" +
-																				ele
-																				.form
-																				.htmlobjId
-																			) //鐩爣鑺傜偣
-																			.boundingClientRect(
-																				(
-																					target
-																				) => {
-																					uni.pageScrollTo({
-																						scrollTop: target
-																							.top -
-																							container
-																							.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�-																					});
-																				}
-																			)
-																			.exec();
-																	}
-																)
-																.exec();
-														}
-													});
-											}
+											$this.viewActionSelectRow(value)
 										} else if (item.action_type ==
-											"remove_subtable_page_row"
-										) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+											"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 											var value = item.value;
-											const pageData = $this
-												.pageDetail.find((
-													page) => {
-													return value
-														.page_name ==
-														page.Name;
-												});
-											if (pageData
-												?.DefList
-											) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�-											{
-												value.row.forEach(
-													row => {
-														pageData
-															.DefList
-															.forEach(
-																(ele,
-																	index
-																) => {
-																	if (ele
-																		.form
-																		.objId ==
-																		row
-																		.id
-																	) {
-																		pageData
-																			.DefList
-																			.splice(
-																				index,
-																				1
-																			);
-																	}
-																});
-													});
-											}
+											$this.viewActionRemoveRow(value)
+										} else if (item.action_type == "set_subtable_page_row") {
+											$this.viewActionSetRow(item.value)
 
-
-
-										} else if (item.action_type ==
-											"set_subtable_page_row") {
-											$this.viewActionSetRow(item
-												.value)
-
-										} else if (item.action_type ==
-											"set_subtable_page_ext_data"
-										) {
+										} else if (item.action_type == "set_subtable_page_ext_data") {
 											var value = item.value;
-											const pageData = $this
-												.pageDetail.find((
-													page) => {
-													return value
-														.page_name ==
-														page.Name;
-												});
+											const pageData = $this.pageDetail.find((page) => {
+												return value.page_name == page.Name;
+											});
 											if (pageData)
-												pageData.ExtData =
-												value.ext_data
+												pageData.ExtData = value.ext_data
 
-										} else if (item.action_type ==
-											"clear_subpage_rows") {
+										} else if (item.action_type == "clear_subpage_rows") {
 											var value = item.value;
-											const pageData = $this
-												.pageDetail.find((
-													page) => {
-													return value
-														.page_name ==
-														page.Name;
-												});
+											const pageData = $this.pageDetail.find((page) => {
+												return value.page_name == page.Name;
+											});
 											if (pageData) {
 												pageData.DefList = []
 												pageData.ExtData = {}
 											}
 
-										} else if (item.action_type ==
-											"set_dlg_current_edit_attr"
-										) {
+										} else if (item.action_type == "set_dlg_current_edit_attr") {
 
-											if ($this
-												.focusOldFieldId ==
-												item.value) {
+											if ($this.focusOldFieldId == item.value) {
 												$this.setData({
 													focusFieldId: ""
 												})
 											} else {
 												$this.setData({
-													focusFieldId: $this
-														.focusOldFieldId
+													focusFieldId: $this.focusOldFieldId
 												})
 											}
 											$this.$nextTick(() => {
 												$this.setData({
-													focusFieldId: item
-														.value
+													focusFieldId: item.value
 												})
 											});
-										} else if (item.action_type ==
-											"set_dlg_attr") {
+										} else if (item.action_type == "set_dlg_attr") {
 											// value = {"attr":"xxx", "value":"xxx"}
 											var data = item.value;
 											$this.setFormValues(data)
@@ -1424,6 +1297,51 @@
 				}
 			},
 
+			viewActionSelectRow(value) {
+				const pageData = this.pageDetail.find((page) => {
+					return value.page_name == page.Name;
+				});
+				if (pageData?.DefList) {
+					pageData.DefList.forEach(ele => {
+						if (ele.form.objId == value.row.id) {
+							ele.SelBut_Checked = true;
+							this.active_id = ele.form.htmlobjId;
+							//鑷姩婊氬姩鍒版寚瀹氬厓绱�+							uni.createSelectorQuery().select("#tabpanel" + value.page_name) //瀵瑰簲澶栧眰鑺傜偣
+								.boundingClientRect((container) => {
+									uni.createSelectorQuery()
+										.select("#dvpanel" + ele.form.htmlobjId) //鐩爣鑺傜偣
+										.boundingClientRect((target) => {
+											uni.pageScrollTo({
+												scrollTop: target.top - container
+													.top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�+											});
+										}).exec();
+								}).exec();
+						}
+					});
+				}
+
+			},
+
+			viewActionRemoveRow(value) {
+				if (JSON.stringify(value.row) == '{}') {
+					return;
+				}
+				const pageData = this.pageDetail.find((page) => {
+					return value.page_name == page.Name;
+				});
+				if (pageData?.DefList) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+				{
+					value.row.forEach((row) => {
+						pageData.DefList.forEach((ele, index) => {
+							if (ele.form.objId == row.id) {
+								pageData.DefList.splice(index, 1);
+							}
+						});
+					});
+				}
+			},
 			//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
 			viewActionSetRow(value) {
 				const $this = this
@@ -1815,9 +1733,9 @@
 				var head_attr = {};
 				this.$data.head_styledef.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-						item.setting.colList.forEach(cols => {
-							if (cols != null) head_attr[cols.fieldId] =
-								cols.value;
+						item.setting.colList.forEach(col => {
+							if (col != null) head_attr[col.fieldId] =
+								col.value;
 						});
 					} else
 						head_attr[item.fieldId] = item.value;
@@ -1828,9 +1746,9 @@
 				var detail_attr = {};
 				style.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-						item.setting.colList.forEach(cols => {
-							if (cols != null) detail_attr[cols
-									.fieldId] = cols
+						item.setting.colList.forEach(col => {
+							if (col != null) detail_attr[col
+									.fieldId] = col
 								.value;
 						});
 					} else
@@ -2557,11 +2475,14 @@
 				const $this = this
 				if (btn.Prompt) {
 					const sContent = btn.PromptContent || this.translate("confirm")
+
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: btn.PromptContent || this.translate("confirm"),
+						cancelText: this.translateSys('ok'),
+						confirmText: this.translateSys('cancel'),
 						success: function(res) {
-							if (res.confirm) {
+							if (res.cancel) {
 								$this.onButtonClicked(btn, pageData, -1);
 							}
 
@@ -2579,8 +2500,10 @@
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: btn.PromptContent || this.translate("confirm"),
+						cancelText: this.translateSys('ok'),
+						confirmText: this.translateSys('cancel'),
 						success: function(res) {
-							if (res.confirm) {
+							if (res.cancel) {
 								$this.onButtonClicked(btn, pageData, index);
 							}
 
@@ -2651,9 +2574,9 @@
 				const objAttr = {}
 				row.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-						item.setting.colList.forEach(cols => {
-							if (cols != null) objAttr[cols
-								.fieldId] = cols.value;
+						item.setting.colList.forEach(col => {
+							if (col != null) objAttr[col
+								.fieldId] = col.value;
 						});
 					} else
 						objAttr[item.fieldId] = item.value;
@@ -2703,9 +2626,8 @@
 				const objAttr = {}
 				row.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-						item.setting.colList.forEach(cols => {
-							if (cols != null) objAttr[cols
-								.fieldId] = cols.value;
+						item.setting.colList.forEach(col => {
+							if (col != null) objAttr[col.fieldId] = col.value;
 						});
 					} else
 						objAttr[item.fieldId] = item.value;
@@ -2782,9 +2704,9 @@
 				var head_attr = {};
 				this.$data.head_styledef.form.items.forEach(item => {
 					if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-						item.setting.colList.forEach(cols => {
-							if (cols != null) head_attr[cols.fieldId] =
-								cols.value;
+						item.setting.colList.forEach(col => {
+							if (col != null) head_attr[col.fieldId] =
+								col.value;
 						});
 					} else
 						head_attr[item.fieldId] = item.value;
@@ -2796,10 +2718,9 @@
 					var detail_attr = {};
 					style.form.items.forEach(item => {
 						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�-							item.setting.colList.forEach(cols => {
-								if (cols != null) detail_attr[
-									cols
-									.fieldId] = cols.value;
+							item.setting.colList.forEach(col => {
+								if (col != null)
+									detail_attr[col.fieldId] = col.value;
 							});
 						} else
 							detail_attr[item.fieldId] = item.value;
@@ -2958,242 +2879,100 @@
 									) { //鐮佺洏涓� 										var value = item.value;
 										//鍔犺浇宸茬粡鐮佺洏鏁版嵁
-										$this.viewAceionRow(
-											value, );
+										$this.viewAceionRow(value);
 										//娓呯┖鏉$爜鍐呭
-										$this.$data
-											.head_styledef
-											.form.items
-											.forEach((
-												item,
-												index) => {
-												if (item
-													.fieldId !=
-													"S_CNTR_CODE"
-												) {
-													item.value =
-														'';
-													item.oldvalue =
-														'';
-													$this
-														.$data
-														.head_styledef
-														.form
-														.model[
-															item
-															.fieldId
-														] =
-														'';
-												}
-											});
+										$this.$data.head_styledef.form.items.forEach((item, index) => {
+											if (item.fieldId != "S_CNTR_CODE") {
+												item.value = '';
+												item.oldvalue = '';
+												$this.$data.head_styledef.form.model[item
+													.fieldId] = '';
+											}
+										});
 
 										uni.showModal({
-											title: this
-												.translateSys(
-													"tip"
-												),
-											content: this
-												.translate(
-													'execute_event_success'
-												),
+											title: $this.translateSys("tip"),
+											content: $this.translate('execute_event_success'),
 											showCancel: false,
-											confirmText: this
-												.translateSys(
-													'close'
-												)
+											confirmText: $this.translateSys('close')
 										});
 									} else if (item.action_type ==
 										"set_subtable_page_content"
 									) { //宸茬爜鐩�-										$this.$data.param
-											.Show_Welcom_Page =
-											false;
+										$this.$data.param.Show_Welcom_Page = false;
 										var value = item.value;
-										const pageData = $this
-											.pageDetail.find((
-												page) => {
-												return value
-													.page_name ==
-													page.Name;
-											});
-										if (value.clear_confirm !=
-											false && value.clear ==
-											true &&
-											pageData && pageData
-											.DefList.length > 0
+										const pageData = $this.pageDetail.find((page) => {
+											return value.page_name == page.Name;
+										});
+										if (value.clear_confirm != false && value.clear == true &&
+											pageData && pageData.DefList.length > 0
 										) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹� 											uni.showModal({
-												title: this
-													.translateSys(
-														'tip'
-													),
-												content: this
-													.translate(
-														"are_you_sure_clear_first"
-													) +
-													this
-													.translateSys(
-														"quotation_mark_left"
-													) +
-													value
-													.page_name +
-													this
-													.translateSys(
-														"quotation_mark_right"
-													) +
-													this
-													.translate(
-														"are_you_sure_clear_last"
-													),
-												success: function(
-													res
-												) {
-													if (res
-														.confirm
-													) {
-														if (
-															pageData
-														)
-															pageData
-															.DefList = [];
-														$this
-															.viewAceionContent(
-																value
-															);
-													} else if (
-														res
-														.cancel
-													) {
-														if (
-															pageData
-														)
-															pageData
-															.DefList = [];
-														$this
-															.viewAceionContent(
-																value
-															);
+												title: $this.translateSys('tip'),
+												content: $this.translate(
+														"are_you_sure_clear_first") +
+													$this.translateSys("quotation_mark_left") +
+													value.page_name +
+													$this.translateSys(
+														"quotation_mark_right") +
+													$this.translate("are_you_sure_clear_last"),
+												cancelText: $this.translateSys('ok'),
+												confirmText: $this.translateSys('cancel'),
+												success: function(res) {
+													if (res.cancel) {
+														if (pageData)
+															pageData.DefList = [];
+														$this.viewAceionContent(value);
+													} else if (res.confirm) {
+														if (pageData)
+															pageData.DefList = [];
+														$this.viewAceionContent(value);
 													}
 												}
 											});
 										} else {
 											if (pageData)
-												pageData
-												.DefList = [];
-											$this
-												.viewAceionContent(
-													value);
+												pageData.DefList = [];
+											$this.viewAceionContent(value);
 										}
-									} else if (item
-										.action_type ==
-										"remove_subtable_page_row"
-									) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�-										var value = item.value;
-										const pageData = $this
-											.pageDetail.find((
-												page) => {
-												return value
-													.page_name ==
-													page
-													.Name;
-											});
-										if (pageData
-											?.DefList
-										) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-											//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�-											value.row.forEach(
-												row => {
-													pageData
-														.DefList
-														.forEach(
-															(
-																ele,
-																index
-															) => {
-																if (ele
-																	.form
-																	.objId ==
-																	row
-																	.id
-																) {
-																	pageData
-																		.DefList
-																		.splice(
-																			index,
-																			1
-																		);
-																}
-															}
-														);
-												});
-										}
-									} else if (item
-										.action_type ==
-										"set_subtable_page_row"
-									) {
-										$this.viewActionSetRow(
-											item
-											.value)
-
-									} else if (item
-										.action_type ==
-										"set_subtable_page_ext_data"
-									) {
-										var value = item.value;
-										const pageData = $this
-											.pageDetail.find((
-												page) => {
-												return value
-													.page_name ==
-													page
-													.Name;
-											});
+									} else if (item.action_type ==
+										"remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+										let value = item.value;
+										$this.viewActionRemoveRow(value)
+									} else if (item.action_type == "set_subtable_page_row") {
+										$this.viewActionSetRow(item.value)
+									} else if (item.action_type == "set_subtable_page_ext_data") {
+										let value = item.value;
+										const pageData = $this.pageDetail.find((page) => {
+											return value.page_name == page.Name;
+										});
 										if (pageData) {
-											pageData.ExtData =
-												value
-												.ext_data
+											pageData.ExtData = value.ext_data
 										}
 
-									} else if (item
-										.action_type ==
-										"clear_subpage_rows") {
+									} else if (item.action_type == "clear_subpage_rows") {
 										var value = item.value;
-										const pageData = $this
-											.pageDetail.find((
-												page) => {
-												return value
-													.page_name ==
-													page
-													.Name;
-											});
+										const pageData = $this.pageDetail.find((page) => {
+											return value.page_name == page.Name;
+										});
 										if (pageData) {
-											pageData
-												.DefList = []
-											pageData
-												.ExtData = {}
+											pageData.DefList = []
+											pageData.ExtData = {}
 										}
-									} else if (item
-										.action_type ==
-										"set_dlg_current_edit_attr"
-									) {
-										if ($this
-											.focusOldFieldId ==
-											item.value)
+									} else if (item.action_type == "set_dlg_current_edit_attr") {
+										if ($this.focusOldFieldId == item.value)
 											$this.setData({
 												focusFieldId: ""
 											})
 										else {
 											$this.setData({
-												focusFieldId: $this
-													.focusOldFieldId
+												focusFieldId: $this.focusOldFieldId
 											})
 										}
 										$this.$nextTick(() => {
-											$this
-												.setData({
-													focusFieldId: item
-														.value
-												})
+											$this.setData({
+												focusFieldId: item.value
+											})
 										});
 									} else if (item.action_type ==
 										"set_dlg_attr") {
@@ -3204,12 +2983,8 @@
 
 								});
 							} else {
-								if ($this.$data.After_OK_Event.ID !=
-									event
-									.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
-
-									$this.sava(pageParam, $this.$data
-										.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+								if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+									$this.sava(pageParam, $this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠� 
 								}
 							}
@@ -3217,12 +2992,10 @@
 
 							if (result.info) {
 								uni.showModal({
-									title: this.translateSys(
-										"tip"),
+									title: this.translateSys("tip"),
 									content: result.info,
 									showCancel: false,
-									confirmText: this
-										.translateSys('close')
+									confirmText: this.translateSys('close')
 								});
 							}
 						}
@@ -3234,11 +3007,8 @@
 					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
-						content: this.translate(
-								"execute_after_ok_event_failed") +
-							this.translateSys(
-								"comma") +
-							tip,
+						content: this.translate("execute_after_ok_event_failed") +
+							this.translateSys("comma") + tip,
 						showCancel: false,
 						confirmText: this.translateSys('close')
 					});
@@ -3309,7 +3079,7 @@
 				}
 
 				.uni-icon {
-					padding: 8rpx;
+					padding: 10rpx 5rpx;
 					font-size: 32rpx;
 					color: rgb(192, 196, 204);
 				}
@@ -3366,8 +3136,6 @@
 				background-color: #ddd !important;
 				color: #888 !important;
 			}
-
-
 
 			.btn-left {
 				padding: 20rpx;
@@ -3439,7 +3207,7 @@
 
 		.uni-icon {
 			/* border: 1px solid red; */
-			width: 8%;
+			width: 30rpx;
 			font-family: uniicons;
 			font-size: 40rpx;
 			font-weight: 400;
@@ -3455,46 +3223,55 @@
 
 		.dv-panel {
 			background-color: #efefef;
-			padding: 20rpx 20rpx 10rpx 0px;
+			padding: 10rpx 10rpx 10rpx 0px;
 			border-radius: 12rpx;
 			margin: 10rpx 0 20rpx 0;
-			text-align: right;
 
-			.txt_title {
-				font-size: 28rpx;
-				text-align: right;
-				display: inline-block;
-			}
+			.dv-panel-form {
+				padding: 0px;
+				margin: 0;
 
-			input {
-				vertical-align: middle;
-				display: inline-block;
-				border: 1px solid #d5d5d5;
-				width: 68%;
-				height: 48rpx;
-				line-height: 28rpx;
-				background: #FFF;
-				border-radius: 7px !important;
-				color: #2d8cf0;
-				padding: 6rpx 8rpx 8rpx;
-				font-size: 28rpx;
-				font-family: inherit;
-				box-shadow: none !important;
-				transition-duration: 0.1s;
-				margin-top: 0rpx;
-			}
+				.dv-panel-form-item {
+					margin: 0;
+					padding: 0px;
+				}
 
-			input::-webkit-input-placeholder {
-				font-size: 10rpx;
-			}
+				.uni-forms-item {
+					padding-bottom: 5rpx;
+					margin-bottom: 0;
 
-			.form-item-span {
-				vertical-align: text-top;
-				color: #2d8cf0;
-				white-space: normal;
-				word-break: break-all;
-				display: inline-block;
-				width: calc(100% - 100px);
+					.uni-forms-item__label {
+						height: 20px !important;
+						padding: 0 10rpx 0 0 !important;
+					}
+
+					.uni-input {
+						width: calc(100% - 12rpx);
+						padding: 5rpx;
+						border: 1px solid #d5d5d5;
+						color: #2d8cf0;
+						height: 20px;
+						background: #FFF;
+						line-height: 20px;
+						border-radius: 6px !important;
+						font-size: 14px;
+						font-family: inherit;
+						box-shadow: none !important;
+						transition-duration: 0.1s;
+						vertical-align: middle;
+					}
+
+					.form-item-span {
+						vertical-align: text-top;
+						color: #2d8cf0;
+						white-space: normal;
+						word-break: break-all;
+						width: 100%;
+					}
+				}
+
+
+
 			}
 
 			.dv-panel-button {
@@ -3522,15 +3299,6 @@
 
 		}
 
-		.dv-panel-input {
-			width: 100%;
-			display: inline-block;
-			text-align: left;
-
-			.dv-input {
-				margin-bottom: 2rpx;
-			}
-		}
 
 		.logo {
 			height: 100rpx;
@@ -3675,7 +3443,7 @@
 		.popup-footer {
 			float: right;
 			position: absolute;
-			bottom:10rpx;
+			bottom: 10rpx;
 			right: 20rpx;
 		}
 

--
Gitblit v1.9.1