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/3200.vue |  334 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 177 insertions(+), 157 deletions(-)

diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 993dd89..45fb2f3 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -6,7 +6,7 @@
 				<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'" :class="item.disabled?'input-disabled':''"
-					v-model="item.value" :localdata="item.dict" @change="onChange(item)" :disabled="item.disabled"
+					v-model="item.value" :localdata="item.dict" @change="onEnterChange(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]"
@@ -16,9 +16,23 @@
 						:placeholder="item.placeholder"
 						:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
 						:focus="focusMateria" @focus="ontap(item)" @keyup.enter="onEnterChange(item)"
-						@blur="onEnterChange(item)" />
+						@blur="onEnterChange(item)" :maxlength="-1" />
 					<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
 						@click="onEnterChange(item)">&#xe568;</text>
+				</view>
+				<view class="input-wrapper"
+					v-if="item.name=='TimePicker' || item.name=='DatePicker'|| item.name=='DatePickerRange'">
+					<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)" />
 				</view>
 			</view>
 
@@ -52,54 +66,10 @@
 											:style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
 										<span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
 										<!-- 鏂囨湰妗�鏁板瓧妗�-->
-										<view class="dv_input"
-											v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
-											<text v-if="item.setting.prefix" class="uni-icon"
-												:class="[item.setting.prefix]" @change="onChange(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="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
-												:focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
-											<text v-if="item.setting.suffix" class="uni-icon"
-												:class="[item.setting.suffix]" @click="onChange(item)">&#xe568;</text>
-										</view>
-										<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-										<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
-											: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=='Textarea' && !item.disabled">
-											<textarea class="uni-input" :value="item.value"
-												:class="item.disabled?'input-disabled':''"
-												:placeholder="item.placeholder" @blur="onModelValue(item)"
-												style="height:60px;" :style="{'width':'96%'}"
-												:disabled="item.disabled"></textarea>
-										</view>
-										<!-- 澶嶉�妗�-->
-										<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
-											:class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
-											:data-ischeck="item.value" :disabled="item.disabled"
-											:style="{'margin-left':'10rpx'}">
-											<label>
-												<checkbox :value="item.value" :checked="item.value" />
-												<text>{{item.label}}</text>
-											</label>
-										</checkbox-group>
-										<!-- Switch寮�叧 -->
-										<switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''"
-											:disabled="item.disabled" v-model="item.value" @change="onModelValue(item)"
-											:style="{'margin-left':'10rpx'}" />
-										<!-- 鏃ユ湡鏃堕棿 -->
-										<view class="input-wrapper"
-											v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
-											<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 v-else class="form-item-input">
+											<input :type="item.name=='InputNumber'?'number':'text'" v-model="item.value"
+												:placeholder="item.placeholder" :maxlength="-1"
+												@on-enter="onDetail1EnterChange(item)" />
 										</view>
 									</view>
 									<!-- 鏍呮牸甯冨眬 -->
@@ -110,63 +80,12 @@
 												<text class="txt_title"
 													:style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
 												<span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
-												<view class="dv_input"
-													v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
-													<text v-if="cols.setting.prefix" class="uni-icon"
-														:class="[cols.setting.prefix]"
-														@change="onChange(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="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix || cols.setting.suffix?'87%':'96%'}"
-														:focus="focusMateria" @focus="ontap(cols)"
-														@blur="onevent(cols)" />
-													<text v-if="cols.setting.suffix" class="uni-icon"
-														:class="[cols.setting.suffix]"
-														@click="onChange(cols)">&#xe568;</text>
+												<!-- 鏂囨湰妗�鏁板瓧妗�-->
+												<view v-else class="form-item-input">
+													<input :type="cols.name=='InputNumber'?'number':'text'"
+														v-model="cols.value" :placeholder="cols.placeholder"
+														:maxlength="-1" @on-enter="onDetail1EnterChange(cols)" />
 												</view>
