From d8872903e30f0a53abefcd279ae03258341e931f Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 20 三月 2025 09:10:31 +0800
Subject: [PATCH] test

---
 pages/modal/3018_2.vue |  484 +++++++++++++++++------------------------------------
 1 files changed, 157 insertions(+), 327 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index f4f46f6..a6080af 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -2,135 +2,10 @@
 	<view class="uni-page-modal-3018-2">
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<uni-forms ref="baseForm" label-align="right">
-				<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
-					<!-- 鏅�甯冨眬 -->
-					<uni-forms-item v-if="item.name != 'Layout'&& item.show==true"
-						:label="item.label ? item.label +'锛�:'' " :label-width="item.labelWidth+'px'">
-						<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> -->
-						<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-						<uni-data-select id="dv_select" v-if="item.name=='Select'"
-							:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
-							:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
-							@change="onChange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
-						<!-- 鏂囨湰妗�鏁板瓧妗�-->
-						<view class="input-wrapper" v-if="(item.name=='Input' || item.name=='InputNumber')">
-							<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
-								@click="classAttr_extButton(item)">&#xe568;</text>
-							<input class="uni-input" :class="item.disabled?'input-disabled':''"
-								:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
-								v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder"
-								:style="{'padding-left':item.setting.prefix?0 : '8rpx','right':item.setting.suffix?0 : '8rpx'}"
-								:focus="focusFieldId == item.fieldId" @focus="ontap(item)" @click="onClick(item)"
-								@keyup.enter="onModelValue(item)" @blur="onModelValue(item)" :maxlength="-1" />
-							<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
-								@click="classAttr_extButton(item)">&#xe568;</text>
-						</view>
-						<!-- 澶氳鏂囨湰 -->
-						<view class="input-wrapper" v-if="item.name=='Textarea' ">
-							<textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
-								:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
-								@blur="onModelValue(item)" @click="onClick(item)" :data-index="index"
-								style="height:60px;" :style="{'width':'96%'}" :disabled="item.disabled"></textarea>
+			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
+				@click="onClick" @focus="ontap" @change="onEnterChange" @click-prefix="classAttr_extButton"
+				@click-suffix="classAttr_extButton"></OIForm>
 
-						</view>
-						<!-- 澶嶉�妗�-->
-						<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
-							:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
-							@change="onCheckBoxValue" :data-attr="item.fieldId">
-							<label v-for="(item2) in item.selections" :key="item2.value">
-								<checkbox :value="item2.value" :checked="item.value.includes(item2.value)" />
-								<text>{{item2.label}}</text>
-							</label>
-						</checkbox-group>
-						<!-- 鍗曢�妗�-->
-						<radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
-							:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
-							@change="onRadioBoxValue" :data-attr="item.fieldId">
-							<label v-for="(item2) in item.selections" :key="item2.value">
-								<radio :value="item2.value" :checked="item2.value === item.value" />
-								<text>{{item2.label}}</text>
-							</label>
-						</radio-group>
-						<!-- Switch寮�叧 -->
-						<switch class="input-switch" v-if="item.name=='Switch'"
-							:class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value"
-							@change="onModelValue(item)" />
-						<!-- 鏃ユ湡鏃堕棿 -->
-						<view class="input-wrapper" v-if="(item.name=='TimePicker' || item.name=='DatePicker')">
-							<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
-								:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
-								<view class="picker">{{item.value}}</view>
-							</picker>
-						</view>
-					</uni-forms-item>
-					<!-- 鏍呮牸甯冨眬 -->
-					<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
-						<uni-col v-for="(cols,key) in item.setting.colList"
-							:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
-							<uni-forms-item v-if="cols!=null  && cols.show==true"
-								:label="cols.label? cols.label +'锛�:''" :label-width="cols.labelWidth+'px'">
-								<view class="input-wrapper" v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
-									<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
-										@click="classAttr_extButton(cols)">&#xe568;</text>
-									<input class="uni-input" :class="cols.disabled?'input-disabled':''"
-										:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
-										v-model="cols.value" :disabled="cols.disabled" :placeholder="cols.placeholder"
-										:style="{'padding-left':cols.setting.prefix?0 : '8px','right':cols.setting.suffix?0 : '8px'}"
-										:focus="focusFieldId == cols.fieldId" @focus="ontap(cols)"
-										@click="onClick(cols)" @blur="onevent(cols)" :maxlength="-1" />
-									<text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]"
-										@click="classAttr_extButton(cols)">&#xe568;</text>
-								</view>
-								<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
-								<uni-data-select id="dv_select" v-if="cols.name=='Select' "
-									:class="cols.disabled?'input-disabled':''" v-model="cols.value"
-									:localdata="cols.dict" @change="onChange(cols)" :disabled="cols.disabled"
-									:clear="false"></uni-data-select>
-								<!-- 澶氳鏂囨湰 -->
-								<view class="input-wrapper" v-if="cols.name=='Textarea' ">
-									<textarea class="uni-input" :value="cols.value"
-										:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
-										:focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)"
-										@click="onClick(cols)" style="height:60px;" :style="{'width':'96%'}"
-										:disabled="cols.disabled"></textarea>
-								</view>
-								<!-- 澶嶉�妗�-->
-								<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
-									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
-									@change="onCheckBoxValue" :data-attr="cols.fieldId">
-									<label v-for="(cols2) in cols.selections" :key="cols2.value">
-										<checkbox :value="cols2.value" :checked="cols.value.includes(cols2.value)" />
-										<text>{{cols2.label}}</text>
-									</label>
-								</checkbox-group>
-								<!-- 鍗曢�妗�-->
-								<radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
-									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
-									@change="onRadioBoxValue" :data-attr="cols.fieldId">
-									<label v-for="(cols2) in cols.selections" :key="cols2.value">
-										<radio :value="cols2.value" :checked="cols2.value === cols.value" />
-										<text>{{cols2.label}}</text>
-									</label>
-								</radio-group>
-								<!-- Switch寮�叧 -->
-								<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
-									:disabled="cols.disabled" v-model="cols.value" @change="onModelValue(cols)"
-									:style="{'margin-left':'10rpx'}" />
-								<!-- 鏃ユ湡鏃堕棿 -->
-								<view class="input-wrapper"
-									v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled">
-									<picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''"
-										:disabled="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
-										<view class="picker">{{cols.value}}</view>
-									</picker>
-								</view>
-
-							</uni-forms-item>
-						</uni-col>
-					</uni-row>
-				</view>
-			</uni-forms>
 		</view>
 		<view class="view-bottom">
 			<view class="uni-padding-wrap" v-if="dropdownBtns.length>0">
