From 00c011fc0571caad2bec578fe4ce2f101ab0500e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 18:04:08 +0800
Subject: [PATCH] test

---
 pages/modal/3200.vue | 2157 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1,130 insertions(+), 1,027 deletions(-)

diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 79d9908..543fc25 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -1,196 +1,61 @@
 <template>
-	<view class="uni-page-modal-3200">
+	<view class="uni-page-modal-3200" :class="largeMode?'large-mode':''">
 		<view class="v-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items" v-if="isFilter==true">
-				<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"
-					: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="onEnterChange(item)">&#xe568;</text>
-					<input class="uni-input" :class="item.disabled?'input-disabled':''"
-						:type="item.name=='Input'?'text':'number'" 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)" @keyup.enter="onEnterChange(item)"
-						@blur="onEnterChange(item)" />
-					<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
-						@click="onEnterChange(item)">&#xe568;</text>
-				</view>
-			</view>
-
-			<scroll-view :scroll-top="scrollTop" :scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower"
-				@scroll="scroll">
-				<view class="view-content" id="tabpanel">
-					<view class="dv-panel dv-panel-bkcolor" v-for="(style,ii) in detail1StyleDefList"
-						@click="onPanelClick(ii)" :id="'panel'+style.form.htmlobjId"
-						:class="activelist[ii].active==true?'bk-active':''">
-						<div class="dv-panel-button" v-if="param.ListPage.CheckBox==true">
-							<checkbox-group>
-								<label>
-									<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
-								</label>
-							</checkbox-group>
-						</div>
-						<!-- HTML椤甸潰绫诲瀷鏄剧ず -->
-						<div class="dv-listHtml-Panel" v-if="ListHtml_Panel" v-html="ListHtml_Panel[ii]" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
-				  param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
-				  param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
-
-						</div>
-						<div class="dv-panel-input" v-if="!ListHtml_Panel" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
-				  param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
-				  param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
-							<div 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>
-									<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>
-								</view>
-								<!-- 鏍呮牸甯冨眬 -->
-								<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">
-										<view v-if="cols!=null">
-											<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>
-											<!-- 涓嬫媺妗�鍗曢� 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>
+			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" @on-focus="ontap"
+				@on-change="onEnterChange" @on-click-prefix="onEnterChange" @on-click-suffix="onEnterChange"></OIForm>
+			<view class="v-scroll-view">
+				<scroll-view :scroll-top="scrollTop" :scroll-y="true" class="scroll-y" @scrolltolower="scrolltolower"
+					@scroll="scroll">
+					<view class="view-content" id="tabpanel">
+						<view class="dv-panel dv-panel-bkcolor" v-for="(style,ii) in detail1StyleDefList" :key="ii"
+							@click="onPanelClick(ii)" :id="'panel'+style.form.htmlobjId"
+							:class="activeItem == style?'bk-active':''">
+							<div class="dv-panel-button" v-if="param.ListPage.CheckBox==true">
+								<checkbox-group>
+									<label>
+										<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
+									</label>
+								</checkbox-group>
 							</div>
-						</div>
-						<div class="dv-panel-button" v-if="param.ListPage.Click_View==true">
-							<a @click="onViewPageClick(style)"><i class="mobox-normal-right-arrow" /></a>
-						</div>
-						<div class="dv-panel-buticon" v-if="param.ListPage.ListItem_Button">
-							<view class="btn-padding" v-for="(btn,key) in param.ListPage.ListItem_Button">
-								<a @click="onBtnClick(btn,style)" :title="btn.ShowName" v-if="btn.Style=='img'">
-									<i :class="btn.Img" />
-								</a>
-								<button type="default" @click="onBtnClick(btn,style)" class="btn-padding"
-									v-else-if="btn.Style=='text'">{{btn.ShowName}}</button>
-							</view>
-						</div>
+							<!-- HTML椤甸潰绫诲瀷鏄剧ず -->
+							<div class="dv-listHtml-Panel" v-if="ListHtml_Panel" v-html="ListHtml_Panel[ii]"
+								:style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;': param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
+
+							</div>
+							<div class="dv-panel-input" v-if="!ListHtml_Panel"
+								:style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
+								<OIForm class="v-area dv-panel" :form="style.form.items" viewMode></OIForm>
+
+							</div>
+							<div class="dv-panel-button" v-if="param.ListPage.Click_View==true">
+								<a @click="onViewPageClick(style)"><i class="mobox-normal-right-arrow" /></a>
+							</div>
+							<div class="dv-panel-buticon" v-if="param.ListPage.ListItem_Button">
+								<view class="btn-padding" v-for="(btn,key) in param.ListPage.ListItem_Button">
+									<a @click="onBtnClick(btn,style)" :title="btn.ShowName" v-if="btn.Style=='img'">
+										<i :class="btn.Img" />
+									</a>
+									<button type="default" @click="onBtnClick(btn,style)" class="btn-padding"
+										v-else-if="btn.Style=='text'">{{btn.ShowName}}</button>
+								</view>
+							</div>
+						</view>
 					</view>
-				</view>
-			</scroll-view>
+				</scroll-view>
+			</view>
 		</view>
 
 		<view class="view-floor">
 			<button type="default" @click="cancel" class="btn_cancel"
 				:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("close")}}</button>
-			<button type="default" @click="Refresh" class="btn_refresh"
+			<button type="default" @click="Refresh" class="btn_refresh" :class="refreshing?'btn_disabled':''"
+				:disabled="refreshing"
 				:style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("refresh")}}</button>
 			<view class="uni-padding-wrap" v-if="param.ListPage.Page_Button.length>0">
 				<view class="uni-btn-v">
 					<a @tap="actionSheetTap">
-						<Icon class="mobox-normal-more" />
+						<text class="mobox-normal-more" />
 					</a>
 				</view>
 			</view>
@@ -199,11 +64,28 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from '@/js/Base64.js';
 	import classUtils from "@/js/utils.js"
+	import {
+		appGetInfo,
+		dictGetInfo
+	} from "@/api/mobox.js"
+	import {
+		getUIStyleInfo,
+		runCustomEvent,
+		dataObjQuery,
+		dataObjDel
+	} from "@/api/data.js"
+	import dayjs from "dayjs";
+	import OIForm from '@/components/oi-form/index.vue'
+	import buttonClickMixin from '@/mixins/button-click.js';
+
 	export default {
-		modules: {
-			Base64,
+		mixins: [buttonClickMixin],
+		components: {
+			OIForm
 		},
 		onNavigationBarButtonTap(e) {
 			//  	console.log(e);
@@ -226,6 +108,7 @@
 		},
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys('add2'),
 				isFilter: true,
 				param: {},
@@ -238,11 +121,10 @@
 				},
 				detail1_styledef: {},
 				detail1StyleDefList: [],
-				detail2_styledef: {},
-				detail2StyleDefList: [],
 				items: [],
 				active_id: '',
-				activelist: [],
+				//activelist: [],
+				activeItem: {},
 				where: '',
 				wheres: '',
 				orderby: '',
@@ -264,6 +146,7 @@
 						name: ""
 					}
 				},
+				refreshing: false
 			};
 		},
 		async onLoad(options) {
@@ -271,8 +154,8 @@
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.title = options.titlename;
-			this.$data.param = JSON.parse(options.param);
+			this.title = options.titlename;
+			this.param = JSON.parse(options.param);
 
 
 			this.styledef = {};
@@ -283,8 +166,6 @@
 			};
 			this.detail1_styledef = {};
 			this.detail1StyleDefList = [];
-			this.detail2_styledef = {};
-			this.detail2StyleDefList = [];
 			this.ListHtml_Panel = "";
 			this.ListPageHtml_Show = {
 				name: "",
@@ -295,7 +176,8 @@
 			};
 			this.items = [];
 			this.active_id = '';
-			this.activelist = [];
+			this.activeItem = {};
+			//this.activelist = [];
 
 			if (this.param.ListPage.ListItem_UIDef?.ui_type == "HTML椤甸潰") {
 				// HTML椤甸潰
@@ -331,7 +213,7 @@
 			//   this.query_id = "";
 			//   await this.loadDataGetList();
 			// }
-			// console.log(this.$data.param);
+			// console.log(this.param);
 			//椤甸潰鍒濆鍖栬幏鍙栫劍鐐� 			// this.focusMateria=true; 
 		},
@@ -361,6 +243,7 @@
 
 			//鍒濆鍖� 			async initial(paramValue) {
+				this.refreshing = true
 				this.isFilter = true;
 				if (this.param.ShowFilter)
 					this.isFilter = false;
@@ -370,7 +253,7 @@
 					//浼犲叆鍙傛暟鍊� 					if (paramValue) {
 						const attrs = paramValue.attrs || [];