-												<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
-												<uni-data-select id="dv_select"
-													v-if="cols.name=='Select' && !cols.disabled"
-													: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' && !cols.disabled">
-													<textarea class="uni-input" :value="cols.value"
-														:class="cols.disabled?'input-disabled':''"
-														:placeholder="cols.placeholder" @blur="onModelValue(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="item.disabled"
-													@change="onModelValue(cols)" :data-ischeck="cols.value"
-													:style="{'margin-left':'10rpx'}">
-													<label>
-														<checkbox :value="cols.value" :checked="cols.value" />
-														<text>{{cols.label}}</text>
-													</label>
-												</checkbox-group>
-												<!-- Switch寮�叧 -->
-												<switch v-if="cols.name=='Switch'"
-													:class="cols.disabled?'input-disabled':''" :disabled="item.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="item.disabled" :value="cols.value"
-														@change="onModelValue(cols)">
-														<view class="picker">{{cols.value}}</view>
-													</picker>
-												</view>
-
 											</view>
 										</uni-col>
 									</uni-row>
@@ -220,10 +139,18 @@
 		dataObjQuery,
 		dataObjDel
 	} 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 {
 		modules: {
 			Base64,
+		},
+		components: {
+			OIDatePicker,
+			OIDatePickerRange,
+			OITimePicker
 		},
 		onNavigationBarButtonTap(e) {
 			//  	console.log(e);
@@ -470,7 +397,25 @@
 							console.log(ele.useDict);
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'mast');
+							} else {
+								if (ele?.name === "Select") {
+									const selections = ele?.selections || []
+									//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+									let itemName = ele.value || "";
+									if (itemName) {
+										$this.head_styledef.form
+											.model[ele.fieldId] = itemName;
+									}
+									$this.head_styledef.form.items[index].dict = selections.map((a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
+
 							}
+
 						});
 
 					}
@@ -481,7 +426,7 @@
 						title: this.translateSys("error") + "1.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 
@@ -512,7 +457,7 @@
 						title: this.translateSys("error") + "1.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 
@@ -547,7 +492,7 @@
 						title: this.translateSys("error") + "1.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -565,9 +510,9 @@
 						var itemName = '';
 						(result.dict_item_list || []).forEach((item) => {
 							if (item.is_default == '1')
-								itemName = item.name;
+								itemName = item.name
 							list.push({
-								text: item.value,
+								text: item.value ? item.value : item.name,
 								value: item.name,
 							});
 						});
@@ -588,7 +533,7 @@
 						title: this.translateSys("error") + "3",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -619,14 +564,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') + ':' + result
 									.ret,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 							return false;
 						} else {
@@ -636,7 +581,7 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 
 							if (result.result_type == 0 && result.action) {
@@ -659,7 +604,7 @@
 										title: this.translateSys("tip"),
 										content: result.info,
 										showCancel: false,
-										confirmText: this.translateSys("cancel")
+										confirmText: this.translateSys('close')
 									});
 								}
 							}
@@ -673,7 +618,7 @@
 								"comma") +
 							tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 
 				}
@@ -837,7 +782,7 @@
 							title: this.translateSys("error") + "5.1",
 							content: ex.errMsg,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 					});
 				} catch (ex) {
@@ -846,7 +791,7 @@
 						title: this.translateSys("error") + "5.2",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -902,7 +847,7 @@
 												content: tip,
 												showCancel: false,
 												confirmText: this.translateSys(
-													"cancel")
+													'close')
 											});
 										}
 									}