@@ -152,7 +27,8 @@
 				<view class="popup-header">{{check_list.title}}</view>
 				<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
 					:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
-					<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
+					<view class="popup-cont"
+						:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
 						<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
 							<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
 								:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -177,6 +53,8 @@
 <script>
 	import Base64 from '../../components/js-base64/base64.js'
 	import utils from "@/js/utils.js"
+	import dayjs from "dayjs";
+	import OIForm from '@/components/oi-form/index.vue'
 	import {
 		appGetInfo,
 		dictGetInfo
@@ -190,6 +68,9 @@
 	export default {
 		modules: {
 			Base64,
+		},
+		components: {
+			OIForm,
 		},
 		data() {
 			return {
@@ -393,8 +274,7 @@
 										//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
 										let itemName = ele.value || "";
 										if (itemName) {
-											styledefHead.form
-												.model[ele.fieldId] = itemName;
+											styledefHead.form.model[ele.fieldId] = itemName;
 										}
 										ele.dict = selections.map((a) => {
 											return {
@@ -402,9 +282,7 @@
 												text: a.label
 											}
 										})
-
 									}
-
 								}
 								if ($this.focusFieldId == "") {
 									if (ele.name == 'Input' || ele.name ==
@@ -440,10 +318,7 @@
 														text: a.label
 													}
 												})
-
-
 											}
-
 										}
 										if ($this.focusFieldId == "") {
 											if (col.name == 'Input' || col
@@ -487,7 +362,7 @@
 						title: this.translateSys("error") + "1.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -527,7 +402,7 @@
 						title: this.translateSys("error") + "1.3",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 
 
@@ -559,14 +434,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -578,7 +453,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 
 						var actionlist = data.action;
@@ -629,7 +504,7 @@
 												"quotation_mark_right") + this
 											.translate('tip_action_unprocessed'),
 										showCancel: false,
-										confirmText: this.translateSys("cancel")
+										confirmText: this.translateSys('close')
 									});
 								}
 							}