-						(this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+						(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
 							if (ele.name != "Layout") {
 								attrs.forEach(async (ele2, index2) => {
 									if (ele.fieldId == ele2.name) {
@@ -403,6 +286,7 @@
 					this.detail1StyleDefList = [];
 					await this.loadDataGetList();
 				}
+				this.refreshing = false
 
 			},
 			//婊氬姩鍒板簳閮ㄥ悗鎳掑姞杞芥暟鎹�@@ -425,136 +309,148 @@
 				this.old.scrollTop = e.detail.scrollTop
 			},
 			async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					class_id: class_id,
-					ui_style_id: style_id,
-				};
-				// console.log(dataInfo);
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						$this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
-						// this.form = this.head_styledef.form.model;
-						// console.log($this.$data.head_styledef);
+				try {
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					// console.log(dataInfo);
+					const result = await getUIStyleInfo(dataInfo)
+					var styledef = "";
+					if (result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!result.style_def.includes('"')) styledef = Base64.decode(result
+							.style_def);
+					}
+					$this.head_styledef = result.style_def ? JSON.parse(styledef) : {};
+					// this.form = this.head_styledef.form.model;
+					// console.log($this.head_styledef);
+					if ($this.head_styledef.form?.items) {
 						$this.head_styledef.form.items.forEach(async (ele, index) => {
 							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].selections = selections.map((
+										a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
 
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "1",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							}
+
 						});
+						const app = getApp()
+						if (app.globalData.bindClasses) {
+							$this.head_styledef.form.items.push({
+								name: "Input",
+								label: this.translate("classes"),
+								labelWidth: 100,
+								disabled: true,
+								value: app.globalData.classes,
+								setting: {
+									width: 100,
+									height: 50,
+								},
+								bind: {
+									attr: "",
+								},
+								fieldId: "S_CLASSES",
+							})
+							$this.head_styledef.form.model["S_CLASSES"] = app.globalData.classes
+						}
+
 					}
-				}).catch(ex => {
+				} catch (ex) {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "1.1",
-						content: ex.errMsg,
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
-				});
+				}
 
 			},
 			async Detail1_UIstyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					class_id: class_id,
-					ui_style_id: style_id,
-				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						$this.$data.detail1_styledef = ret.result.style_def ? JSON.parse(styledef) : {};
-						$this.$data.detail1_styledef.SelBut_Checked = false;
-						// console.log($this.$data.detail1_styledef);
-						// $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
-						// var aa = JSON.stringify(this.detail1_styledef);
-						// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
-						// console.log($this.$data.detail1StyleDefList);
-
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "2",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+				try {
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					// console.log(dataInfo);
+					const result = await getUIStyleInfo(dataInfo)
+					var styledef = "";
+					if (result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!result.style_def.includes('"')) styledef = Base64.decode(result
+							.style_def);
 					}
-				}).catch(ex => {
+					$this.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.detail1_styledef.SelBut_Checked = false;
+				} catch (ex) {
 					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
-						title: this.translateSys("error") + "2.1",
-						content: ex.errMsg,
+						title: this.translateSys("error") + "1.1",
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
-				});
+				}
+
 
 			},
 			async Html_UIstyleGetInfo(class_id, style_id, paramValue) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�-				var $this = this;
-				var dataInfo = {
-					class_id: class_id,
-					ui_style_id: style_id,
-				};
-				this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => {
-					// console.log(ret);
-					if (ret.err_code == 0) {
-						var styledef = "";
-						if (ret.result.style_def) {
-							//mobox2鐨剆tyle_def鏄痡son瀛楃涓�-							styledef = ret.result.style_def.replace(/\\/g, "");
-							//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�-							if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
-								.style_def);
-						}
-						// console.log(styledef);
-						$this.ListPageHtml_Show = ret.result.style_def ? JSON.parse(styledef) : {};
-						// console.log($this.ListPageHtml_Show);
-
-						$this.initial(paramValue);
-					} else {
-						uni.showModal({
-							title: this.translateSys("error") + "10",
-							content: ret.err_msg,
-							showCancel: false,
-							confirmText: this.translateSys("cancel")
-						});
+				try {
+					var $this = this;
+					var dataInfo = {
+						class_id: class_id,
+						ui_style_id: style_id,
+					};
+					// console.log(dataInfo);
+					const result = await getUIStyleInfo(dataInfo)
+					var styledef = "";
+					if (result.style_def) {
+						//mobox2鐨剆tyle_def鏄痡son瀛楃涓�+						styledef = result.style_def.replace(/\\/g, "");
+						//mobox3鐨剆tyle_def鏄痓ase64瀛楃涓�+						if (!result.style_def.includes('"')) styledef = Base64.decode(result
+							.style_def);
 					}
-				}).catch(ex => {
-					// console.log(ex);
-					uni.showModal({
-						title: this.translateSys("error") + "10.1",
-						content: ex.errMsg,
-						showCancel: false,
-						confirmText: this.translateSys("cancel")
-					});
-				});
+					// console.log(styledef);
+					$this.ListPageHtml_Show = result.style_def ? JSON.parse(styledef) : {};
+					// console.log($this.ListPageHtml_Show);
 
+					$this.initial(paramValue);
+				} catch (ex) {
+					// console.log(ex);
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
+					uni.showModal({
+						title: this.translateSys("error") + "1.1",
+						content: tip,
+						showCancel: false,
+						confirmText: this.translateSys('close')
+					});
+				}
 			},
 			async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛� 				this.data = [];
@@ -564,15 +460,15 @@
 					dict_name: dict.name
 				};
 				try {
-					const success = await this.getDictInfo(dataInfo)
+					const result = await dictGetInfo(dataInfo)
 					if (type == 'mast') {
 						var list = [];
 						var itemName = '';
-						success.result.dict_item_list.forEach((item) => {
+						(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,
 							});
 						});
@@ -586,9 +482,6 @@
 						var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
 						$this.head_styledef = [];
 						$this.head_styledef = head_styledef;
-					} else {
-						// $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result;
-						// this.$store.commit("subClassAttrList", $this.$data.subClassAttrList);
 					}
 				} catch (ex) {
 					// console.log(ex);
@@ -596,38 +489,9 @@
 						title: this.translateSys("error") + "3",
 						content: ex.errMsg,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
-			},
-			getDictInfo(info) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�-				const loginInfo = this.$store.getters.loginid
-				const mobxoSApi = this.$store.getters.getMobxoSApi
-				return new Promise((resolve, reject) => {
-					uni.request({
-						url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
-						data: info,
-						method: 'POST',
-						dataType: "json",
-						success: (_res) => {
-							// console.log(_res);
-							const ret = _res.data
-							if (ret.err_code == 0) {
-								resolve(ret);
-							} else {
-								reject({
-									"errMsg": ret.err_msg
-								});
-							}
-						},
-						fail: (err) => {
-							// console.log(err);
-							reject(err);
-						}
-					})
-
-				})
-
 			},
 
 			// 鎵ц鏌ヨ浜嬩欢
@@ -641,95 +505,94 @@
 							class_id: clsid,
 							event_id: eventid,
 						};