@@ -919,8 +864,10 @@
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: btn.PromptContent || this.translate("are_you_sure"),
+						cancelText: this.translateSys('ok'),
+						confirmText: this.translateSys('cancel'),
 						success: function(res) {
-							if (res.confirm) {
+							if (res.cancel) {
 								that.onButtonClicked(btn, style);
 								// } else if (res.cancel) {
 								// 	console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -945,10 +892,11 @@
 						if (btn.Prompt) {
 							uni.showModal({
 								title: this.translateSys("tip"),
-								content: btn.PromptContent || this.translate(
-									"are_you_sure"),
+								content: btn.PromptContent || this.translate("are_you_sure"),
+								cancelText: this.translateSys('ok'),
+								confirmText: this.translateSys('cancel'),
 								success: function(res) {
-									if (res.confirm) {
+									if (res.cancel) {
 										that.onButtonClicked(btn);
 										// } else if (res.cancel) {
 										// 	console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -978,7 +926,7 @@
 								title: this.translateSys("tip"),
 								content: this.translateSys("unrealized"),
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						}
 					} else if (btn.FunCode == "Delete") {
@@ -998,7 +946,7 @@
 							title: this.translateSys("tip"),
 							content: this.translateSys("unrealized"),
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 					}
 				} catch (ex) {
@@ -1007,7 +955,7 @@
 						title: this.translateSys("error"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -1041,8 +989,10 @@
 				uni.showModal({
 					title: this.translateSys("tip"),
 					content: this.translate("confirm_delete_data"),
+					cancelText: this.translateSys('ok'),
+					confirmText: this.translateSys('cancel'),
 					success: function(res) {
-						if (res.confirm) {
+						if (res.cancel) {
 							var objID = style.form.objId;
 							if (!style.form.objId.includes('{')) objID = '{' + style.form
 								.objId + '}';
@@ -1073,7 +1023,7 @@
 										"delete_success"),
 									showCancel: false,
 									confirmText: this.translateSys(
-										"cancel")
+										'close')
 								});
 							}).catch(ex => {
 								// console.log(ex);
@@ -1083,7 +1033,7 @@
 									content: ex.errMsg,
 									showCancel: false,
 									confirmText: this.translateSys(
-										"cancel")
+										'close')
 								});
 							});
 						} else if (res.cancel) {
@@ -1146,7 +1096,7 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
@@ -1155,7 +1105,7 @@
 								result
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						return false;
 					} else {
@@ -1167,7 +1117,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 
 					}
@@ -1177,7 +1127,7 @@
 						title: this.translateSys("error"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					this.showError(ex);
 				}
@@ -1226,7 +1176,7 @@
 										'tip_no_app_param'),
 									showCancel: false,
 									confirmText: this.translateSys(
-										"cancel")
+										'close')
 								});
 								return;
 							}
@@ -1251,7 +1201,7 @@
 								content: this.translate(
 									"function_not_exist"),
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						}
 
@@ -1260,7 +1210,7 @@
 							title: this.translateSys("error"),
 							content: this.translate("cannot_related_function"),
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 
 					}
@@ -1274,7 +1224,7 @@
 						title: this.translateSys("error"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return undefined
 				}
@@ -1297,7 +1247,7 @@
 						title: this.translateSys("error") + "7",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -1353,6 +1303,7 @@
 					}
 				})
 			},
+
 			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
 				// console.log(item);
 				if (item.oldvalue != item.value) {
@@ -1439,7 +1390,7 @@
 										content: tip,
 										showCancel: false,
 										confirmText: this
-											.translateSys("cancel")
+											.translateSys('close')
 									});
 								} else uni.showModal({
 									title: this.translateSys(
@@ -1451,7 +1402,7 @@
 										.ret,
 									showCancel: false,
 									confirmText: this.translateSys(
-										"cancel")
+										'close')
 								});
 								return false;
 							} else {
@@ -1465,7 +1416,7 @@
 									content: tip,
 									showCancel: false,
 									confirmText: this.translateSys(
-										"cancel")
+										'close')
 								});
 
 								if (result.result_type == 0 && result
@@ -1510,7 +1461,7 @@
 											showCancel: false,
 											confirmText: this
 												.translateSys(
-													"cancel")
+													'close')
 										});
 									}
 								}
@@ -1525,7 +1476,7 @@
 								content: ex.errMsg,
 								showCancel: false,
 								confirmText: this.translateSys(
-									"cancel")
+									'close')
 							});
 						});
 					}
@@ -1540,11 +1491,74 @@
 							this.translate('reason') + this.translateSys(
 								"colon") + tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 
 				}
 			},