@@ -647,7 +522,7 @@
 							this.translateSys("full_stop") +
 							this.translate('reason') + this.translateSys("colon") + tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -703,11 +578,15 @@
 			onScanValue(item, value) {
 				const $this = this;
 				//console.log("onScanValue", item);
-				if (item.oldvalue != value) {
-					item.oldvalue = value;
-					item.value = value;
+				item.value = value
+				let newVal = item.value 
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+				}
+				if (newVal) {
+					item.oldvalue = newVal;
 					var attr = item.fieldId;
-					$this.head_styledef.form.model[attr] = value;
+					$this.head_styledef.form.model[attr] = newVal;
 					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠� 					if (eventid) {
 						var obj_attr = this.head_styledef.form.model;
@@ -731,63 +610,60 @@
 						}
 						this.DataObjRunCustomEvent(info, '');
 					}
-					if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�-						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
-						var findd = false
-						for (let i in $this.head_styledef.form.items) {
-							const ele = $this.head_styledef.form.items[i]
+					//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
+					var findd = false
+					for (let i in $this.head_styledef.form.items) {
+						const ele = $this.head_styledef.form.items[i]
 
-							if (ele.name != "Layout") {
-								if (ele.name == 'Input' || ele.name == 'InputNumber') {
-									if (attr == ele.fieldId) {
-										findd = true
-									} else {
-										if (findd) {
-											$this.setData({
-												focusFieldId: ele.fieldId
-											})
-											break
-										}
-
-									}
-
-								}
-							} else {
-								if (findd) {
-									let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-										return (col.name == 'Input' || col.name == 'InputNumber');
-									})
-									if (curIndex > -1) {
+						if (ele.name != "Layout") {
+							if (ele.name == 'Input' || ele.name == 'InputNumber') {
+								if (attr == ele.fieldId) {
+									findd = true
+								} else {
+									if (findd) {
 										$this.setData({
-											focusFieldId: ele.setting.colList[curIndex]
-												.fieldId
+											focusFieldId: ele.fieldId
 										})
 										break
 									}
 
-								} else {
-									let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-										return attr == col.fieldId;
-									})
-									if (curIndex > -1) {
-										findd = true
-										let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
-											return (col.name == 'Input' || col.name ==
-													'InputNumber') &&
-												index2 >
-												curIndex;
-										})
-										if (curIndex2 > -1) {
-											$this.setData({
-												focusFieldId: ele.setting.colList[curIndex]
-													.fieldId
-											})
-											break
-										}
-									}
 								}
 
 							}
+						} else {
+							if (findd) {
+								let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
+									return (col.name == 'Input' || col.name == 'InputNumber');
+								})
+								if (curIndex > -1) {
+									$this.setData({
+										focusFieldId: ele.setting.colList[curIndex]
+											.fieldId
+									})
+									break
+								}
+
+							} else {
+								let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
+									return attr == col.fieldId;
+								})
+								if (curIndex > -1) {
+									findd = true
+									let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
+										return (col.name == 'Input' || col.name ==
+												'InputNumber') &&
+											index2 >
+											curIndex;
+									})
+									if (curIndex2 > -1) {
+										$this.setData({
+											focusFieldId: ele.setting.colList[curIndex].fieldId
+										})
+										break
+									}
+								}
+							}
+
 						}
 					}
 
@@ -797,95 +673,53 @@
 				// console.log("onClick",item);
 				this.focusFieldId = item.fieldId
 			},
-			onevent(item) {
-				// console.log("onevent",item);
-				if (item.oldvalue != item.value && item.value.trim() != "") {
-					item.oldvalue = item.value;
-					var attr = item.fieldId;
-					this.head_styledef.form.model[attr] = item.value;
-					//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�-					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠�-					if (eventid) {
-						var obj_attr = this.head_styledef.form.model;
-						// console.log(obj_attr);
-						var req = Object.keys(obj_attr).map((a) => ({
-							attr: a,
-							value: obj_attr[a] || "",
-						}));
-						var info = {
-							eventid: eventid,
-							edtype: "0",
-							projectid: '',
-							rclsid: '',
-							robjid: '',
-							userlogin: '',
-							clsid: this.$data.param.DataCls.id,
-							objid: "",
-							attr: req,
-							dataJson: [],
-						}
-						this.DataObjRunCustomEvent(info, "");
-					}
+			onEnterChange(item) {
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+					if (!newVal)
+						return
 				}
-
-			},
-			onChange(item) {
-				console.log("onChange", item);
-				if (item.oldvalue != item.value && item.value.trim() != "") {
-					item.oldvalue = item.value;
+				if (item.oldvalue != newVal) {
+					item.oldvalue = newVal;
 					var attr = item.fieldId;
-					this.head_styledef.form.model[attr] = item.value;
-					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠�-					if (eventid) {
-						// self.event_no_sub = 1;
-						var obj_attr = this.head_styledef.form.model;
-						// console.log(obj_attr);
-						var req = Object.keys(obj_attr).map((a) => ({
-							attr: a,
-							value: obj_attr[a] || "",
-						}));
-						var info = {
-							eventid: eventid,
-							edtype: "0",
-							projectid: '',
-							rclsid: '',
-							robjid: '',
-							userlogin: '',
-							clsid: this.$data.param.DataCls.id,
-							objid: "",
-							attr: req,
-							dataJson: []
-						}
-						this.DataObjRunCustomEvent(info);
-					}
-				}
-
-			},
-			onModelValue(item) { //缁戝畾Model鍊�-				var attr = item.fieldId;
-				if (item.oldvalue != item.value && item.value.trim() != "") {
-					item.oldvalue = item.value;
-					var attr = item.fieldId;
-					this.head_styledef.form.model[attr] = item.value;
+					this.head_styledef.form.model[attr] = newVal;
 					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� 					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� 						this.onChange(onChangeEvent);
 					}
-
 				}
+
 			},