-						this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
-							// console.log(ret);
-							if (ret.err_code == 0) {
-								var result = ret.result;
-								if (result.ret != 0) {
-									var tip = result.err_info ? typeof result.err_info == 'string' ? result
-										.err_info : result.err_info.join('<br/>') : '';
-									if (result.ret == 801) {
-										if (this.param.Only_Script_Error) {
-											let pos = tip.indexOf("锛�);
-											if (pos > -1) tip = tip.substring(pos + 1);
-										}
+						var result = await runCustomEvent(dataInfo)
+						// console.log(result);
+
+						if (result.ret != 0&& result.ret != 1) {
+							var tip = result.err_info ? typeof result.err_info == 'string' ? result
+								.err_info : result.err_info.join('<br/>') : '';
+							if (result.ret == 801) {
+								if (this.param.Only_Script_Error) {
+									let pos = tip.indexOf("锛�);
+									if (pos > -1) tip = tip.substring(pos + 1);
+								}
+								uni.showModal({
+									title: this.translateSys("tip"),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys('close')
+								});
+							} else uni.showModal({
+								title: this.translateSys("tip"),
+								content: tip + ',' + this.translateSys('tip') + ':' + result
+									.ret,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							return false;
+						} else {
+							var tip = result.info ? typeof result.info == 'string' ? result.info :
+								result.info.join('<br/>') : '';
+							tip = tip || result.err_info
+							if (tip) uni.showModal({
+								title: this.translateSys("tip"),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys('close')
+							});
+							if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+								if (result.result_type == 2) {
+
+								} else if (typeof result.result == 'string') {
+									if (result.result) {
 										uni.showModal({
-											title: this.translateSys("tip"),
-											content: tip,
+											title: this.translateSys('tip'),
+											content: result.result,
 											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")
-									});
-									return false;
-								} else {
-									var tip = result.info ? typeof result.info == 'string' ? result.info :
-										result.info.join('<br/>') : '';
-									if (tip) uni.showModal({
-										title: this.translateSys("tip"),
-										content: tip,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-
-									if (result.result_type == 0 && result.action) {
-										result.action.forEach(item => {
-											if (item.action_type == "set_query_condition") {
-												var value = item.value;
-												$this.wheres = value.condition;
-												$this.orderby = value.order ? value.order : $this
-													.orderby;
-												$this.pageindex = 1;
-												$this.query_id = "";
-												$this.detail1StyleDefList = [];
-												$this.loadDataGetList();
-											}
-
-										});
-									} else {
-										// this.detail2StyleDefList=[];
-										if (result.info) {
-											uni.showModal({
-												title: this.translateSys("tip"),
-												content: result.info,
-												showCancel: false,
-												confirmText: this.translateSys("cancel")
-											});
-										}
 									}
 								}
+								try {
+									var actionList = result.action || []
+									actionList.forEach(item => {
+										if (item.action_type == "set_query_condition") {
+											var value = item.value;
+											$this.wheres = value.condition;
+											$this.orderby = value.order ? value.order : $this
+												.orderby;
+											$this.pageindex = 1;
+											$this.query_id = "";
+											$this.detail1StyleDefList = [];
+											$this.loadDataGetList();
+										}
 
-							} else {
-								uni.showModal({
-									title: this.translateSys("error") + "4",
-									content: ret.err_msg,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
+									});
+								} catch (ex) {
+									let actionList = (result.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: tip,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+									console.log(ex)
+									return
+								}
 							}
-						}).catch(ex => {
-							// console.log(ex);
-							uni.showModal({
-								title: this.translateSys("error") + "4.1",
-								content: ex.errMsg,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
-						});
+						}
 					}
 				} catch (ex) {
 					var tip = typeof ex == "string" ? ex : ex.message;
 					uni.showModal({
 						title: this.translateSys("error") + "4.2",
-						content: this.translate("execute_query_event_failed") + this.translateSys("comma") +
+						content: this.translate("execute_query_event_failed") + this.translateSys(
+								"comma") +
 							tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 
 				}
@@ -760,128 +623,140 @@
 						page: this.pageindex,
 						query_id: this.query_id,
 					};
-					this.$store.dispatch('dataObjQuery', dataInfo).then(ret => {
-						console.log(ret);
+					dataObjQuery(dataInfo).then(result => {
+						console.log(result);
 						uni.hideLoading();
-						if (ret.err_code == 0) {
-							// var list=[];
-							$this.query_id = '';
-							if (ret.result) {
-								$this.page_count = ret.result.page_count;
-								if (ret.result.page_count > 1) $this.query_id = ret.result.query_id;
-								// console.log($this.ListPageHtml_Show.event);
-								if ($this.ListPageHtml_Show.event.id) {
-									ret.result.obj_list.forEach((obj) => {
-										var info = {
-											id: obj.id,
-										};
-										obj.attr_list.forEach((attr) => {
-											info[attr.name] = attr.value;
-										});
-										var detailStyle = {
-											SelBut_Checked: false,
-											form: {},
-											info: info
-										};
-										detailStyle.form.htmlobjId = obj.id ? obj.id.replace(/-/g, '')
-											.replace('{', '').replace('}', '') : 'null';
-										detailStyle.form.objId = obj.id;
-										detailStyle.form.attrs = obj.attr_list;
-										$this.detail1StyleDefList.push(detailStyle);
-										$this.activelist.push({
-											active: false
-										});
+
+						// var list=[];
+						$this.query_id = '';
+						if (result) {
+							$this.page_count = result.page_count;
+							if (result.page_count > 1) $this.query_id = result.query_id;
+							// console.log($this.ListPageHtml_Show.event);
+							if ($this.ListPageHtml_Show.event.id) {
+								const detail1StyleDefList = $this.detail1StyleDefList
+								result.obj_list.forEach((obj) => {
+									var info = {
+										id: obj.id,
+									};
+									obj.attr_list.forEach((attr) => {
+										info[attr.name] = attr.value;
 									});
-									// console.log(this.detail1StyleDefList);
-									var jsonlist = [];
-									$this.detail1StyleDefList.forEach(attr => {
-										jsonlist.push({
-											id: attr.info.id,
-											attrs: Object.keys(attr.info).map((a) => ({
-												attr: a,
-												value: attr.info[a] || "",
-											}))
-										});
+									var detailStyle = {
+										SelBut_Checked: false,
+										form: {},
+										info: info
+									};
+									detailStyle.form.htmlobjId = obj.id ? obj.id.replace(
+											/-/g, '')
+										.replace('{', '').replace('}', '') : 'null';
+									detailStyle.form.objId = obj.id;
+									detailStyle.form.attrs = obj.attr_list;
+									detail1StyleDefList.push(detailStyle);
+									// $this.activelist.push({
+									// 	active: false
+									// });
+								});
+								// console.log(this.detail1StyleDefList);
+
+								$this.setData({
+									detail1StyleDefList: detail1StyleDefList
+								})
+
+								var jsonlist = [];
+								$this.detail1StyleDefList.forEach(attr => {
+									jsonlist.push({
+										id: attr.info.id,
+										attrs: Object.keys(attr.info).map((a) => ({
+											attr: a,
+											value: attr.info[a] || "",
+										}))
 									});
-									// console.log(jsonlist);
-									var data_json = Base64.encode(JSON.stringify(jsonlist));
-									var eventid = $this.ListPageHtml_Show.event.id;
-									if (!$this.ListPageHtml_Show.event.id.includes('{'))
-										eventid = '{' + $this.ListPageHtml_Show.event.id + '}';
-									//HTML椤甸潰浜嬩欢
-									$this.runCustomEvent({
-										ed_type: 0,
-										start_transaction: true,
-										class_id: $this.param.DataCls.id,
-										event_id: eventid,
-										data_json,
-									});
-								} else {
-									// $this.detail1StyleDefList=[];
-									ret.result.obj_list.forEach((obj) => {
-										var styleStr = JSON.stringify($this.detail1_styledef);
-										var detailStyle = JSON.parse(styleStr);
-										// var info ={
-										//     S_ID:obj.id,
-										// };
-										obj.attr_list.forEach((attr) => {
-											// info[attr.name]=attr.value;
-											detailStyle.form.items.forEach(ele => {
-												if (ele.name != 'Layout') {
-													if (ele.fieldId == attr.name) ele
-														.value = attr.value;
-												} else if (ele.name == 'Layout') {
-													ele.setting.colList.forEach(
+								});
+								// console.log(jsonlist);
+								var data_json = Base64.encode(JSON.stringify(jsonlist));
+								var eventid = $this.ListPageHtml_Show.event.id;
+								if (!$this.ListPageHtml_Show.event.id.includes('{'))
+									eventid = '{' + $this.ListPageHtml_Show.event.id + '}';
+								//HTML椤甸潰浜嬩欢
+								$this.runCustomEvent({
+									ed_type: 0,
+									start_transaction: true,
+									class_id: $this.param.DataCls.id,
+									event_id: eventid,
+									data_json,
+								});
+							} else {
+								// $this.detail1StyleDefList=[];
+								const detail1StyleDefList = []
+								result.obj_list.forEach((obj) => {
+									var styleStr = JSON.stringify($this.detail1_styledef);
+									var detailStyle = JSON.parse(styleStr);
+									// var info ={
+									//     S_ID:obj.id,
+									// };
+									obj.attr_list.forEach((attr) => {
+										// info[attr.name]=attr.value;
+										detailStyle.form.items.forEach(ele => {
+											if (ele.name != 'Layout') {
+												if (ele.fieldId == attr
+													.name) ele
+													.value = attr.value;
+											} else if (ele.name ==
+												'Layout') {
+												ele.setting.colList
+													.forEach(
 														col => {
 															if (col) {
-																if (col.fieldId ==
-																	attr.name) col
-																	.value = attr
+																if (col
+																	.fieldId ==
+																	attr
+																	.name)
+																	col
+																	.value =
+																	attr
 																	.value;
 															}
 														});
-												}
-											});
+											}
 										});
-
-										detailStyle.form.htmlobjId = obj.id ? obj.id.replace(/-/g, '')
-											.replace('{', '').replace('}', '') : 'null';
-										detailStyle.form.objId = obj.id;
-										detailStyle.form.attrs = obj.attr_list;
-										$this.detail1StyleDefList.push(detailStyle);
-										$this.activelist.push({
-											active: false
-										});
-										//list.push(info);
 									});
-								}
 
-								// 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�-								// $this.scrollTop = $this.old.scrollTop;
-								$this.isScroll = false;
-								setTimeout(function() {
-									$this.isScroll = true;
-								}, 1000);
-								// console.log($this.detail1StyleDefList);
+									detailStyle.form.htmlobjId = obj.id ? obj.id.replace(
+											/-/g, '')
+										.replace('{', '').replace('}', '') : 'null';
+									detailStyle.form.objId = obj.id;
+									detailStyle.form.attrs = obj.attr_list;
+									detail1StyleDefList.push(detailStyle);
+									// $this.activelist.push({
+									// 	active: false
+									// });
+									//list.push(info);
+								});
+								$this.setData({
+									detail1StyleDefList: detail1StyleDefList
+								})
 							}
 
-
-
-						} else {
-							uni.showModal({
-								title: this.translateSys("error") + "5",
-								content: ret.err_msg,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
+							// 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�+							// $this.scrollTop = $this.old.scrollTop;
+							$this.isScroll = false;
+							setTimeout(function() {
+								$this.isScroll = true;
+							}, 1000);
+							// console.log($this.detail1StyleDefList);
 						}
+
+
+
+
 					}).catch(ex => {
 						// console.log(ex);
 						uni.showModal({
 							title: this.translateSys("error") + "5.1",
 							content: ex.errMsg,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 					});
 				} catch (ex) {
@@ -890,7 +765,7 @@
 						title: this.translateSys("error") + "5.2",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -900,7 +775,7 @@
 				//鍒锋柊褰撳墠椤甸潰
 				this.initial();
 				// uni.redirectTo({
-				// 	url:'../modal/3200?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title,
+				// 	url:'../modal/3200?param='+JSON.stringify(this.param)+"&titlename="+this.title,
 				// });
 			},
 			//鐐瑰嚮鏄剧ず娴忚瀵硅薄鏄剧ず椤甸潰
@@ -910,7 +785,8 @@
 						this.styledef = style;
 						var $this = this;
 						uni.navigateTo({
-							url: '../modal/3200_view?param=' + JSON.stringify(this.param) + "&titlename=" +
+							url: '../modal/3200_view?param=' + JSON.stringify(this.param) +
+								"&titlename=" +
 								this.title + "&style=" + JSON.stringify(style),
 							events: {
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
@@ -927,7 +803,8 @@
 												obj_attr[attr.name] = attr.value;
 											});
 											// console.log(obj_attr);
-											var input_param = Base64.encode(JSON.stringify(obj_attr));
+											var input_param = Base64.encode(JSON.stringify(
+												obj_attr));
 											$this.runCustomEvent({
 												ed_type: 0,
 												start_transaction: true,
@@ -943,7 +820,8 @@
 												title: this.translateSys("error"),
 												content: tip,
 												showCancel: false,
-												confirmText: this.translateSys("cancel")
+												confirmText: this.translateSys(
+													'close')
 											});
 										}
 									}
@@ -960,15 +838,24 @@
 					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('鐢ㄦ埛鐐瑰嚮鍙栨秷');
 							}
 						}
 					});
-				} else that.onButtonClicked(btn, style);
+				} else {
+					this.handleButtonClick((done) => {
+						that.onButtonClicked(btn, style);
+						setTimeout(() => {
+							done(); // 閲嶇疆鐘舵�
+						}, 1000);
+					});
+				}
 			},
 			//鐐瑰嚮鎸夐挳鍒楄〃
 			actionSheetTap() {
@@ -987,8 +874,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);
 										// } else if (res.cancel) {
 										// 	console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -1018,7 +907,7 @@
 								title: this.translateSys("tip"),
 								content: this.translateSys("unrealized"),
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						}
 					} else if (btn.FunCode == "Delete") {
@@ -1038,7 +927,7 @@
 							title: this.translateSys("tip"),
 							content: this.translateSys("unrealized"),
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 					}
 				} catch (ex) {
@@ -1047,7 +936,7 @@
 						title: this.translateSys("error"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -1062,7 +951,8 @@
 				};
 				var $this = this;
 				uni.navigateTo({
-					url: '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg.Name +
+					url: '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn
+						.Edit_dlg.Name +
 						"&type=addDataObj",
 					events: {
 						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁
@@ -1080,10 +970,13 @@
 				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 + '}';
+							if (!style.form.objId.includes('{')) objID = '{' + style.form
+								.objId + '}';
 
 							var dataInfo = {
 								class_id: btn.Cls_ID,
@@ -1091,40 +984,37 @@
 								obj_id: objID
 							};
 							// console.log(dataInfo);
-							$this.$store.dispatch('dataObjDel', dataInfo).then(ret => {
-								// console.log(ret);
-								if (ret.err_code == 0) {
-									//鎵ц鍚庡鐞嗕簨浠�-									$this.AfterProcess_Event(btn.clsId, btm.AfterProcess_Event,
-										enviroment);
-									//娓呴櫎褰撳墠鍒楄〃鏁版嵁
-									$this.detail1StyleDefList.forEach((ele, index) => {
-										if (ele.form.objId == objID) {
-											$this.detail1StyleDefList.splice(index, 1);
-										}
-									});
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translate("delete_success"),
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
 
-								} else {
-									uni.showModal({
-										title: this.translateSys("error") + "6.1",
-										content: ret.err_msg,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-								}
+							dataObjDel(dataInfo).then(ret => {
+								//鎵ц鍚庡鐞嗕簨浠�+								$this.AfterProcess_Event(btn.clsId, btm
+									.AfterProcess_Event,
+									enviroment);
+								//娓呴櫎褰撳墠鍒楄〃鏁版嵁
+								$this.detail1StyleDefList.forEach((ele,
+									index) => {
+									if (ele.form.objId == objID) {
+										$this.detail1StyleDefList
+											.splice(index, 1);
+									}
+								});
+								uni.showModal({
+									title: this.translateSys("tip"),
+									content: this.translate(
+										"delete_success"),
+									showCancel: false,
+									confirmText: this.translateSys(
+										'close')
+								});
 							}).catch(ex => {
 								// console.log(ex);
 								uni.showModal({
-									title: this.translateSys("error") + "6",
+									title: this.translateSys("error") +
+										"6",
 									content: ex.errMsg,
 									showCancel: false,
-									confirmText: this.translateSys("cancel")
+									confirmText: this.translateSys(
+										'close')
 								});
 							});
 						} else if (res.cancel) {
@@ -1146,8 +1036,7 @@
 
 					if (!this.ListPageHtml_Show.event.id) {
 						//鍒ゆ柇娌℃湁HTML椤甸潰浜嬩欢
-						// console.log(this.detail2_styledef);
-						this.detail2_styledef.form.items.forEach(async (ele, index) => {
+						this.head_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.name != "Layout") {
 								if (!obj_attr[ele.fieldId]) {
 									obj_attr[ele.fieldId] = ele.value;
@@ -1156,7 +1045,8 @@
 								ele.setting.colList.forEach(async (col, key) => {
 									if (col) {
 										if (!obj_attr[col.fieldId]) {
-											obj_attr[col.fieldId] = col.value;
+											obj_attr[col.fieldId] = col
+												.value;
 										}
 									}
 								});
@@ -1172,168 +1062,153 @@
 						data_obj_id: this.styledef.form.objId,
 						obj_attr: obj_attr,
 					}
-					this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
-						// console.log(ret);
-						if (ret.err_code == 0) {
-							var result = ret.result;
-							if (result.ret != 0) {
-								var tip = result.err_info ? typeof result.err_info ==
-									'string' ?
-									result
-									.err_info : result.err_info.join('<br/>') : '';
-								if (result.ret == 801) {
-									if (this.param.Only_Script_Error) {
-										let pos = tip.indexOf("锛�);
-										if (pos > -1) tip = tip.substring(pos + 1);
-									}
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: tip,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-								} else uni.showModal({
-									title: this.translateSys("tip"),
-									content: tip + ',' + this.translateSys('tip') +
-										':' +
-										result
-										.ret,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
-								return false;
-							} else {
-								var tip = result.info ? typeof result.info == 'string' ? result
-									.info :
-									result.info.join('<br/>') : '';
-								if (tip) uni.showModal({
-									title: this.translateSys("tip"),
-									content: tip,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
-
+					var result = await runCustomEvent(dataInfo)
+					if (result.ret != 0) {
+						var tip = result.err_info ? typeof result.err_info ==
+							'string' ?
+							result
+							.err_info : result.err_info.join('<br/>') : '';
+						if (result.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
 							}
-						} else {
 							uni.showModal({
-								title: this.translateSys("error") + "8",
-								content: ret.err_msg,
+								title: this.translateSys("tip"),
+								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
-						}
-
-					}).catch(ex => {
-						// console.log(ex);
-						uni.showModal({
-							title: this.translateSys("error") + "8.1",
-							content: ex.errMsg,
+						} 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 {
+						var tip = result.info ? typeof result.info == 'string' ?
+							result
+							.info :
+							result.info.join('<br/>') : '';
+						tip = tip || result.err_info
+						if (tip) uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys('close')
+						});
+
+					}
 				} catch (ex) {
 					var tip = typeof ex == "string" ? ex : ex.message;
 					uni.showModal({
 						title: this.translateSys("error"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					this.showError(ex);
 				}
 			},
 			//璺宠浆
 			async RelatedFunction(btn, style, enviroment) {
-				const defCode = btn.Related_Function?.Def_Code
-				var $this = this;
-				if (
-					defCode == "3018" ||
-					defCode == "3037" ||
-					defCode == "3200" ||
-					defCode == "3201" ||
-					defCode == "5600" ||
-					defCode == "5601" ||
-					defCode == "5602"
-				) {
 
-					let name = defCode
-					if (defCode == "3018" || defCode == "3037")
-						name = defCode + "_2"
-					var json = {
-						app_id: [btn.Related_Function.ID],
-					};
-					console.log("RelatedFunction2", json);
-					this.$store.dispatch('appGetInfo', json).then(success => {
-						console.log(success);
-						if (success.err_code == 0) {
-							if ((success.result || []).length > 0) {
-								const app = success.result[0]
-								var param = "";
-								var appName = app.list_name || app.name
-									.Name;
-								var paramStr = app.param
-								if (paramStr) {
-									//mobox2鐨刾aram鏄痡son瀛楃涓�-									param = paramStr.replace(/\\/g, "");
-									//mobox3鐨刾aram鏄痓ase64瀛楃涓�-									if (!paramStr.includes('"')) param = Base64.decode(paramStr);
-								}
-								if (!param) {
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: this.translate('tip_no_app_param'),
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-									return;
-								}
+				try {
+					const defCode = btn.Related_Function?.Def_Code
+					var $this = this;
+					if (
+						defCode == "3018" ||
+						defCode == "3037" ||
+						defCode == "3200" ||
+						defCode == "3201" ||
+						defCode == "5600" ||
+						defCode == "5601" ||
+						defCode == "5602"
+					) {
 
-								uni.navigateTo({
-									url: '../modal/' + name + '?param=' + param + "&titlename=" +
-										appName +
-										"&type=relatedFunction&paramValue=" + JSON.stringify(style
-											.form),
-									events: {
-										relatedFunction: function(data) {
-											console.log(data);
-											$this.Refresh();
-										},
-									}
-								});
-							} else {
-								uni.showModal({
-									title: this.translateSys("error"),
-									content: this.translate("function_not_exist"),
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
+						let name = defCode
+						if (defCode == "3018" || defCode == "3037")
+							name = defCode + "_2"
+						var json = {
+							app_id: [btn.Related_Function.ID],
+						};
+						console.log("RelatedFunction2", json);
+						const result = await appGetInfo(json)
+						if ((result || []).length > 0) {
+							var app = result[0];
+							var param = "";
+							var appName = app.list_name || app.name
+								.Name;
+							var paramStr = app.param
+							if (paramStr) {
+								//mobox2鐨刾aram鏄痡son瀛楃涓�+								param = paramStr.replace(/\\/g, "");
+								//mobox3鐨刾aram鏄痓ase64瀛楃涓�+								if (!paramStr.includes('"')) param = Base64.decode(
+									paramStr);
 							}
+							if (!param) {
+								uni.showModal({
+									title: this.translateSys("tip"),
+									content: this.translate(
+										'tip_no_app_param'),
+									showCancel: false,
+									confirmText: this.translateSys(
+										'close')
+								});
+								return;
+							}
+
+							uni.navigateTo({
+								url: '../modal/' + name + '?param=' +
+									param + "&titlename=" +
+									appName +
+									"&type=relatedFunction&paramValue=" +
+									JSON.stringify(style
+										.form),
+								events: {
+									relatedFunction: function(data) {
+										console.log(data);
+										$this.Refresh();
+									},
+								}
+							});
 						} else {
 							uni.showModal({
 								title: this.translateSys("error"),
-								content: success.msg,
+								content: this.translate(
+									"function_not_exist"),
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						}
-					}).catch(ex => {
-						console.log(ex);
+
+					} else {
 						uni.showModal({
 							title: this.translateSys("error"),
-							content: ex.errMsg,
+							content: this.translate("cannot_related_function"),
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
-					});
-				} else {
+
+					}
+				} catch (ex) {
+					console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
 						title: this.translateSys("error"),
-						content: this.translate("cannot_related_function"),
+						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
-
+					return undefined
 				}
 			},
 			//鎵ц鍚庡鐞嗕簨浠�@@ -1354,7 +1229,7 @@
 						title: this.translateSys("error") + "7",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -1363,42 +1238,40 @@
 				// var $ele = e;
 				//console.log(e.target)
 				getApp().onScan((result) => {
-					console.log(result.decodedata);
-					item.value = result.decodedata;
+					console.log(result);
+					item.value = result;
 					uni.hideKeyboard();
 					var $this = this;
-
 					console.log(item);
-					if (item.oldvalue != item.value) {
-						item.oldvalue = item.value;
+					let newVal = item.value.trim()
+					if (newVal) {
+						item.oldvalue = newVal;
+
 						var attr = item.fieldId;
-						this.head_styledef.form.model[attr] = item.value;
+						this.head_styledef.form.model[attr] = newVal;
 						var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� 						var onSuffixClickCallbackEvent = item.bind
 							.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�-						var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�+						var onSuffixClickEvent = item.bind
+							.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 						var isflag = false;
 
 						if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠� 							$this.onChange(onChangeEvent);
 						} else {
-							$this.where = '';
-							if (item.value)
-								$this.where = item.fieldId + " like '%" + item.value + "%'";
+							$this.where = item.fieldId + " like '%" + newVal + "%'";
 							$this.query_id = '';
 							$this.pageindex = 1;
 							$this.detail1StyleDefList = [];
 							$this.loadDataGetList();
 						}
-						if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�-							$this.focusMateria = true; //鍒濆鍖栵紝绗簩涓緭鍏ユfocus灞炴�
-							// setTimeout(function(){
-							// 	$this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
-							setTimeout(function() {
-								uni.hideKeyboard();
-							}, 1000);
-							// },500);
-						}
+						$this.focusMateria = true; //鍒濆鍖栵紝绗簩涓緭鍏ユfocus灞炴�
+						// setTimeout(function(){
+						// 	$this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
+						setTimeout(function() {
+							uni.hideKeyboard();
+						}, 1000);
+						// },500);
 						// if(onSuffixClickCallbackEvent.id){   //鍚庡浘鏍囩偣鍑讳簨浠� 						//   this.onSuffixClick(onSuffixClickCallbackEvent);
 						// }
@@ -1408,23 +1281,29 @@
 					}
 				})
 			},
+
 			onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
 				// console.log(item);
-				if (item.oldvalue != item.value) {
-					item.oldvalue = item.value;
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+					if (!newVal)
+						return
+				}
+				if (item.oldvalue != newVal) {
+					item.oldvalue = newVal;
 					var attr = item.fieldId;
-					this.head_styledef.form.model[attr] = item.value;
+					this.head_styledef.form.model[attr] = newVal;
 					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-					var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+					var onSuffixClickCallbackEvent = item.bind
+						.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 					var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 					var isflag = false;
 
 					if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠� 						this.onChange(onChangeEvent);
 					} else {
-						this.where = '';
-						if (item.value)
-							this.where = item.fieldId + " like '%" + item.value + "%'";
+						this.where = item.fieldId + " like '%" + item.value + "%'";
 						this.query_id = '';
 						this.pageindex = 1;
 						this.detail1StyleDefList = [];
@@ -1456,7 +1335,7 @@
 						var dataInfo = {
 							ed_type: 0,
 							start_transaction: true,
-							class_id: this.$data.head_styledef.form.clsId,
+							class_id: this.head_styledef.form.clsId,
 							class_name: '',
 							event_id: event.id,
 							event_name: '',
@@ -1472,99 +1351,133 @@
 							global_attr: '',
 							input_param: input_param,
 						};
-						this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
-							// console.log(ret);
-							if (ret.err_code == 0) {
-								var result = ret.result;
-								if (result.ret != 0) {
-									var tip = result.err_info ? typeof result.err_info ==
-										'string' ?
-										result
-										.err_info : result.err_info.join('<br/>') : '';
-									if (result.ret == 801) {
-										if (this.param.Only_Script_Error) {
-											let pos = tip.indexOf("锛�);
-											if (pos > -1) tip = tip.substring(pos + 1);
-										}
-										uni.showModal({
-											title: this.translateSys("tip"),
-											content: tip,
-											showCancel: false,
-											confirmText: this.translateSys("cancel")
-										});
-									} else uni.showModal({
-										title: this.translateSys("tip"),
-										content: tip + ',' + this.translateSys('tip') +
-											':' +
-											result
-											.ret,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-									return false;
-								} else {
-									var tip = result.info ? typeof result.info == 'string' ? result
-										.info :
-										result.info.join('<br/>') : '';
-									if (tip) uni.showModal({
-										title: this.translateSys("tip"),
+						runCustomEvent(dataInfo).then(result => {
+							// console.log(result);
+							if (result.ret != 0&& result.ret != 1) {
+								var tip = result.err_info ? typeof result
+									.err_info ==
+									'string' ?
+									result
+									.err_info : result.err_info.join(
+										'<br/>') : '';
+								if (result.ret == 801) {
+									if (this.param.Only_Script_Error) {
+										let pos = tip.indexOf("锛�);
+										if (pos > -1) tip = tip.substring(
+											pos + 1);
+									}
+									uni.showModal({
+										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(
+										'close')
+								});
+								return false;
+							} else {
+								var tip = result.info ? typeof result
+									.info == 'string' ? result
+									.info :
+									result.info.join('<br/>') : '';
+								tip = tip || result.err_info
+								if (tip) uni.showModal({
+									title: this.translateSys(
+										"tip"),
+									content: tip,
+									showCancel: false,
+									confirmText: this.translateSys(
+										'close')
+								});
+								if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+									if (result.result_type == 2) {
 
-									if (result.result_type == 0 && result.action) {
-										result.action.forEach(item => {
-											if (item.action_type == "set_dlg_attr") {
-												// value = {"attr":"xxx", "value":"xxx"}
-												var data = item.value;
-												$this.$data.head_styledef.form.items
-													.forEach(
-														async (
-															ele, index) => {
-															data.forEach(async (ele2,
-																index) => {
-																if (ele
-																	.fieldId ==
-																	ele2
-																	.attr
-																) {
-																	ele.value =
-																		ele2
-																		.value;
-																}
-															});
-														});
-											}
-										});
-									} else {
-										// this.detail2StyleDefList=[];
-										if (result.info) {
+									} else if (typeof result.result == 'string') {
+										if (result.result) {
 											uni.showModal({
-												title: this.translateSys("tip"),
-												content: result.info,
+												title: this.translateSys('tip'),
+												content: result.result,
 												showCancel: false,
-												confirmText: this.translateSys("cancel")
+												confirmText: this.translateSys('close')
 											});
 										}
 									}
-								}
+									try {
+										var actionlist = result.action || []
+										for (var j = 0; j < actionlist.length; j++) {
+											var action = actionlist[j];
+											var action_type = action.action_type;
+											var value = action.value;
+											if (action_type == "set_dlg_attr") {
+												if (value) {
+													this.setFormValues(value)
+												}
+											} else if (action_type == "set_subtable_page_content") {
+												if (value.clear_confirm != false && value.clear == true &&
+													$this.detail1StyleDefList.length > 0
+												) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹�+													uni.showModal({
+														title: this.translateSys('tip'),
+														content: this.translate(
+															"are_you_sure_clear_data"),
+														cancelText: $this.translateSys('ok'),
+														confirmText: $this.translateSys('cancel'),
+														success: function(res) {
+															if (res.cancel) {
+																$this.detail1StyleDefList = [];
+																$this.viewAceionContent(value);
+															} else if (res.confirm) {
+																$this.detail1StyleDefList = [];
+																$this.viewAceionContent(value);
+															}
+														}
+													});
+												} else {
+													$this.detail1StyleDefList = [];
+													$this.viewAceionContent(value);
+												}
+											}
+										}
 
-							} else {
-								uni.showModal({
-									title: this.translateSys("error") + "8",
-									content: ret.err_msg,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
+									} catch (ex) {
+										let actionList = (result.action || []).map(a => a.action_type).join(
+											';')
+										let tip = typeof ex == 'string' ? ex : ex.message
+										tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: tip,
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+										console.log(ex)
+										return
+									}
+								}
 							}
+
+
 						}).catch(ex => {
 							// console.log(ex);
 							uni.showModal({
-								title: this.translateSys("error") + "8.1",
+								title: this.translateSys("error") +
+									"8.1",
 								content: ex.errMsg,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys(
+									'close')
 							});
 						});
 					}
@@ -1572,111 +1485,314 @@
 					var tip = typeof ex == "string" ? ex : ex.message;
 					uni.showModal({
 						title: this.translateSys("error") + "8.2",
-						content: this.translate('execute_after_change_event_failed') + this
+						content: this.translate(
+								'execute_after_change_event_failed') + this
 							.translateSys(
 								"comma") +
-							this.translate('reason') + this.translateSys("colon") + tip,
+							this.translate('reason') + this.translateSys(
+								"colon") + tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 
 				}
 			},
+			setFormValues(attrs) {
+				const head_styledef = this.head_styledef
+				if (JSON.stringify(attrs) == '{}') {
+					return;
+				}
+				attrs.forEach(async (attr, key) => {
+					if (attr.choice_list) {
+						var dictItemList = [];
+						attr.choice_list.forEach(async (val, index) => {
+							dictItemList.push({
+								text: val,
+								value: val
+							});
+						});
+						head_styledef.form.items.forEach(async (attr_item, index) => {
+							if (attr_item.name != "Layout") {
+								if (attr_item.fieldId == attr.attr) {
+									if (attr_item.useDict) {
+										attr_item.dict = dictItemList;
+									} else {
+										attr_item.selections = dictItemList;
+									}
+								}
+							} else if (attr_item.name == "Layout") {
+								attr_item.setting.colList.forEach((col) => {
+									if (col) {
+										if (col.fieldId == attr.attr) {
+											if (col.useDict) {
+												col.dict = dictItemList;
+											} else {
+												col.selections = dictItemList;
+											}
+										}
+									}
+								});
+							}
+						});
+					}
+					if (!head_styledef.form.model[attr.attr]) {
+						head_styledef.form.model[attr.attr] = attr.value;
+					}
+					head_styledef.form.items.forEach(async (ele) => {
+						if (ele.name != "Layout") {
+							if (ele.fieldId == attr.attr) {
+								ele.value = attr.value;
+								ele.oldvalue = attr.value;
+								if (ele.name == "Input") {
+									if (attr.prompt) ele.placeholder = attr.prompt;
+								}
+								if (attr.enable !== undefined) {
+									if (attr.enable) ele.disabled = false;
+									else ele.disabled = true;
+								}
+							}
+						} else if (ele.name == "Layout") {
+							ele.setting.colList.forEach((col) => {
+								if (col) {
+									if (col.fieldId == attr.attr) {
+										col.value = attr.value;
+										col.oldvalue = attr.value;
+										if (col.name == "Input") {
+											if (attr.prompt) col.placeholder = attr.prompt;
+										}
+										if (attr.enable !== undefined) {
+											if (attr.enable) col.disabled = false;
+											else col.disabled = true;
+										}
+									}
+								}
+							});
+						}
+
+					})
+					//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+				})
+				console.log(head_styledef)
+				this.setData({
+					head_styledef: head_styledef
+				})
+			},
+			//鍔犺浇宸茬爜鐩樺唴瀹�+			viewAceionContent(data) {
+				var $this = this;
+				if (JSON.stringify(data.content) == '{}') {
+					return;
+				}
+				var styleStr = JSON.stringify($this.detail1_styledef);
+				data.content.forEach(cont => {
+					let detailStyle = JSON.parse(styleStr);
+					if (detailStyle.form) {
+
+
+						detailStyle.SelBut_Checked = data.checkbox ?? true;
+
+						detailStyle.form.objId = cont.id;
+						detailStyle.form.htmlobjId = cont.id ? cont.id.replace(/-/g,
+								'')
+							.replace('{', '').replace('}',
+								'') : 'null';
+						detailStyle.form.attrs = cont.attrs;
+						cont.attrs.forEach(attr => {
+							detailStyle.form.items.forEach(ele => {
+								if (ele.name != 'Layout') {
+									if (ele.fieldId == attr.attr)
+										ele.value = attr.value;
+								} else if (ele.name == 'Layout') {
+									ele.setting.colList.forEach(
+										col => {
+											if (col) {
+												if (col.fieldId ==
+													attr.attr)
+													col.value = attr.value;
+											}
+										});
+								}
+							});
+						});
+						//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+						if (data.clear == false) {
+							var isflag = true;
+							$this.detail1StyleDefList.forEach((style, index) => {
+								if (style.form.objId == detailStyle.form.objId) {
+									cont.attrs.forEach(attr => {
+										style.form.items.forEach(ele => {
+											if (ele.name != 'Layout') {
+												if (ele.fieldId == attr.attr)
+													ele.value = attr.value;
+											} else if (ele.name == 'Layout') {
+												ele.setting.colList.forEach(
+													col => {
+														if (col) {
+															if (col.fieldId ==
+																attr
+																.attr)
+																col.value =
+																attr.value;
+														}
+													});
+											}
+										});
+									});
+									isflag = false;
+								}
+							});
+							if (isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+						} else {
+							$this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+						}
+					}
+				});
+
+			},
+
+			onDetail1EnterChange() {},
 			//鐐逛腑琛ㄥ崟
 			onPanelClick(value) { //鐐瑰嚮闈㈡澘楂樹寒鏄剧ず
 				// console.log(value);
-				this.activelist.forEach(ele => {
-					ele.active = false;
-				});
-				this.activelist[value].active = true;
+				this.setData({
+					activeItem: this.detail1StyleDefList[value]
+				})
+				// this.activelist.forEach(ele => {
+				// 	ele.active = false;
+				// });
+				// this.activelist[value].active = true;
 			},
 
 			//浜嬩欢澶勭悊
 			async runCustomEvent(dataInfo) {
 				try {
 					var $this = this;
-					this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
-						console.log(ret);
-						if (ret.err_code == 0) {
-							var result = ret.result;
-							if (result.ret != 0) {
-								var tip = result.err_info ? typeof result.err_info ==
-									'string' ?
-									result
-									.err_info : result.err_info.join('<br/>') : '';
-								if (result.ret == 801) {
-									if (this.param.Only_Script_Error) {
-										let pos = tip.indexOf("锛�);
-										if (pos > -1) tip = tip.substring(pos + 1);
-									}
-									uni.showModal({
-										title: this.translateSys("tip"),
-										content: tip,
-										showCancel: false,
-										confirmText: this.translateSys("cancel")
-									});
-								} else uni.showModal({
-									title: this.translateSys("tip"),
-									content: tip + ',' + this.translateSys('tip') +
-										':' +
-										result.ret,
-									showCancel: false,
-									confirmText: this.translateSys("cancel")
-								});
-								return false;
-							} else {
-								var tip = result.info ? typeof result.info == 'string' ? result
-									.info : result
-									.info.join('<br/>') : '';
-								if (tip) uni.showModal({
-									title: this.translateSys("tip"),
+					runCustomEvent(dataInfo).then(result => {
+						console.log(result);
+
+						if (result.ret != 0&& result.ret != 1) {
+							var tip = result.err_info ? typeof result
+								.err_info ==
+								'string' ?
+								result
+								.err_info : result.err_info.join(
+									'<br/>') : '';
+							if (result.ret == 801) {
+								if (this.param.Only_Script_Error) {
+									let pos = tip.indexOf("锛�);
+									if (pos > -1) tip = tip.substring(
+										pos + 1);
+								}
+								uni.showModal({
+									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(
+									'close')
+							});
+							return false;
+						} else {
+							var tip = result.info ? typeof result
+								.info == 'string' ? result
+								.info : result
+								.info.join('<br/>') : '';
+							tip = tip || result.err_info
+							if (tip) uni.showModal({
+								title: this.translateSys(
+									"tip"),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys(
+									'close')
+							});
+							if ([0, 2, 3, 4, -1].includes(result.result_type)) {
+								if (result.result_type == 2) {
 
-								if (result.result_type == 0 && result.action) {
-									result.action.forEach(item => {
+								} else if (typeof result.result == 'string') {
+									if (result.result) {
+										uni.showModal({
+											title: this.translateSys('tip'),
+											content: result.result,
+											showCancel: false,
+											confirmText: this.translateSys('close')
+										});
+									}
+								}
+								try {
+									var actionList = result.action || []
+									actionList.forEach(item => {
 										if (item.action_type ==
-											"goback_to_pre_page") { //杩斿洖涓婁竴椤�+											"goback_to_pre_page"
+										) { //杩斿洖涓婁竴椤� 											var value = item.value;
 											uni.navigateBack({
 												delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
 											});
-										} else if (item.action_type ==
-											"hidden_button") { //闅愯棌鎸夐挳
+										} else if (item
+											.action_type ==
+											"hidden_button"
+										) { //闅愯棌鎸夐挳
 											var value = item.value;
 											value.forEach(btn => {
-												var index = $this.param
+												var index =
+													$this
+													.param
 													.ListPage
 													.Page_Button
-													.findIndex(button => button
+													.findIndex(
+														button =>
+														button
 														.ShowName ==
-														btn)
-												if (index > -1)
-													$this.param.ListPage
-													.Page_Button.splice(
-														index, 1)
+														btn
+													)
+												if (index >
+													-1)
+													$this
+													.param
+													.ListPage
+													.Page_Button
+													.splice(
+														index,
+														1)
 											})
 											// } else if(item.action_type == "refresh_cur_row"){ //
 											// 	var value = item.value;
-										} else if (item.action_type ==
-											"set_panel_html") { //鏄剧ずHtml椤甸潰
+										} else if (item
+											.action_type ==
+											"set_panel_html"
+										) { //鏄剧ずHtml椤甸潰
 											// var value = item.value;
-											$this.ListHtml_Panel = item.value;
+											$this.ListHtml_Panel =
+												item.value;
 											// $this.detail1StyleDefList.forEach((ele,index)=>{
 											// 	ele.ListHtml_Panel = item.value[index];
 											// });
 
 										} else {
 											uni.showModal({
-												title: this.translateSys(
-													"tip"),
-												content: this.translateSys(
+												title: this
+													.translateSys(
+														"tip"
+													),
+												content: this
+													.translateSys(
 														"quotation_mark_left"
 													) +
 													item
-													.action_type + this
+													.action_type +
+													this
 													.translateSys(
 														"quotation_mark_right"
 													) +
@@ -1685,50 +1801,54 @@
 														"tip_action_unprocessed"
 													),
 												showCancel: false,
-												confirmText: this.translateSys(
-													"cancel")
+												confirmText: this
+													.translateSys(
+														'close'
+													)
 											});
 										}
 									});
-								} else {
-									// this.detail2StyleDefList=[];
-									if (result.info) {
-										uni.showModal({
-											title: this.translateSys("tip"),
-											content: result.info,
-											showCancel: false,
-											confirmText: this.translateSys("cancel")
-										});
-									}
+
+								} catch (ex) {
+									let actionList = (result.action || []).map(a => a.action_type).join(';')
+									let tip = typeof ex == 'string' ? ex : ex.message
+									tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+									uni.showModal({
+										title: this.translateSys('tip'),
+										content: tip,
+										showCancel: false,
+										confirmText: this.translateSys('close')
+									});
+									console.log(ex)
+									return
 								}
 							}
 
-						} else {
-							uni.showModal({
-								title: this.translateSys("error") + "9",
-								content: ret.err_msg,
-								showCancel: false,
-								confirmText: this.translateSys("cancel")
-							});
 						}
+
+
 					}).catch(ex => {
 						// console.log(ex);
 						uni.showModal({
-							title: this.translateSys("error") + "9.1",
+							title: this.translateSys("error") +
+								"9.1",
 							content: ex.errMsg,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys(
+								'close')
 						});
 					});
 				} catch (ex) {
 					var tip = typeof ex == "string" ? ex : ex.message;
 					uni.showModal({
 						title: this.translateSys("error") + "9.2",
-						content: this.translate('execute_event_failed') + this.translateSys(
+						content: this.translate('execute_event_failed') +
+							this.translateSys(
 								"comma") +
-							this.translate('reason') + this.translateSys("colon") + tip,
+							this.translate('reason') + this.translateSys(
+								"colon") + tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 
 				}
@@ -1766,58 +1886,77 @@
 			toWhereBase64String(list) {
 				if (typeof list == 'string') list = [list]
 				var sql = []
-				var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
+				var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=',
+					'>', ' like'
+				]
 				list.forEach(ls => {
 					var where = ls.trim()
-					if (where.startsWith('(') && where.endsWith(')')) where = where.replace(
-						/^\(/,
-						'').replace(
-						/\)$/, '')
+					if (where.startsWith('(') && where.endsWith(')'))
+						where = where.replace(
+							/^\(/,
+							'').replace(
+							/\)$/, '')
 					if (where.toLowerCase().includes(' and ')) {
 						// 浜岀骇and鏀惧湪绗竴绾ф暟缁勪腑
 						where.split(/ and /i).forEach(li => {
 							var l = li.trim()
-							if (l.startsWith('(') && l.endsWith(')')) l = l.replace(
+							if (l.startsWith('(') && l.endsWith(
+									')')) l = l.replace(
 								/^\(/,
 								'').replace(
 								/\)$/, '')
 							var sep = ''
 							for (var i = 0; i < seps.length; i++) {
-								if (l.toLowerCase().includes(seps[i])) {
+								if (l.toLowerCase().includes(seps[
+										i])) {
 									sep = seps[i]
 									break
 								}
 							}
 							if (sep) {
-								var values = l.split(new RegExp(sep, 'i'))
-								var field = values[0]?.trim().replace(/^\[/, '')
+								var values = l.split(new RegExp(
+									sep, 'i'))
+								var field = values[0]?.trim()
+									.replace(/^\[/, '')
 									.replace(
 										/\]$/, '')
 								var value = ''
 								var op = sep.trim()
 
-								if ([' in', ' not in'].includes(sep) && values[1]
+								if ([' in', ' not in'].includes(
+										sep) && values[1]
 									?.toLowerCase().includes(
-										'select ') && values[1]?.toLowerCase()
+										'select ') && values[1]
+									?.toLowerCase()
 									.includes(
 										' from ')) {
-									value = l.replace(field, '').replace(
-										/^\s*(in|not in)\s*/i, '').trim()
-									if (value.startsWith('(') && value.endsWith(')'))
+									value = l.replace(field, '')
+										.replace(
+											/^\s*(in|not in)\s*/i,
+											'').trim()
+									if (value.startsWith('(') &&
+										value.endsWith(')'))
 										value = value
-										.replace(/^\(/, '').replace(/\)$/, '').trim()
+										.replace(/^\(/, '')
+										.replace(/\)$/, '').trim()
 								} else {
-									value = values[1]?.trim().replace(/^\'/, '')
+									value = values[1]?.trim()
+										.replace(/^\'/, '')
 										.replace(
 											/\'$/, '')
 
-									if (['in', 'not in'].includes(op)) {
-										value = value.replace(/^\(/, '').replace(/\)$/,
+									if (['in', 'not in'].includes(
+											op)) {
+										value = value.replace(
+											/^\(/, '').replace(
+											/\)$/,
 											'')
-										value = value.split(',').map(v => v.trim()
-											.replace(
-												/^\'/, '')
-											.replace(/\'$/, ''))
+										value = value.split(',')
+											.map(v => v.trim()
+												.replace(
+													/^\'/, '')
+												.replace(/\'$/, '')
+											)
 									}
 								}
 								sql.push([{
@@ -1832,47 +1971,63 @@
 						var s = []
 						where.split(/ or /i).forEach(li => {
 							var l = li.trim()
-							if (l.startsWith('(') && l.endsWith(')')) l = l.replace(
+							if (l.startsWith('(') && l.endsWith(
+									')')) l = l.replace(
 								/^\(/,
 								'').replace(
 								/\)$/, '')
 							var sep = ''
 							for (var i = 0; i < seps.length; i++) {
-								if (l.toLowerCase().includes(seps[i])) {
+								if (l.toLowerCase().includes(seps[
+										i])) {
 									sep = seps[i]
 									break
 								}
 							}
 							if (sep) {
-								var values = l.split(new RegExp(sep, 'i'))
-								var field = values[0]?.trim().replace(/^\[/, '')
+								var values = l.split(new RegExp(
+									sep, 'i'))
+								var field = values[0]?.trim()
+									.replace(/^\[/, '')
 									.replace(
 										/\]$/, '')
 								var value = ''
 								var op = sep.trim()
 
-								if ([' in', ' not in'].includes(sep) && values[1]
+								if ([' in', ' not in'].includes(
+										sep) && values[1]
 									?.toLowerCase().includes(
-										'select ') && values[1]?.toLowerCase()
+										'select ') && values[1]
+									?.toLowerCase()
 									.includes(
 										' from ')) {
-									value = l.replace(field, '').replace(
-										/^\s*(in|not in)\s*/i, '').trim()
-									if (value.startsWith('(') && value.endsWith(')'))
+									value = l.replace(field, '')
+										.replace(
+											/^\s*(in|not in)\s*/i,
+											'').trim()
+									if (value.startsWith('(') &&
+										value.endsWith(')'))
 										value = value
-										.replace(/^\(/, '').replace(/\)$/, '').trim()
+										.replace(/^\(/, '')
+										.replace(/\)$/, '').trim()
 								} else {
-									value = values[1]?.trim().replace(/^\'/, '')
+									value = values[1]?.trim()
+										.replace(/^\'/, '')
 										.replace(
 											/\'$/, '')
 
-									if (['in', 'not in'].includes(op)) {
-										value = value.replace(/^\(/, '').replace(/\)$/,
+									if (['in', 'not in'].includes(
+											op)) {
+										value = value.replace(
+											/^\(/, '').replace(
+											/\)$/,
 											'')
-										value = value.split(',').map(v => v.trim()
-											.replace(
-												/^\'/, '')
-											.replace(/\'$/, ''))
+										value = value.split(',')
+											.map(v => v.trim()
+												.replace(
+													/^\'/, '')
+												.replace(/\'$/, '')
+											)
 									}
 								}
 								sql.push([{
@@ -1887,7 +2042,8 @@
 						var li = where
 						// 鍗曚竴鏌ヨ鏉′欢鐩存帴鏀惧湪绗竴绾ф暟缁勪腑
 						var l = li.trim()
-						if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '')
+						if (l.startsWith('(') && l.endsWith(')')) l = l
+							.replace(/^\(/, '')
 							.replace(
 								/\)$/, '')
 						var sep = ''
@@ -1899,24 +2055,32 @@
 						}
 						if (sep) {
 							var values = l.split(new RegExp(sep, 'i'))
-							var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
+							var field = values[0]?.trim().replace(/^\[/,
+								'').replace(/\]$/, '')
 							var value = ''
 							var op = sep.trim()
 
-							if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase()
+							if ([' in', ' not in'].includes(sep) && values[
+									1]?.toLowerCase()
 								.includes('select ') &&
-								values[1]?.toLowerCase().includes(' from ')) {
-								value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '')
+								values[1]?.toLowerCase().includes(' from ')
+							) {
+								value = l.replace(field, '').replace(
+										/^\s*(in|not in)\s*/i, '')
 									.trim()
-								if (value.startsWith('(') && value.endsWith(')')) value = value
+								if (value.startsWith('(') && value
+									.endsWith(')')) value = value
 									.replace(/^\(/, '')
 									.replace(/\)$/, '').trim()
 							} else {
-								value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
+								value = values[1]?.trim().replace(/^\'/,
+									'').replace(/\'$/, '')
 
 								if (['in', 'not in'].includes(op)) {
-									value = value.replace(/^\(/, '').replace(/\)$/, '')
-									value = value.split(',').map(v => v.trim().replace(/^\'/,
+									value = value.replace(/^\(/, '')
+										.replace(/\)$/, '')
+									value = value.split(',').map(v => v
+										.trim().replace(/^\'/,
 											'')
 										.replace(/\'$/,
 											''))
@@ -1953,80 +2117,31 @@
 </script>
 <style lang="scss">
 	.uni-page-modal-3200 {
-		.v-headStyle:first-child {
-			margin-top: 15rpx;
-		}
+		display: flex;
+		flex-direction: column;
+		height: calc(100vh - 30rpx);
+		padding: 15rpx 0;
 
-		.v-headStyle .txt_title {
-			font-size: 34rpx;
-			text-align: right;
-			display: inline-block;
-			vertical-align: 24rpx;
-		}
-
-		.v-headStyle input {
-			display: inline-block;
-			/* border: 1px solid #d5d5d5; */
-			/* width: 65%; */
-			width: 85%;
-			height: 52rpx;
-			line-height: 34rpx;
-			background: #FFF;
-			border-radius: 0 !important;
-			color: #2d8cf0;
-			padding: 10rpx 8rpx 12rpx;
-			font-size: 34rpx;
-			font-family: inherit;
-			box-shadow: none !important;
-			transition-duration: 0.1s;
-			margin-top: 4rpx;
-		}
-
-		.v-headStyle input::-webkit-input-placeholder {
-			font-size: 12rpx;
-		}
-
-		.input-wrapper {
-			border: 1px solid #d5d5d5;
-			display: inline-block;
-			width: 65%;
-			line-height: 22rpx;
-		}
-
-		[nvue] uni-view {
-			position: relative;
-			border: 0 solid #000;
-			box-sizing: border-box;
-		}
-
-		.uni-input {
-			/* border: none; */
-		}
-
-		.uni-icon {
-			/* border: 1px solid red; */
-			width: 8%;
-			font-family: uniicons;
-			font-size: 40rpx;
-			font-weight: 400;
-			font-style: normal;
-			/* width: 48rpx; */
-			height: 48rpx;
-			line-height: 48rpx;
-			color: #2d8cf0;
-			cursor: pointer;
-			display: inline-block;
-			vertical-align: 18rpx;
+		.v-headStyle {
+			width: 98%;
 		}
 
 		.v-content {
-			height: 945rpx;
-			overflow: hide;
+			flex: 1;
+			display: flex;
+			width: 100%;
+			flex-direction: column;
+			min-height: 100px;
+			overflow: hidden;
 			/* border:0.1px solid red; */
 		}
 
 		.view-content {
+			width: 100%;
+			display: flex;
 			margin-top: 10rpx;
+			flex-direction: column;
+
 		}
 
 		.dv-panel-bkcolor {
@@ -2047,6 +2162,16 @@
 			width: 91%;
 			display: inline-block;
 			text-align: left;
+
+			.uni-forms-item {
+				padding-bottom: 5rpx;
+				margin-bottom: 0;
+
+				.uni-forms-item__label {
+					height: 20px !important;
+					padding: 0 10rpx 0 0 !important;
+				}
+			}
 		}
 
 		.dv-panel-buticon {
@@ -2061,6 +2186,7 @@
 			display: inline-block;
 			vertical-align: middle;
 		}
+
 
 		.dv-panel-buticon a i {
 			font-size: 38rpx;
@@ -2078,42 +2204,6 @@
 			border-radius: 8rpx;
 		}
 
-		.dv-panel .txt_title {
-			font-size: 34rpx;
-			text-align: right;
-			display: inline-block;
-		}
-
-		.dv-panel input {
-			vertical-align: middle;
-			display: inline-block;
-			border: 2rpx solid #d5d5d5;
-			width: 68%;
-			height: 52rpx;
-			line-height: 34rpx;
-			background: #FFF;
-			border-radius: 14rpx !important;
-			color: #2d8cf0;
-			padding: 6rpx 8rpx 8rpx;
-			font-size: 32rpx;
-			font-family: inherit;
-			box-shadow: none !important;
-			transition-duration: 0.1s;
-			margin-top: 0rpx;
-		}
-
-		.dv-panel input::-webkit-input-placeholder {
-			font-size: 10rpx;
-		}
-
-		.dv-panel .form-item-span {
-			vertical-align: text-top;
-			color: #2d8cf0;
-			white-space: normal;
-			word-break: break-all;
-			display: inline-block;
-			width: calc(100% - 100px);
-		}
 
 		.dv-panel-button {
 			display: inline-block;
@@ -2139,7 +2229,8 @@
 		}
 
 		.view-floor {
-			padding: 0 20rpx;
+			width: calc(100% - 20rpx);
+			padding: 10rpx;
 			/* border:1px solid red; */
 		}
 
@@ -2148,7 +2239,7 @@
 			margin-top: 25rpx;
 			padding: 20rpx;
 			line-height: 1.5;
-			background: #4D6AF4;
+			background: #27A6E1;
 			border: none;
 			color: #fff;
 			font-size: 38rpx;
@@ -2163,13 +2254,18 @@
 			padding: 20rpx;
 			line-height: 1.5;
 			background: #fff;
-			border: none;
+			// border: none;
 			color: #000;
 			font-size: 38rpx;
 			font-weight: bold;
 			float: left;
 			display: inline-block;
 			margin-right: 20rpx;
+		}
+
+		button.btn_disabled {
+			background-color: #ddd;
+			color: #888;
 		}
 
 		.bk-active {
@@ -2249,7 +2345,14 @@
 			border-radius: 10rpx;
 		}
 
-		.scroll-Y {
+		.v-scroll-view {
+			flex: 1;
+			overflow: hidden;
+			width: 98%;
+		}
+
+		.scroll-y {
+			width: 100%;
 			height: 100%;
 		}
 

--
Gitblit v1.9.1