+			onCheckBoxValue(e) { //缁戝畾Model鍊�+				let values = e.detail.value || []
+				const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index || 0]
+				if (item?.setting?.colList) {
+					const col = item.setting.colList[e.currentTarget?.dataset?.iindex || 0]
+					if (col) {
+						col.value = values
+						let attr = col.fieldId;
+						this.head_styledef.form.model[attr] = col.value;
+						var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+							this.onChange(onChangeEvent);
+						}
+						return
+					}
+				} else {
+					if (item) {
+						item.value = values
+						let attr = item.fieldId;
+						this.head_styledef.form.model[attr] = item.value;
+						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+							this.onChange(onChangeEvent);
+						}
+					}
+				}
+
+			},
+			onRadioBoxValue(e) { //缁戝畾Model鍊�+				let values = e.detail.value || ""
+				const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index || 0]
+				if (item?.setting?.colList) {
+					const col = item.setting.colList[e.currentTarget?.dataset?.iindex || 0]
+					if (col) {
+						col.value = values
+						let attr = col.fieldId;
+						this.head_styledef.form.model[attr] = col.value;
+						var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+							this.onChange(onChangeEvent);
+						}
+						return
+					}
+				} else {
+					if (item) {
+						item.value = values
+						let attr = item.fieldId;
+						this.head_styledef.form.model[attr] = item.value;
+						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+						if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+							this.onChange(onChangeEvent);
+						}
+					}
+
+				}
+
+			},
+
+			onModelValue(item) {
+				var attr = item.fieldId;
+				this.head_styledef.form.model[attr] = item.value;
+			},
+			onDetail1EnterChange() {},
 			//鐐逛腑琛ㄥ崟
 			onPanelClick(value) { //鐐瑰嚮闈㈡澘楂樹寒鏄剧ず
 				// console.log(value);
@@ -1583,7 +1597,7 @@
 									content: tip,
 									showCancel: false,
 									confirmText: this
-										.translateSys("cancel")
+										.translateSys('close')
 								});
 							} else uni.showModal({
 								title: this.translateSys(
@@ -1594,7 +1608,7 @@
 									result.ret,
 								showCancel: false,
 								confirmText: this.translateSys(
-									"cancel")
+									'close')
 							});
 							return false;
 						} else {
@@ -1608,7 +1622,7 @@
 								content: tip,
 								showCancel: false,
 								confirmText: this.translateSys(
-									"cancel")
+									'close')
 							});
 
 							if (result.result_type == 0 && result
@@ -1684,7 +1698,7 @@
 											showCancel: false,
 											confirmText: this
 												.translateSys(
-													"cancel"
+													'close'
 												)
 										});
 									}
@@ -1699,7 +1713,7 @@
 										showCancel: false,
 										confirmText: this
 											.translateSys(
-												"cancel")
+												'close')
 									});
 								}
 							}
@@ -1714,7 +1728,7 @@
 							content: ex.errMsg,
 							showCancel: false,
 							confirmText: this.translateSys(
-								"cancel")
+								'close')
 						});
 					});
 				} catch (ex) {
@@ -1727,7 +1741,7 @@
 							this.translate('reason') + this.translateSys(
 								"colon") + tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 
 				}
@@ -1994,7 +2008,7 @@
 		},
 	};
 </script>
-<style lang="less">
+<style lang="scss">
 	.uni-page-modal-3200 {
 		display: flex;
 		flex-direction: column;
@@ -2053,7 +2067,8 @@
 
 		.uni-icon {
 			/* border: 1px solid red; */
-			width: 8%;
+			width: 30rpx;
+			padding: 10rpx 5rpx;
 			font-family: uniicons;
 			font-size: 40rpx;
 			font-weight: 400;
@@ -2172,6 +2187,11 @@
 			width: calc(100% - 100px);
 		}
 
+		.dv-panel .form-item-input {
+
+			width: calc(100% - 100px);
+		}
+
 		.dv-panel-button {
 			display: inline-block;
 		}
@@ -2206,7 +2226,7 @@
 			margin-top: 25rpx;
 			padding: 20rpx;
 			line-height: 1.5;
-			background: #4D6AF4;
+			background: #27A6E1;
 			border: none;
 			color: #fff;
 			font-size: 38rpx;
@@ -2221,7 +2241,7 @@
 			padding: 20rpx;
 			line-height: 1.5;
 			background: #fff;
-			border: none;
+			// border: none;
 			color: #000;
 			font-size: 38rpx;
 			font-weight: bold;

--
Gitblit v1.9.1