-			onCheckBoxValue(e) { //缁戝畾Model鍊�-				let values = e.detail.value || []
-				let attr = e.currentTarget?.dataset?.attr || ""
-				this.head_styledef.form.model[attr] = values;
+			// 鍐呭鍙樺寲鍚庝簨浠�+			async onChange(event) {
+				var eventid = event?.id; //鍐呭鍙樺寲鍚庝簨浠�+				if (eventid) {
+					// self.event_no_sub = 1;
+					var obj_attr = this.head_styledef.form.model;
+					// console.log(obj_attr);
+					var req = Object.keys(obj_attr).map((a) => ({
+						attr: a,
+						value: obj_attr[a] || "",
+					}));
+					var info = {
+						eventid: eventid,
+						edtype: "0",
+						projectid: '',
+						rclsid: '',
+						robjid: '',
+						userlogin: '',
+						clsid: this.$data.param.DataCls.id,
+						objid: "",
+						attr: req,
+						dataJson: []
+					}
+					this.DataObjRunCustomEvent(info);
+				}
+
 			},
-			onRadioBoxValue(e) { //缁戝畾Model鍊�-				let value = e.detail.value || ""
-				let attr = e.currentTarget?.dataset?.attr || ""
-				this.head_styledef.form.model[attr] = value;
-			},
+
 			classAttr_extButton(item) {
-				console.log("classAttr_extButton", item)
 				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 
@@ -894,7 +728,7 @@
 						title: this.translateSys("tip"),
 						content: this.translate('icon_click_callback_empty'),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -903,7 +737,7 @@
 						title: this.translateSys("tip"),
 						content: this.translate('icon_click_event_empty'),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -956,7 +790,7 @@
 						title: this.translateSys("tip"),
 						content: "popupParam涓虹┖锛�,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -965,7 +799,7 @@
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -1068,14 +902,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -1087,7 +921,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 
 						var actionlist = data.action;
@@ -1107,22 +941,18 @@
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
-									if ($this
-										.focusOldFieldId ==
-										action.value) {
+									if ($this.focusOldFieldId == action.value) {
 										$this.setData({
 											focusFieldId: ""
 										})
 									} else {
 										$this.setData({
-											focusFieldId: $this
-												.focusOldFieldId
+											focusFieldId: $this.focusOldFieldId
 										})
 									}
 									$this.$nextTick(() => {
 										$this.setData({
-											focusFieldId: action
-												.value
+											focusFieldId: action.value
 										})
 									});
 								} else {
@@ -1136,7 +966,7 @@
 											.translate(
 												"tip_action_unprocessed"),
 										showCancel: false,
-										confirmText: this.translateSys("cancel")
+										confirmText: this.translateSys('close')
 									});
 								}
 							}
@@ -1217,7 +1047,7 @@
 						title: this.translateSys("error") + "3.1",
 						content: exStr,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -1309,14 +1139,14 @@
 								title: $this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: $this.translateSys("cancel")
+								confirmText: $this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip + ',' + $this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: $this.translateSys("cancel")
+							confirmText: $this.translateSys('close')
 						});
 						return false
 					} else {
@@ -1328,7 +1158,7 @@
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: $this.translateSys("cancel")
+							confirmText: $this.translateSys('close')
 						});
 
 						if (data != "") {
@@ -1344,13 +1174,10 @@
 										var d = dialog({
 											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
 												$this.translateSys("tip"),
-											content: $this.translateSys(
-													"quotation_mark_left") +
-												action
-												.action_type + $this.translateSys(
-													"quotation_mark_right") + $this
-												.translate(
-													"tip_action_unprocessed")
+											content: $this.translateSys("quotation_mark_left") +
+												action.action_type + $this.translateSys(
+													"quotation_mark_right") +
+												$this.translate("tip_action_unprocessed")
 										});
 										d.show();
 									} else if (action.action_type == 'open_select_userdlg') {
@@ -1411,7 +1238,7 @@
 									} else if (action.action_type == 'open_common_dlg') {
 
 										if (val.common_dlg_id == 'check_list') {
-									
+
 											$this.setData({
 												check_list: val.config
 											})
@@ -1507,7 +1334,7 @@
 												.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
-											confirmText: $this.translateSys("cancel")
+											confirmText: $this.translateSys('close')
 										});
 									}
 								}
@@ -1520,7 +1347,7 @@
 										"quotation_mark_right") + $this.translateSys(
 										"comma") + 'event_id' + eventid,
 								showCancel: false,
-								confirmText: $this.translateSys("cancel")
+								confirmText: $this.translateSys('close')
 							});
 						}
 					}
@@ -1535,7 +1362,7 @@
 						title: $this.translateSys('tip') + "5.1",
 						content: exStr,
 						showCancel: false,
-						confirmText: $this.translateSys("cancel")
+						confirmText: $this.translateSys('close')
 					});
 				});
 			},
@@ -1613,14 +1440,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						this.saving = false
 						return false
@@ -1633,7 +1460,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						else {
 
@@ -1705,7 +1532,7 @@
 						title: this.translateSys("tip"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -1915,14 +1742,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						this.saving = false
 						return false
@@ -1935,7 +1762,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						if (!this.$data.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
@@ -1995,7 +1822,7 @@
 						title: this.translateSys('tip') + "7.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -2033,7 +1860,7 @@
 							title: this.translateSys("tip"),
 							content: this.translateSys("unrealized"),
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 					}
 				} else if (btn.FunCode == "TriggerEvent") {
@@ -2088,14 +1915,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -2107,7 +1934,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						if (!this.$data.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
@@ -2165,7 +1992,7 @@
 						title: this.translateSys('tip') + "7.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys("close")
 					});
 				});
 
@@ -2220,7 +2047,7 @@
 <style>
 	.popup-content {
 		@include flex;
-	
+
 	}
 
 	.popup-height {
@@ -2273,7 +2100,7 @@
 			}
 
 			.uni-icon {
-				padding: 8rpx;
+				padding: 10rpx 5rpx;
 				font-size: 32rpx;
 				color: rgb(192, 196, 204);
 			}
@@ -2294,7 +2121,7 @@
 
 		.uni-icon {
 			/* border: 1px solid red; */
-			width: 8%;
+			width: 30rpx;
 			font-family: uniicons;
 			font-size: 40rpx;
 			font-weight: 400;
@@ -2333,9 +2160,10 @@
 				width: 45%;
 				margin: 0 10rpx;
 				// padding: 5rpx 10rpx;
-				background: #4D6AF4;
+				background: #27A6E1;
 				border: none;
 				color: #fff;
+				font-size: 38rpx;
 				float: left;
 				display: inline-block;
 			}
@@ -2350,7 +2178,7 @@
 				margin: 0 10rpx;
 				background: #fff;
 				border: none;
-				color: #000;
+				//color: #000;
 				font-size: 38rpx;
 				float: right;
 				display: inline-block;
@@ -2360,7 +2188,7 @@
 				width: 90%;
 				margin: 0 10rpx;
 				background: #fff;
-				border: none;
+				//	border: none;
 				color: #000;
 				font-size: 38rpx;
 				float: right;
@@ -2424,7 +2252,7 @@
 		.popup-footer {
 			float: right;
 			position: absolute;
-			bottom: 0;
+			bottom: 10rpx;
 			right: 20rpx;
 		}
 
@@ -2448,9 +2276,11 @@
 			margin-top: 50rpx;
 			padding: 15rpx;
 			line-height: 1.5;
-			background: #27A6E1;
-			border: none;
-			color: #fff;
+			// background: #27A6E1;
+			// border: none;
+			// color: #fff;
+			background: #fff;
+			color: #000;
 			font-size: 38rpx;
 			font-weight: bold;
 			/* float: right; */

--
Gitblit v1.9.1