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

---
 components/oi-form/list/select/index.vue       |    2 
 pages/modal/3018_2.vue                         |   64 --
 components/oi-form/list/input-number/index.vue |   36 
 components/oi-form/list/textarea/index.vue     |   11 
 pages/modal/3200_view.vue                      |    2 
 /dev/null                                      |   17 
 pages/modal/5601.vue                           |  398 ++++++-----------
 pages/modal/3037_2.vue                         |  166 +++----
 components/oi-form/list/switch/index.vue       |    2 
 components/oi-form/list/index.vue              |   36 
 pages/modal/form/index.vue                     |   72 ---
 pages/modal/3018.vue                           |   87 +--
 components/oi-form/index.vue                   |   42 
 components/oi-form/list/input/index.vue        |   10 
 pages/modal/3037.vue                           |  293 -----------
 pages/modal/3200.vue                           |  115 ++--
 manifest.json                                  |    4 
 components/oi-form/list/checkbox/index.vue     |    2 
 main.js                                        |    3 
 19 files changed, 419 insertions(+), 943 deletions(-)

diff --git a/components/oi-form/index.vue b/components/oi-form/index.vue
index fd8bbc0..bc92baf 100644
--- a/components/oi-form/index.vue
+++ b/components/oi-form/index.vue
@@ -1,27 +1,32 @@
 <template>
 	<uni-forms class="oi-form" ref="baseForm" label-align="right">
-		<template v-for="(item,index) in form.items">
-			<OIFormLayout v-if="item.name == 'Layout'" v-show="!item.isHidden" :focusId="focusId" :viewMode="viewMode"
-				:hiddenIds="hiddenIds" :data="item" @change="onChange" @focus="onFocus" @click="onClick"
-				@click-prefix="onClickPrefix" @click-suffix="onClickSuffix">
-			</OIFormLayout>
+		<view v-for="(item,index) in form.items" :key="index">
+			<!-- 鏍呮牸甯冨眬 -->
+			<uni-row v-if="item.name == 'Layout'" v-show="!item.isHidden" :gutter="item.setting.gutter">
+				<uni-col
+					:span="item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
+					v-for="(col,key) in item.setting.colList" :key="key">
+					<OIFormItem v-if="col != null" :focusId="focusId" :viewMode="viewMode" :data="col"
+						:hiddenIds="hiddenIds" @on-change="onChange" @on-focus="onFocus" @on-click="onClick"
+						@on-click-prefix="onClickPrefix" @on-click-suffix="onClickSuffix"></OIFormItem>
+					<uni-forms-item v-else label=""></uni-forms-item>
+				</uni-col>
+			</uni-row>
 			<OIFormItem v-else :hiddenIds="hiddenIds" :focusId="focusId" :viewMode="viewMode" :data="item"
-				@change="onChange" @focus="onFocus" @click="onClick" @click-prefix="onClickPrefix"
-				@click-suffix="onClickSuffix">
+				@on-change="onChange" @on-focus="onFocus" @on-click="onClick" @on-click-prefix="onClickPrefix"
+				@on-click-suffix="onClickSuffix">
 			</OIFormItem>
-		</template>
+		</view>
 
 	</uni-forms>
 </template>
 
 <script>
 	import OIFormItem from './list/index.vue'
-	import OIFormLayout from './list/layout/index.vue'
 	export default {
 		name: "OIForm",
 		components: {
 			OIFormItem,
-			OIFormLayout
 		},
 		props: {
 			form: {
@@ -73,27 +78,24 @@
 			onChange(item) {
 				var attr = item.fieldId;
 				this.form.model[attr] = item.value;
-				this.$emit("change", item)
+				this.$emit("on-change", item)
 			},
 			onClick(item) {
-				this.$emit("click", item)
+				this.$emit("on-click", item)
 			},
 			onFocus(item) {
-				this.$emit("focus", item)
+				this.$emit("on-focus", item)
 			},
 			onClickPrefix(item) {
-				this.$emit("click-prefix", item)
+				this.$emit("on-click-prefix", item)
 			},
 			onClickSuffix(item) {
-				this.$emit("click-suffix", item)
+				this.$emit("on-click-suffix", item)
 			},
-		}
+		},
 	};
 </script>
 
 <style lang="less">
-	.oi-form {
-		
-
-	}
+	.oi-form {}
 </style>
\ No newline at end of file
diff --git a/components/oi-form/list/checkbox/index.vue b/components/oi-form/list/checkbox/index.vue
index 905c4c0..bff91b9 100644
--- a/components/oi-form/list/checkbox/index.vue
+++ b/components/oi-form/list/checkbox/index.vue
@@ -34,7 +34,7 @@
 					this.model[this.data.fieldId] = val
 				}
 				this.data.value = val
-				this.$emit("change", val)
+				this.$emit("on-change", val)
 			},
 
 		}
diff --git a/components/oi-form/list/index.vue b/components/oi-form/list/index.vue
index c3abb35..b2d9f5d 100644
--- a/components/oi-form/list/index.vue
+++ b/components/oi-form/list/index.vue
@@ -7,29 +7,29 @@
 			<OIFormText v-if="viewMode && data.disabled" :data="data" :model="model">
 			</OIFormText>
 			<OIFormInput v-else-if="data.name == 'Input'" :viewMode="viewMode" :focus="focusId== data.fieldId"
-				:data="data" :model="model" @change="onChange" @focus="onFocus" @click="onClick"
-				@click-prefix="onClickPrefix" @click-suffix="onClickSuffix">
+				:data="data" :model="model" @on-change="onChange" @on-focus="onFocus" @on-click="onClick"
+				@on-click-prefix="onClickPrefix" @on-click-suffix="onClickSuffix">
 			</OIFormInput>
 			<OIFormInputNumber v-else-if="data.name == 'InputNumber'" :focus="focusId== data.fieldId" :data="data"
-				:model="model" @change="onChange" @focus="onFocus" @click="onClick">
+				:model="model" @on-change="onChange" @on-focus="onFocus" @on-click="onClick">
 			</OIFormInputNumber>
 			<OIFormTextArea v-else-if="data.name == 'Textarea'" :focus="focusId== data.fieldId" :data="data"
-				:model="model" @change="onChange" @focus="onFocus" @click="onClick">
+				:model="model" @on-change="onChange" @on-focus="onFocus" @on-click="onClick">
 			</OIFormTextArea>
-			<OIFormSelect v-else-if="data.name == 'Select'" :data="data" :model="model" @change="onChange">
+			<OIFormSelect v-else-if="data.name == 'Select'" :data="data" :model="model" @on-change="onChange">
 			</OIFormSelect>
-			<OIFormSwitch v-else-if="data.name == 'Switch'" :data="data" :model="model" @change="onChange">
+			<OIFormSwitch v-else-if="data.name == 'Switch'" :data="data" :model="model" @on-change="onChange">
 			</OIFormSwitch>
-			<OIFormCheckbox v-else-if="data.name == 'Checkbox'" :data="data" :model="model" @change="onChange">
+			<OIFormCheckbox v-else-if="data.name == 'Checkbox'" :data="data" :model="model" @on-change="onChange">
 			</OIFormCheckbox>
-			<OIFormRadio v-else-if="data.name == 'Radio'" :data="data" :model="model" @change="onChange">
+			<OIFormRadio v-else-if="data.name == 'Radio'" :data="data" :model="model" @on-change="onChange">
 			</OIFormRadio>
-			<OIFormDatePicker v-else-if="data.name == 'DatePicker'" :data="data" :model="model" @change="onChange">
+			<OIFormDatePicker v-else-if="data.name == 'DatePicker'" :data="data" :model="model" @on-change="onChange">
 			</OIFormDatePicker>
-			<OIFormTimePicker v-else-if="data.name == 'TimePicker'" :data="data" :model="model" @change="onChange">
+			<OIFormTimePicker v-else-if="data.name == 'TimePicker'" :data="data" :model="model" @on-change="onChange">
 			</OIFormTimePicker>
 			<OIFormDatePickerRange v-else-if="data.name == 'DatePickerRange'" :data="data" :model="model"
-				@change="onChange">
+				@on-change="onChange">
 			</OIFormDatePickerRange>
 			<OIFormText v-else-if="data.name == 'Text'" :data="data" :model="model">
 			</OIFormText>
@@ -87,24 +87,21 @@
 		},
 		methods: {
 			onChange(e) {
-				this.$emit("change", this.data)
+				this.$emit("on-change", this.data)
 			},
 			onClick(e) {
-				this.$emit("click", this.data)
+				this.$emit("on-click", this.data)
 			},
 			onFocus(e) {
-				this.$emit("focus", this.data)
+				this.$emit("on-focus", this.data)
 			},
 			onClickPrefix() {
-				this.$emit("click-prefix", this.data)
+				this.$emit("on-click-prefix", this.data)
 			},
 			onClickSuffix() {
-				this.$emit("click-suffix", this.data)
+				this.$emit("on-click-suffix", this.data)
 			},
 		},
-		mounted() {
-			console.log("item", this.data)
-		}
 	};
 </script>
 
@@ -115,6 +112,7 @@
 		}
 
 	}
+
 	.oi-form-item-view {
 		.uni-forms-item {
 			padding-bottom: 5rpx;
diff --git a/components/oi-form/list/input-number/index.vue b/components/oi-form/list/input-number/index.vue
index 0063d6d..ca2b2b3 100644
--- a/components/oi-form/list/input-number/index.vue
+++ b/components/oi-form/list/input-number/index.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="oi-form-input-number">
-		<input v-if="model" type="number" class="oi-input-number" :class="data.disabled?'input-disabled':''" v-model="model[data.fieldId]" :focus="focus"
-			:placeholder="data.placeholder" @blur="onChange" @confirm="onConfirm" @click="onClick"
-			:disabled="data.disabled"></input>
-		<input v-else type="number" class="oi-input-number" :class="data.disabled?'input-disabled':''" v-model="data.value" :focus="focus"
-			:placeholder="data.placeholder" @blur="onChange" @confirm="onConfirm" @click="onClick"
-			:disabled="data.disabled"></input>
+		<input v-if="model" type="number" class="oi-input-number" :class="data.disabled?'input-disabled':''"
+			v-model="model[data.fieldId]" :focus="focus" :placeholder="data.placeholder" @focus="onFocus" @blur="onChange"
+			@confirm="onConfirm" @click="onClick" :disabled="data.disabled"></input>
+		<input v-else type="number" class="oi-input-number" :class="data.disabled?'input-disabled':''"
+			v-model="data.value" :focus="focus" :placeholder="data.placeholder" @focus="onFocus" @blur="onChange" @confirm="onConfirm"
+			@click="onClick" :disabled="data.disabled"></input>
 	</view>
 </template>
 
@@ -25,25 +25,26 @@
 		},
 		methods: {
 			onChange(e) {
-				this.$emit("change", e)
+				this.$emit("on-change", e)
 			},
 			onConfirm(e) {
 				this.onChange(e)
 			},
 			onClick(e) {
-				this.$emit("click", e)
+				this.$emit("on-click", e)
 			},
-		
-		}
+			onFocus(e) {
+				this.$emit("on-focus", e)
+			},
+
+		},
 	};
 </script>
 
 <style lang="less" scoped>
 	.oi-form-input-number {
-		border: 1px solid #d5d5d5;
-				width: calc(100%- 6rpx);
-		border-radius: 6px !important;
-		padding: 3rpx;
+		width: 100%;
+
 		.input-disabled {
 			background-color: #f3f3f3 !important;
 		}
@@ -65,8 +66,9 @@
 			transition-duration: 0.1s;
 			vertical-align: middle;
 		}
-	}
-	.oi-form-input-number:hover {
-		border: 1px solid rgb(41, 121, 255);
+
+		.oi-input-number:hover {
+			border: 1px solid rgb(41, 121, 255);
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/components/oi-form/list/input/index.vue b/components/oi-form/list/input/index.vue
index a0ec6f0..9f728ac 100644
--- a/components/oi-form/list/input/index.vue
+++ b/components/oi-form/list/input/index.vue
@@ -36,22 +36,22 @@
 		},
 		methods: {
 			onChange(e) {
-				this.$emit("change", e)
+				this.$emit("on-change", e)
 			},
 			onConfirm(e) {
 				this.onChange(e)
 			},
 			onClick(e) {
-				this.$emit("click", e)
+				this.$emit("on-click", e)
 			},
 			onFocus(e) {
-				this.$emit("focus", e)
+				this.$emit("on-focus", e)
 			},
 			onPrefixButton() {
-				this.$emit("click-prefix")
+				this.$emit("on-click-prefix")
 			},
 			onSuffixButton() {
-				this.$emit("click-suffix")
+				this.$emit("on-click-suffix")
 			},
 		}
 	};
diff --git a/components/oi-form/list/layout/index.vue b/components/oi-form/list/layout/index.vue
deleted file mode 100644
index 6c4bec0..0000000
--- a/components/oi-form/list/layout/index.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-	<!-- 鏍呮牸甯冨眬 -->
-	<uni-row :gutter="data.setting.gutter">
-		<uni-col
-			:span="data.setting.spanList && data.setting.spanList[key]? data.setting.spanList[key] : 24 / data.setting.col"
-			v-for="(col,key) in data.setting.colList">
-			<OIFormItem v-if="col != null" :focusId="focusId" :viewMode="viewMode" :data="col" :model="model"
-				:hiddenIds="hiddenIds" @change="onChange" @focus="onFocus" @click="onClick"
-				@click-prefix="onClickPrefix" @click-suffix="onClickSuffix"></OIFormItem>
-			<uni-forms-item v-else label=""></uni-forms-item>
-		</uni-col>
-	</uni-row>
-
-</template>
-
-<script>
-	import OIFormItem from '../index.vue'
-	export default {
-		name: "OIFormLayout",
-		components: {
-			OIFormItem,
-		},
-		props: {
-			viewMode: {
-				type: Boolean,
-				default: false
-			},
-			data: {
-				type: Object,
-				required: true,
-			},
-			model: Object,
-			focusId: {
-				type: String,
-				default: ''
-			},
-			hiddenIds: {
-				type: Array,
-				default: () => [],
-			},
-		},
-		methods: {
-			onChange(e) {
-				this.$emit("change", e)
-			},
-			onClick(e) {
-				this.$emit("click", e)
-			},
-			onFocus(e) {
-				this.$emit("focus", e)
-			},
-			onClickPrefix(e) {
-				this.$emit("click-prefix", e)
-			},
-			onClickSuffix(e) {
-				this.$emit("click-suffix", e)
-			},
-		},
-
-		mounted() {
-			console.log("layout", this.data.setting.colList)
-		},
-	};
-</script>
-
-<style lang="scss" scoped>
-	.oi-form-layout {}
-</style>
\ No newline at end of file
diff --git a/components/oi-form/list/select/index.vue b/components/oi-form/list/select/index.vue
index accc501..8dd294c 100644
--- a/components/oi-form/list/select/index.vue
+++ b/components/oi-form/list/select/index.vue
@@ -22,7 +22,7 @@
 		},
 		methods: {
 			onChange(e) {
-				this.$emit("change", e)
+				this.$emit("on-change", e)
 			},
 
 		}
diff --git a/components/oi-form/list/switch/index.vue b/components/oi-form/list/switch/index.vue
index 61be119..a54eca0 100644
--- a/components/oi-form/list/switch/index.vue
+++ b/components/oi-form/list/switch/index.vue
@@ -20,7 +20,7 @@
 		},
 		methods: {
 			onChange(e) {
-				this.$emit("change", e)
+				this.$emit("on-change", e)
 			},
 
 
diff --git a/components/oi-form/list/textarea/index.vue b/components/oi-form/list/textarea/index.vue
index 57957fd..8cd6de4 100644
--- a/components/oi-form/list/textarea/index.vue
+++ b/components/oi-form/list/textarea/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="oi-form-textarea">
 		<textarea v-if="model" class="textarea" :class="data.disabled?'input-disabled':''" v-model="model[data.fieldId]"
-			:focus="focus" :placeholder="data.placeholder" @blur="onChange" @confirm="onConfirm" @click="onClick"
+			:focus="focus" :placeholder="data.placeholder"  @focus="onFocus" @blur="onChange" @confirm="onConfirm" @click="onClick"
 			:disabled="data.disabled"></textarea>
 		<textarea v-else class="textarea" :class="data.disabled?'input-disabled':''" v-model="data.value" :focus="focus"
-			:placeholder="data.placeholder" @blur="onChange" @confirm="onConfirm" @click="onClick"
+			:placeholder="data.placeholder"  @focus="onFocus" @blur="onChange" @confirm="onConfirm" @click="onClick"
 			:disabled="data.disabled"></textarea>
 	</view>
 </template>
@@ -25,13 +25,16 @@
 		},
 		methods: {
 			onChange(e) {
-				this.$emit("change", e)
+				this.$emit("on-change", e)
 			},
 			onConfirm(e) {
 				this.onChange(e)
 			},
 			onClick(e) {
-				this.$emit("click", e)
+				this.$emit("on-click", e)
+			},
+			onFocus(e) {
+				this.$emit("on-focus", e)
 			},
 
 
diff --git a/main.js b/main.js
index e10c420..ac26074 100644
--- a/main.js
+++ b/main.js
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import App from './App'
-import store from "./store";
 // i18n
 import messages from './locale'
 import VueI18n from 'vue-i18n'
@@ -12,13 +11,11 @@
 
 Vue.use(VueI18n)
 Vue.config.productionTip = false
-Vue.prototype.$store = store
 
 App.mpType = 'app'
 const i18n = new VueI18n(i18nConfig)
 
 const app = new Vue({
-	store,
 	...App,
 	i18n,
 })
diff --git a/manifest.json b/manifest.json
index 13692ce..db8e49d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "MoboxPDA",
     "appid" : "__UNI__56D451E",
     "description" : "",
-    "versionName" : "1.1.48",
-    "versionCode" : 1148,
+    "versionName" : "1.1.50",
+    "versionCode" : 1150,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index 358b80c..7b0755e 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -22,18 +22,20 @@
 								<a @tap="classAttr_extButton(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
-							<input 
+							<input
 								:type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁� || attr.Type=='int' || attr.Type=='float'?'number':'text'"
-								:class="attr.edit?'':'input-disabled'"  :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'"
-								:data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
-								:disabled="attr.edit?false:true">
+								:class="attr.edit?'':'input-disabled'" :value="attr.Value" @focus="ontap"
+								@blur="onevent" v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex"
+								:style="{'width':attr.Width}" :disabled="attr.edit?false:true">
 							<!-- =='flase'?true:false -->
 							<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'"
-								:class="attr.edit?'':'input-disabled'"  :data-index="index" :data-iindex="iindex" style="height:60px;"
-								:style="{'width':attr.Width}" :disabled="attr.edit?false:true"></textarea>
+								:class="attr.edit?'':'input-disabled'" :data-index="index" :data-iindex="iindex"
+								style="height:60px;" :style="{'width':attr.Width}"
+								:disabled="attr.edit?false:true"></textarea>
 							<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'"
-								:class="attr.edit?'':'input-disabled'"  :data-index="index" :data-iindex="iindex" style="height:90px;"
-								:style="{'width':attr.Width}" :disabled="attr.edit?false:true"></textarea>
+								:class="attr.edit?'':'input-disabled'" :data-index="index" :data-iindex="iindex"
+								style="height:90px;" :style="{'width':attr.Width}"
+								:disabled="attr.edit?false:true"></textarea>
 							<!-- 鎵爜鍚庝簨浠惰繑鍥�-->
 							<div class="input_vallist">
 								<ul v-for="(inputval,vindex) in inputValList">
@@ -47,18 +49,19 @@
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
 							<input
 								:type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁� || attr.Type=='int' || attr.Type=='float' ?'number':'text'"
-								class="attr_field" :class="attr.edit?'':'input-disabled'"  :value="attr.Value" @focus="ontap" @blur="onevent"
-								v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex"
+								class="attr_field" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
+								@focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index"
+								:data-iindex="iindex"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
 								:disabled="attr.edit?false:true">
-							<textarea class="attr_field" :class="attr.edit?'':'input-disabled'"  :value="attr.Value" @focus="ontap" @blur="onevent"
-								v-else-if="attr.Height=='2'" :data-index="index" :data-iindex="iindex"
-								style="height:60px;"
+							<textarea class="attr_field" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
+								@focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-index="index"
+								:data-iindex="iindex" style="height:60px;"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
 								:disabled="attr.edit?false:true"></textarea>
-							<textarea class="attr_field" :class="attr.edit?'':'input-disabled'"  :value="attr.Value" @focus="ontap" @blur="onevent"
-								v-else-if="attr.Height=='3'" :data-index="index" :data-iindex="iindex"
-								style="height:90px;"
+							<textarea class="attr_field" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
+								@focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-index="index"
+								:data-iindex="iindex" style="height:90px;"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
 								:disabled="attr.edit?false:true"></textarea>
 							<div class="text-right2" v-if="attr.ext_button==true">
@@ -153,7 +156,8 @@
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-							<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"  :data-index="index" :data-iindex="iindex"
+							<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"
+								:data-index="index" :data-iindex="iindex"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
 								disabled="true" :maxlength="-1">
 							<div class="text-right2" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)'|| attr.Type=='obj-ref'">
@@ -179,12 +183,13 @@
 								<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
-							<input type="text" :class="attr.edit?'':'input-disabled'"  :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
-								:maxlength="-1">
+							<input type="text" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
+								:style="{'width':attr.Width}" disabled="true" :maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-							<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"  :value="attr.Value"
+							<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"
+								:value="attr.Value"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
 								disabled="true" :maxlength="-1">
 							<div class="text-right2">
@@ -203,12 +208,13 @@
 								<a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
-							<input type="text"  :class="attr.edit?'':'input-disabled'"  :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
-								:maxlength="-1">
+							<input type="text" :class="attr.edit?'':'input-disabled'" :value="attr.Value"
+								:style="{'width':attr.Width}" disabled="true" :maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-							<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"  :value="attr.Value"
+							<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"
+								:value="attr.Value"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
 								disabled="true" :maxlength="-1">
 							<div class="text-right2">
@@ -223,12 +229,14 @@
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
 							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi"
 									v-if="attr.notempty==true">*</i></text>
-							<input type="text" :class="attr.edit?'':'input-disabled'"  :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
-								:disabled="attr.edit?false:true" :maxlength="-1">
+							<input type="text" :class="attr.edit?'':'input-disabled'" :data-index="index"
+								:data-iindex="iindex" :style="{'width':attr.Width}" :disabled="attr.edit?false:true"
+								:maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-							<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"  :data-index="index" :data-iindex="iindex"
+							<input type="text" class="attr_field" :class="attr.edit?'':'input-disabled'"
+								:data-index="index" :data-iindex="iindex"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"
 								:disabled="attr.edit?false:true" :maxlength="-1">
 							<i class="i_tishi" v-if="attr.notempty==true">*</i>
@@ -925,29 +933,6 @@
 					}
 				}
 
-				for (var i = 0; i < value.length; i++) {
-
-					var length = 0;
-					if (!this.$data.refdatastore.filter(function(
-							s) {
-							return data[i].attr == s.attr
-						}).length) {
-						length = 1;
-						this.$data.refdatastore.push(data[i]);
-					}
-					if (length == 0) {
-						for (var j = 0; j < this.$data.refdatastore
-							.length; j++) {
-							if (this.$data.refdatastore[j].attr ==
-								data[i]
-								.attr) {
-								this.$data.refdatastore[j].value =
-									data[i]
-									.value;
-							}
-						}
-					}
-				}
 			},
 			popupChange(e) {
 				console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show);
@@ -2513,9 +2498,11 @@
 			right: 30rpx;
 			font-size: 60rpx;
 		}
+
 		.input-disabled {
 			background-color: #f3f3f3 !important;
 		}
+
 		input::-webkit-input-placeholder {
 			font-size: 12rpx;
 		}
@@ -2660,7 +2647,7 @@
 			padding: 20rpx;
 			line-height: 1.5;
 			// background: #fff;
-		//	border: 1px solid #dcdee2;
+			//	border: 1px solid #dcdee2;
 			// color: #000;
 			background: #fff;
 			color: #000;
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index a6080af..5cd0d43 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -3,8 +3,8 @@
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
 			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
-				@click="onClick" @focus="ontap" @change="onEnterChange" @click-prefix="classAttr_extButton"
-				@click-suffix="classAttr_extButton"></OIForm>
+				@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
+				@on-click-suffix="classAttr_extButton"></OIForm>
 
 		</view>
 		<view class="view-bottom">
@@ -579,7 +579,7 @@
 				const $this = this;
 				//console.log("onScanValue", item);
 				item.value = value
-				let newVal = item.value 
+				let newVal = item.value
 				if (typeof item.value == "string") {
 					newVal = item.value.trim()
 				}
@@ -685,6 +685,7 @@
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = newVal;
 					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+					// this.onScanValue(this.head_styledef.form.items[2].setting.colList[0], "test")
 					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� 						this.onChange(onChangeEvent);
 					}
@@ -978,44 +979,8 @@
 
 						if (data.result) {
 							var result = data.result;
+							$this.setFormValues(data.result)
 							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.head_styledef.form.items
-									.length; c++) {
-									var attr = $this.$data.head_styledef.form.items[c];
-									//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-									if ($this.head_styledef.form.model[result[i].attr] ==
-										undefined) {
-										$this.head_styledef.form.model[result[i].attr] =
-											result[i]
-											.value;
-									}
-									//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-									if (attr.name != 'Layout') {
-										if (attr.fieldId == result[i].attr) {
-											attr.value = '';
-											attr.oldvalue = '';
-											attr.value = result[i].value;
-											attr.oldvalue = result[i].value;
-											$this.head_styledef.form.model[attr.fieldId] =
-												result[i]
-												.value;
-										}
-									} else if (attr.name == 'Layout') {
-										attr.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == result[i].attr) {
-													col.value = '';
-													col.oldvalue = '';
-													col.value = result[i].value;
-													col.oldvalue = result[i].value;
-													$this.head_styledef.form.model[col
-															.fieldId] =
-														result[i].value;
-												}
-											}
-										});
-									}
-								}
 
 								var length = 0;
 								if (!$this.$data.refdatastore.filter(function(s) {
@@ -1631,25 +1596,6 @@
 									}
 								}
 							});
-						}
-					}
-					var length = 0;
-					if (!$this.$data.refdatastore.filter(function(s) {
-							return data[i].attr == s.attr
-						}).length) {
-						length = 1;
-						$this.$data.refdatastore.push(data[i]);
-					}
-					if (length == 0) {
-						for (var j = 0; j < $this.$data.refdatastore
-							.length; j++) {
-							if ($this.$data.refdatastore[j].attr == data[
-									i]
-								.attr) {
-								$this.$data.refdatastore[j].value = data[
-										i]
-									.value;
-							}
 						}
 					}
 				}
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index 151f653..1c5721f 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -163,7 +163,7 @@
 								<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
 							<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
-								disabled="true"  :maxlength="-1">
+								disabled="true" :maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2"
@@ -172,7 +172,7 @@
 							</p>
 							<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
-								disabled="true"  :maxlength="-1">
+								disabled="true" :maxlength="-1">
 							<div class="text-right2" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)'|| attr.Type=='obj-ref'">
 								<a @tap="classAttr_AddRef" :data-classid="attr.RelCls[0].id"
 									:data-classname="attr.RelCls[0].name"><i class="ace-icon fa fa-plus-circle"></i></a>
@@ -196,7 +196,8 @@
 								<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
-							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true" :maxlength="-1">
+							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+								:maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2"
@@ -222,7 +223,8 @@
 								<a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
-							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true" :maxlength="-1">
+							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+								:maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2"
@@ -295,7 +297,8 @@
 					<!-- 宸﹀彸甯冨眬 -->
 					<p class="tx_title2">{{param.Scan_Code.Name}}:</p>
 					<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" @blur="scan_onevent"
-						:style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'"  :maxlength="-1">
+						:style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'"
+						:maxlength="-1">
 					<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
 						<a @tap="scan_classAttr_extButton()"><i class="ace-icon fa"
 								:class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
@@ -512,8 +515,8 @@
 										<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i
 												class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
-									<input type="text" :value="attr.Value" :style="{'width':attr.Width}"
-										disabled="true" :maxlength="-1">
+									<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+										:maxlength="-1">
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2"
@@ -539,8 +542,8 @@
 										<a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i
 												class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
-									<input type="text" :value="attr.Value" :style="{'width':attr.Width}"
-										disabled="true" :maxlength="-1">
+									<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+										:maxlength="-1">
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2"
@@ -622,9 +625,9 @@
 			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
 				<view class="popup-header">{{check_list.title}}</view>
 				<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
-				:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
-				<view class="popup-cont"
-					:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
+					:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+					<view class="popup-cont"
+						:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
 						<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
 							<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
 								:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -732,7 +735,7 @@
 				let that = this;
 				let keys = [];
 				let val, data;
-			
+
 				Object.keys(obj).forEach(function(key) {
 					keys = key.split(".");
 					val = obj[key];
@@ -749,7 +752,7 @@
 					});
 				});
 			},
-			
+
 			async loadData() {
 				//涓绘暟鎹被鑾峰彇
 				const param = this.param
@@ -2757,68 +2760,6 @@
 													}
 												}
 
-												var length =
-													0;
-												if (!
-													this
-													.$data
-													.refdatastore
-													.filter(
-														function(
-															s
-														) {
-															return val[
-																	i
-																]
-																.attr ==
-																s
-																.attr
-														}
-													)
-													.length
-												) {
-													length
-														=
-														1;
-													this.$data
-														.refdatastore
-														.push(
-															val[
-																i]
-														);
-												}
-												if (length ==
-													0
-												) {
-													for (
-														var j =
-															0; j <
-														this
-														.$data
-														.refdatastore
-														.length; j++
-													) {
-														if (this
-															.$data
-															.refdatastore[
-																j
-															]
-															.attr ==
-															val[
-																i]
-															.attr
-														) {
-															this.$data
-																.refdatastore[
-																	j
-																]
-																.value =
-																val[
-																	i]
-																.value;
-														}
-													}
-												}
 											}
 										}
 									}
@@ -3108,73 +3049,6 @@
 													attr[
 															j]
 														.Value =
-														result[
-															i
-														]
-														.value;
-												}
-											}
-										}
-										var length =
-											0;
-										if (!
-											$this
-											.$data
-											.refdatastore
-											.filter(
-												function(
-													s
-												) {
-													return result[
-															i
-														]
-														.attr ==
-														s
-														.attr
-												}
-											)
-											.length
-										) {
-											length
-												=
-												1;
-											$this
-												.$data
-												.refdatastore
-												.push(
-													result[
-														i
-													]
-												);
-										}
-										if (length ==
-											0
-										) {
-											for (
-												var j =
-													0; j <
-												$this
-												.$data
-												.refdatastore
-												.length; j++
-											) {
-												if ($this
-													.$data
-													.refdatastore[
-														j
-													]
-													.attr ==
-													result[
-														i
-													]
-													.attr
-												) {
-													$this
-														.$data
-														.refdatastore[
-															j
-														]
-														.value =
 														result[
 															i
 														]
@@ -4199,68 +4073,6 @@
 												}
 											}
 
-											var length =
-												0;
-											if (!
-												this
-												.$data
-												.refdatastore
-												.filter(
-													function(
-														s
-													) {
-														return val[
-																i
-															]
-															.attr ==
-															s
-															.attr
-													}
-												)
-												.length
-											) {
-												length
-													=
-													1;
-												this.$data
-													.refdatastore
-													.push(
-														val[
-															i]
-													);
-											}
-											if (length ==
-												0
-											) {
-												for (
-													var j =
-														0; j <
-													this
-													.$data
-													.refdatastore
-													.length; j++
-												) {
-													if (this
-														.$data
-														.refdatastore[
-															j
-														]
-														.attr ==
-														val[
-															i]
-														.attr
-													) {
-														this.$data
-															.refdatastore[
-																j
-															]
-															.value =
-															val[
-																i]
-															.value;
-													}
-												}
-											}
 										}
 									}
 								}
@@ -4580,74 +4392,7 @@
 												}
 											}
 										}
-										var length =
-											0;
-										if (!
-											$this
-											.$data
-											.refdatastore
-											.filter(
-												function(
-													s
-												) {
-													return result[
-															i
-														]
-														.attr ==
-														s
-														.attr
-												}
-											)
-											.length
-										) {
-											length
-												=
-												1;
-											$this
-												.$data
-												.refdatastore
-												.push(
-													result[
-														i
-													]
-												);
 										}
-										if (length ==
-											0
-										) {
-											for (
-												var j =
-													0; j <
-												$this
-												.$data
-												.refdatastore
-												.length; j++
-											) {
-												if ($this
-													.$data
-													.refdatastore[
-														j
-													]
-													.attr ==
-													result[
-														i
-													]
-													.attr
-												) {
-													$this
-														.$data
-														.refdatastore[
-															j
-														]
-														.value =
-														result[
-															i
-														]
-														.value;
-												}
-											}
-										}
-									}
 								} else if (
 									action
 									.action_type ==
@@ -5609,7 +5354,7 @@
 		margin-top: 50rpx;
 		padding: 20rpx;
 		line-height: 1.5;
-	/* 	background: #27A6E1;
+		/* 	background: #27A6E1;
 		border: none;
 		color: #fff; */
 		background: #fff;
@@ -5775,7 +5520,7 @@
 		margin-top: 50rpx;
 		padding: 15rpx;
 		line-height: 1.5;
-	/* 	background: #27A6E1;
+		/* 	background: #27A6E1;
 		border: none;
 		color: #fff; */
 		background: #fff;
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index a8d0c38..c7cdeae 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -1,8 +1,9 @@
 <template>
 	<view class="uni-page-modal-3017-2">
 		<!-- 琛ㄥご鏍峰紡 -->
-		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" @focus="ontap" @change="onEnterChange"
-			@click-prefix="classAttr_extButton" @click-suffix="classAttr_extButton"></OIForm>
+		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" @on-focus="ontap"
+			@on-change="onEnterChange" @on-click-prefix="classAttr_extButton" @on-click-suffix="classAttr_extButton">
+		</OIForm>
 		<!-- 浠庢暟鎹�-->
 		<view class="v-panel">
 			<div class="panel_title">{{param.Sub_Cls.Title}}</div>
@@ -32,8 +33,38 @@
 			<!-- 浠庢暟鎹樉绀鸿鎯呭尯 -->
 			<view class="v-panellist" v-for="(subpanel,iiindex) in subPanelList" @tap="onPanelClick(iiindex)"
 				:class="activelist[iiindex].active==true?'bk-active':''">
-				<OIForm class="v-area dv-panel" :form="subpanel.subClassAttr.form" viewMode></OIForm>
+				<uni-forms class="v-area dv-panel" label-align="right">
+					<view v-for="(item,index) in subpanel.subClassAttr.form.items" :key="index">
+						<!-- 鏍呮牸甯冨眬 -->
+						<uni-row v-if="item.name == 'Layout'" :gutter="item.setting.gutter">
+							<uni-col
+								:span="item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
+								v-for="(col,key) in item.setting.colList" :key="key">
+								<uni-forms-item v-if="col != null"
+									:label="col.labelWidth === 0 ? '' : col.label? col.label+'锛�:''"
+									:label-width="col.labelWidth || col.labelWidth === 0 ? col.labelWidth : 100+'px'">
+									<view v-if="col.disabled">{{col.value}}</view>
+									<input class="uni-input" v-else-if="col.name=='Input' || col.name=='InputNumber'"
+										:type="col.name=='InputNumber'?'number':'text'" v-model="col.value"
+										:placeholder="col.placeholder" :maxlength="-1" />
+									<view v-else>{{col.value}}</view>
 
+								</uni-forms-item>
+								<uni-forms-item v-else label=""></uni-forms-item>
+							</uni-col>
+						</uni-row>
+						<uni-forms-item v-else :label="item.labelWidth === 0 ? '' : item.label? item.label+'锛�:''"
+							:label-width="item.labelWidth || item.labelWidth === 0 ? item.labelWidth : 100+'px'"
+							:style="{ textAlign: item.setting.align }">
+							<view v-if="item.disabled">{{item.value}}</view>
+							<input v-else-if="item.name=='Input' || item.name=='InputNumber' " class="uni-input"
+								:type="item.name=='InputNumber'?'number':'text'" v-model="item.value"
+								:disabled="item.disabled" :placeholder="item.placeholder" :maxlength="-1" />
+							<view v-else>{{item.value}}</view>
+
+						</uni-forms-item>
+					</view>
+				</uni-forms>
 				<view class="v-paneldel" v-if="param.Sub_Cls.Can_Add_Delete == true">
 					<a href="javascript:;" class="panel_del" @tap="panel_del(iiindex)"><i
 							class="ace-icon fu-delete"></i></a>
@@ -497,20 +528,6 @@
 														}
 													}
 												});
-											}
-										}
-										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
-												return result[i].attr == s.attr
-											}).length) {
-											length = 1;
-											$this.$data.refdatastore.push(result[i]);
-										}
-										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[i].attr) {
-													$this.$data.refdatastore[j].value = result[i].value;
-												}
 											}
 										}
 									}
@@ -1074,7 +1091,7 @@
 				getApp().onScan((result) => {
 					console.log(result.decodedata);
 					item.value = result.decodedata
-					let newVal = item.value 
+					let newVal = item.value
 					if (typeof item.value == "string") {
 						newVal = item.value.trim()
 					}
@@ -1086,7 +1103,7 @@
 					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isflag) {
 						uni.hideKeyboard();
-						this.$data.scanCodeVal =newVal;
+						this.$data.scanCodeVal = newVal;
 						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 							//涓绘暟鎹被灞炴�
@@ -1564,20 +1581,7 @@
 											}
 
 										}
-										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
-												return result[i].attr == s.attr
-											}).length) {
-											length = 1;
-											$this.$data.refdatastore.push(result[i]);
-										}
-										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[i].attr) {
-													$this.$data.refdatastore[j].value = result[i].value;
-												}
-											}
-										}
+									
 									}
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
@@ -1821,20 +1825,7 @@
 												}
 											}
 										}
-										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
-												return result[i].attr == s.attr
-											}).length) {
-											length = 1;
-											$this.$data.refdatastore.push(result[i]);
-										}
-										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[i].attr) {
-													$this.$data.refdatastore[j].value = result[i].value;
-												}
-											}
-										}
+									
 									}
 								} else if (action.action_type == 'set_global_attr') {
 									$this.$actiontr = action.value || [];
@@ -2258,61 +2249,46 @@
 			/* padding: 10rpx 20rpx 4rpx 0px; */
 			border-radius: 12rpx;
 			/* margin-bottom: 20rpx; */
-			text-align: right;
+
+			.uni-forms-item {
+				padding-bottom: 5rpx;
+				margin-bottom: 0;
+
+				.uni-forms-item__label {
+					height: 20px !important;
+					padding: 0 10rpx 0 0 !important;
+				}
+
+				.uni-input {
+					width: calc(100% - 12rpx);
+					padding: 5rpx;
+					border: 1px solid #d5d5d5;
+					color: #2d8cf0;
+					height: 20px;
+					background: #FFF;
+					line-height: 20px;
+					border-radius: 6px !important;
+					font-size: 14px;
+					font-family: inherit;
+					box-shadow: none !important;
+					transition-duration: 0.1s;
+					vertical-align: middle;
+				}
+
+				.uni-input:hover {
+					border: 1px solid rgb(41, 121, 255);
+				}
+			}
+
+
+
 		}
 
 		.dv-panel:first-child {
 			padding-top: 10rpx;
 		}
 
-		.dv-panel-input {
-			width: 100%;
-			display: inline-block;
-			text-align: left;
-		}
 
-		.dv-panel .txt_title {
-			font-size: 34rpx;
-			text-align: right;
-			display: inline-block;
-			vertical-align: 12px;
-		}
-
-		.dv-panel input {
-			/* vertical-align: middle; */
-			display: inline-block;
-			border: 1px solid #d5d5d5;
-			width: 68%;
-			height: 52rpx;
-			line-height: 34rpx;
-			background: #FFF;
-			border-radius: 7px !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;
-		}
-
-		.input-disabled {
-			background-color: #f3f3f3 !important;
-		}
-
-		.dv-panel .form-item-span {
-			vertical-align: top;
-			color: #2d8cf0;
-			white-space: normal;
-			word-break: break-all;
-			display: inline-block;
-			width: calc(100% - 100px);
-			/* border: 1rpx solid red; */
-		}
 
 		#dv_select {
 			display: inline-block;
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index 9427d83..4815484 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -2,8 +2,8 @@
 	<view class="uni-page-modal-3200">
 		<view class="v-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" @focus="ontap"
-				@change="onEnterChange" @click-prefix="onEnterChange" @click-suffix="onEnterChange"></OIForm>
+			<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">
@@ -25,8 +25,42 @@
 							</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>
+								<uni-forms class="v-area dv-panel" label-align="right">
+									<view v-for="(item,index) in style.form.items" :key="index">
+										<!-- 鏍呮牸甯冨眬 -->
+										<uni-row v-if="item.name == 'Layout'" :gutter="item.setting.gutter">
+											<uni-col
+												:span="item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
+												v-for="(col,key) in item.setting.colList" :key="key">
+												<uni-forms-item v-if="col != null"
+													:label="col.labelWidth === 0 ? '' : col.label? col.label+'锛�:''"
+													:label-width="col.labelWidth || col.labelWidth === 0 ? col.labelWidth : 100+'px'">
+													<view v-if="col.disabled">{{col.value}}</view>
+													<input class="uni-input"
+														v-else-if="col.name=='Input' || col.name=='InputNumber'"
+														:type="col.name=='InputNumber'?'number':'text'"
+														v-model="col.value" :placeholder="col.placeholder"
+														:maxlength="-1" />
+													<view v-else>{{col.value}}</view>
 
+												</uni-forms-item>
+												<uni-forms-item v-else label=""></uni-forms-item>
+											</uni-col>
+										</uni-row>
+										<uni-forms-item v-else
+											:label="item.labelWidth === 0 ? '' : item.label? item.label+'锛�:''"
+											:label-width="item.labelWidth || item.labelWidth === 0 ? item.labelWidth : 100+'px'"
+											:style="{ textAlign: item.setting.align }">
+											<view v-if="item.disabled">{{item.value}}</view>
+											<input v-else-if="item.name=='Input' || item.name=='InputNumber' "
+												class="uni-input" :type="item.name=='InputNumber'?'number':'text'"
+												v-model="item.value" :disabled="item.disabled"
+												:placeholder="item.placeholder" :maxlength="-1" />
+											<view v-else>{{item.value}}</view>
+
+										</uni-forms-item>
+									</view>
+								</uni-forms>
 							</div>
 							<div class="dv-panel-button" v-if="param.ListPage.Click_View==true">
 								<a @click="onViewPageClick(style)"><i class="mobox-normal-right-arrow" /></a>
@@ -1916,9 +1950,37 @@
 		.dv-panel {
 			background-color: #efefef;
 			padding: 20rpx 20rpx 20rpx 0px;
-			border-radius: 12rpx;
-			margin-bottom: 20rpx;
-			text-align: right;
+			
+			.uni-forms-item {
+				padding-bottom: 5rpx;
+				margin-bottom: 0;
+			
+				.uni-forms-item__label {
+					height: 20px !important;
+					padding: 0 10rpx 0 0 !important;
+				}
+			
+				.uni-input {
+					width: calc(100% - 12rpx);
+					padding: 5rpx;
+					border: 1px solid #d5d5d5;
+					color: #2d8cf0;
+					height: 20px;
+					background: #FFF;
+					line-height: 20px;
+					border-radius: 6px !important;
+					font-size: 14px;
+					font-family: inherit;
+					box-shadow: none !important;
+					transition-duration: 0.1s;
+					vertical-align: middle;
+				}
+			
+				.uni-input:hover {
+					border: 1px solid rgb(41, 121, 255);
+				}
+			}
+			
 		}
 
 		.dv-listHtml-Panel,
@@ -1959,47 +2021,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 .form-item-input {
-
-			width: calc(100% - 100px);
-		}
 
 		.dv-panel-button {
 			display: inline-block;
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index d10f7d2..9bf775b 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -12,7 +12,7 @@
 					</div>
 					<!-- 鑷畾涔夎〃鍗曠被鍨嬫樉绀�-->
 					<div v-if="!ViewHtml_Panel">
-						<OIForm :form="detail2_styledef.form.items" viewMode></OIForm>
+						<OIForm :form="detail2_styledef.form" viewMode></OIForm>
 
 					</div>
 				</div>
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 3055125..bc16b22 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -2,8 +2,8 @@
 	<view class="uni-page-modal-5601">
 		<!-- 琛ㄥご鏍峰紡 -->
 		<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
-			@click="onClick" @focus="ontap" @change="onEnterChange" @click-prefix="classAttr_extButton"
-			@click-suffix="classAttr_extButton"></OIForm>
+			@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
+			@on-click-suffix="classAttr_extButton"></OIForm>
 
 		<view class="view-content">
 			<!-- 鐮佺洏瀛愮晫闈�-->
@@ -23,16 +23,53 @@
 									src="../../images/mobox_log_200x40.png">
 								</image>
 								<checkbox-group @change="checkboxChange">
-									<div class="dv-panel" v-for="(style,ii) in pageData.DefList"
+									<div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
 										@tap="onPanelClick(ii,style.form.htmlobjId)"
 										:id="'dvpanel'+style.form.htmlobjId"
 										:class="style.form.htmlobjId==active_id?'bk-active':''">
-										<OIForm class="dv-panel-form" :form="style.form" viewMode></OIForm>
+										<uni-forms class="dv-panel-form" label-align="right">
+											<view v-for="(item,index) in style.form.items" :key="index">
+												<!-- 鏍呮牸甯冨眬 -->
+												<uni-row v-if="item.name == 'Layout'" :gutter="item.setting.gutter">
+													<uni-col
+														:span="item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col"
+														v-for="(col,key) in item.setting.colList" :key="key">
+														<uni-forms-item v-if="col != null"
+															:label="col.labelWidth === 0 ? '' : col.label? col.label+'锛�:''"
+															:label-width="col.labelWidth || col.labelWidth === 0 ? col.labelWidth : 100+'px'">
+															<view v-if="col.disabled">{{col.value}}</view>
+															<input class="uni-input"
+																v-else-if="col.name=='Input' || col.name=='InputNumber'"
+																:type="col.name=='InputNumber'?'number':'text'"
+																v-model="col.value" :placeholder="col.placeholder"
+																:maxlength="-1" />
+															<view v-else>{{col.value}}</view>
+
+														</uni-forms-item>
+														<uni-forms-item v-else label=""></uni-forms-item>
+													</uni-col>
+												</uni-row>
+												<uni-forms-item v-else
+													:label="item.labelWidth === 0 ? '' : item.label? item.label+'锛�:''"
+													:label-width="item.labelWidth || item.labelWidth === 0 ? item.labelWidth : 100+'px'"
+													:style="{ textAlign: item.setting.align }">
+													<view v-if="item.disabled">{{item.value}}</view>
+													<input v-else-if="item.name=='Input' || item.name=='InputNumber' "
+														class="uni-input"
+														:type="item.name=='InputNumber'?'number':'text'"
+														v-model="item.value" :disabled="item.disabled"
+														:placeholder="item.placeholder" :maxlength="-1" />
+													<view v-else>{{item.value}}</view>
+
+												</uni-forms-item>
+											</view>
+										</uni-forms>
+										<!-- <OIForm class="dv-panel-form" :form="style.form" viewMode></OIForm> -->
 
 										<div class="dv-panel-button"
 											v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0">
 
-											<checkbox v-if="pageData.Select_Button==true" :model="ii"
+											<checkbox v-if="pageData.Select_Button==true" :value="ii"
 												:checked="style.SelBut_Checked" />
 											<!-- <text></text> -->
 											<!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> -->
@@ -123,6 +160,9 @@
 	} from "@/api/data.js"
 	import dayjs from "dayjs";
 	import OIForm from '@/components/oi-form/index.vue'
+	import OIFormItem from '@/components/oi-form/list/index.vue'
+	import OIFormInput from '@/components/oi-form/list/input/index.vue'
+	import OIFormInputNumber from '@/components/oi-form/list/input-number/index.vue'
 
 	export default {
 		name: "PageModal5601",
@@ -131,6 +171,10 @@
 		},
 		components: {
 			OIForm,
+			OIFormItem,
+			OIFormInput,
+			OIFormInputNumber
+
 		},
 		data() {
 			return {
@@ -152,7 +196,6 @@
 				selectAttrObj: {},
 
 				global_attr: [],
-				refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 				popupType: "center",
 				check_list: {},
 				popupParam: {},
@@ -1000,7 +1043,7 @@
 												const pageData = $this.pageDetail[pageIndex]
 												pageData.DefList = []
 												pageData.ExtData = {}
-											
+
 												$this.$set(this.pageDetail, pageIndex, pageData)
 											}
 
@@ -1163,48 +1206,27 @@
 							if (ele.form.objId == rowData.id) {
 								rowData.attrs.forEach(attr => {
 									ele.form.items.forEach(ele2 => {
-										if (ele2.name !=
-											'Layout') {
-											if (ele2.fieldId ==
-												attr
-												.attr) {
-												ele2.value =
-													$this
-													.operationNumber(
-														ele2
-														.value,
-														attr
-														.value,
-														attr
-														.operation
-													)
+										if (ele2.name != 'Layout') {
+											if (ele2.fieldId == attr.attr) {
+												ele2.value = $this.operationNumber(
+													ele2.value,
+													attr.value,
+													attr.operation
+												)
 											}
-										} else if (ele2.name ==
-											'Layout') {
-											ele2.setting
-												.colList
-												.forEach(
-													col => {
-														if (
-															col) {
-															if (col
-																.fieldId ==
-																attr
-																.attr
-															) {
-																col.value =
-																	$this
-																	.operationNumber(
-																		col
-																		.value,
-																		attr
-																		.value,
-																		attr
-																		.operation
-																	)
-															}
-														}
-													})
+										} else if (ele2.name == 'Layout') {
+											ele2.setting.colList.forEach(col => {
+												if (col) {
+													if (col.fieldId == attr.attr) {
+														col.value = $this
+															.operationNumber(
+																col.value,
+																attr.value,
+																attr.operation
+															)
+													}
+												}
+											})
 										}
 									});
 								});
@@ -1244,51 +1266,29 @@
 								}
 							}
 							if (bFindCondition) {
-
 								rowData.attrs.forEach(attr => {
 									ele.form.items.forEach(ele2 => {
-										if (ele2.name !=
-											'Layout') {
-											if (ele2.fieldId ==
-												attr
-												.attr) {
+										if (ele2.name != 'Layout') {
+											if (ele2.fieldId == attr.attr) {
 												ele2.value =
-													$this
-													.operationNumber(
-														ele2
-														.value,
-														attr
-														.value,
-														attr
-														.operation
+													$this.operationNumber(
+														ele2.value,
+														attr.value,
+														attr.operation
 													)
 											}
-										} else if (ele2.name ==
-											'Layout') {
-											ele2.setting
-												.colList
-												.forEach(
-													col => {
-														if (
-															col) {
-															if (col
-																.fieldId ==
-																attr
-																.attr
-															) {
-																col.value =
-																	$this
-																	.operationNumber(
-																		col
-																		.value,
-																		attr
-																		.value,
-																		attr
-																		.operation
-																	)
-															}
-														}
-													})
+										} else if (ele2.name == 'Layout') {
+											ele2.setting.colList.forEach(col => {
+												if (col) {
+													if (col.fieldId == attr.attr) {
+														col.value =
+															$this.operationNumber(
+																col.value, attr
+																.value, attr
+																.operation)
+													}
+												}
+											})
 										}
 									});
 								});
@@ -1321,28 +1321,21 @@
 					data.row.forEach(row => {
 						detailStyle = JSON.parse(styleStr);
 						detailStyle.form.objId = row.id;
-						detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '')
-							.replace(
-								'{', '').replace('}',
-								'') : 'null';
+						detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '').replace(
+							'}', '') : 'null';
 						detailStyle.form.attrs = row.attrs;
 						row.attrs.forEach(attr => {
 							detailStyle.form.items.forEach(ele => {
 								if (ele.name != 'Layout') {
-									if (ele.fieldId == attr.attr) ele
-										.value =
-										attr.value;
+									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;
-											}
-										});
+									ele.setting.colList.forEach(col => {
+										if (col) {
+											if (col.fieldId == attr.attr)
+												col.value = attr.value;
+										}
+									});
 								}
 							});
 						});
@@ -1385,18 +1378,15 @@
 						cont.attrs.forEach(attr => {
 							detailStyle.form.items.forEach(ele => {
 								if (ele.name != 'Layout') {
-									if (ele.fieldId == attr.attr) ele
-										.value =
-										attr.value;
+									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;
+													attr.attr)
+													col.value = attr.value;
 											}
 										});
 								}
@@ -1406,42 +1396,22 @@
 						if (data.clear == false) {
 							var isflag = true;
 							pageData.DefList.forEach((style, index) => {
-								if (style.form.objId == detailStyle.form
-									.objId) {
+								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;
-																}
-															});
-												}
-											});
+										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;
 								}
@@ -1801,36 +1771,25 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									result.forEach(async (attr, key) => {
-										$this.$data.head_styledef.form.items
-											.forEach(
-												async (ele,
-													index) => {
-													//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-													if (ele.name != 'Layout') {
-														if (ele.fieldId == attr
+										$this.$data.head_styledef.form.items.forEach(async (ele,
+											index) => {
+											//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+											if (ele.name != 'Layout') {
+												if (ele.fieldId == attr.attr) {
+													ele.show = attr.show;
+												}
+											} else if (ele.name == 'Layout') {
+												ele.setting.colList.forEach((col) => {
+													if (col) {
+														if (col.fieldId == attr
 															.attr) {
-															ele.show = attr
+															col.show = attr
 																.show;
 														}
-													} else if (ele.name ==
-														'Layout') {
-														ele.setting.colList
-															.forEach(
-																col => {
-																	if (col) {
-																		if (col
-																			.fieldId ==
-																			attr
-																			.attr
-																		) {
-																			col.show =
-																				attr
-																				.show;
-																		}
-																	}
-																});
 													}
 												});
+											}
+										});
 									});
 									var head_styledef = JSON.parse(JSON.stringify($this.$data
 										.head_styledef));
@@ -1858,63 +1817,8 @@
 						console.log($this.head_styledef);
 						if (data.result) {
 							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.head_styledef.form.items
-									.length; c++) {
-									var attr = $this.$data.head_styledef.form.items[c];
-									//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-									if ($this.head_styledef.form.model[result[i].attr] ==
-										undefined) {
-										$this.head_styledef.form.model[result[i].attr] =
-											result[i]
-											.value;
-									}
-									//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-									if (attr.name != 'Layout') {
-										if (attr.fieldId == result[i].attr) {
-											attr.value = '';
-											attr.oldvalue = '';
-											attr.value = result[i].value;
-											attr.oldvalue = result[i].value;
-											$this.head_styledef.form.model[attr.fieldId] =
-												result[i]
-												.value;
-										}
-									} else if (attr.name == 'Layout') {
-										attr.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == result[i].attr) {
-													col.value = '';
-													col.oldvalue = '';
-													col.value = result[i].value;
-													col.oldvalue = result[i].value;
-													$this.head_styledef.form.model[col
-															.fieldId] =
-														result[i].value;
-												}
-											}
-										});
-									}
-								}
-
-								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i]
-											.attr) {
-											$this.$data.refdatastore[j].value = result[i]
-												.value;
-										}
-									}
-								}
+							$this.setFormValues(result)
 							}
-						}
 					}
 
 				}).catch(ex => {
@@ -1950,18 +1854,6 @@
 					attr: a,
 					value: obj_attr[a] || "",
 				}));
-				if ($this.refdatastore.length > 0) {
-					for (var i = 0; i < $this.refdatastore.length; i++) {
-						if (!req.filter(function(s) {
-								return $this.refdatastore[i].attr == s.name
-							}).length) {
-							req.push({
-								'attr': $this.refdatastore[i].attr,
-								'value': $this.refdatastore[i].value
-							});
-						}
-					}
-				}
 
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
@@ -2469,6 +2361,7 @@
 								}
 							})
 							$this.$set($this.pageDetail, pageIndex, pageData)
+							console.log($this.pageDetail)
 
 						},
 					}
@@ -3036,10 +2929,6 @@
 				padding: 0px;
 				margin: 0;
 
-				.dv-panel-form-item {
-					margin: 0;
-					padding: 0px;
-				}
 
 				.uni-forms-item {
 					padding-bottom: 5rpx;
@@ -3066,15 +2955,10 @@
 						vertical-align: middle;
 					}
 
-					.form-item-span {
-						vertical-align: text-top;
-						color: #2d8cf0;
-						white-space: normal;
-						word-break: break-all;
-						width: 100%;
+					.uni-input:hover {
+						border: 1px solid rgb(41, 121, 255);
 					}
 				}
-
 
 
 			}
@@ -3198,13 +3082,13 @@
 			background-color: #f3f3f3 !important;
 		}
 
-		::v-deep .uni-row {
-			margin-bottom: 0px;
-		}
+		// ::v-deep .uni-row {
+		// 	margin-bottom: 0px;
+		// }
 
-		.view-tabpage ::v-deep .uni-row {
-			margin-bottom: 5px;
-		}
+		// .view-tabpage ::v-deep .uni-row {
+		// 	margin-bottom: 5px;
+		// }
 
 		.demo-uni-col {
 			height: 36px;
diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue
index e50b6c3..139c784 100644
--- a/pages/modal/form/index.vue
+++ b/pages/modal/form/index.vue
@@ -83,7 +83,6 @@
 				global_attr: [],
 				ext_info: {},
 				data_json: [],
-				refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 				popupType: "center",
 				check_list: {},
 				popupParam: {},
@@ -1142,63 +1141,7 @@
 						}
 						console.log($this.head_styledef);
 						if (data.result) {
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.head_styledef.form.items
-									.length; c++) {
-									var attr = $this.$data.head_styledef.form.items[c];
-									//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-									if ($this.head_styledef.form.model[result[i].attr] ==
-										undefined) {
-										$this.head_styledef.form.model[result[i].attr] =
-											result[i]
-											.value;
-									}
-									//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-									if (attr.name != 'Layout') {
-										if (attr.fieldId == result[i].attr) {
-											attr.value = '';
-											attr.oldvalue = '';
-											attr.value = result[i].value;
-											attr.oldvalue = result[i].value;
-											$this.head_styledef.form.model[attr.fieldId] =
-												result[i]
-												.value;
-										}
-									} else if (attr.name == 'Layout') {
-										attr.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == result[i].attr) {
-													col.value = '';
-													col.oldvalue = '';
-													col.value = result[i].value;
-													col.oldvalue = result[i].value;
-													$this.head_styledef.form.model[col
-															.fieldId] =
-														result[i].value;
-												}
-											}
-										});
-									}
-								}
-
-								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i]
-											.attr) {
-											$this.$data.refdatastore[j].value = result[i]
-												.value;
-										}
-									}
-								}
-							}
+							$this.setFormValues(data.result)
 						}
 					}
 
@@ -1235,18 +1178,7 @@
 					attr: a,
 					value: obj_attr[a] || "",
 				}));
-				if ($this.refdatastore.length > 0) {
-					for (var i = 0; i < $this.refdatastore.length; i++) {
-						if (!req.filter(function(s) {
-								return $this.refdatastore[i].attr == s.name
-							}).length) {
-							req.push({
-								'attr': $this.refdatastore[i].attr,
-								'value': $this.refdatastore[i].value
-							});
-						}
-					}
-				}
+			
 				let global_attr = Base64.encode(JSON.stringify(this.global_attr))
 				let data_json = Base64.encode(JSON.stringify(this.data_json))
 				let ext_info = Base64.encode(JSON.stringify(this.ext_info))
diff --git a/store/index.js b/store/index.js
deleted file mode 100644
index ddeeac3..0000000
--- a/store/index.js
+++ /dev/null
@@ -1,1690 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import Base64 from '../components/js-base64/base64.js'
-import utils from "@/js/utils.js"
-Vue.use(Vuex)
-
-import app from './modules/app'
-const store = new Vuex.Store({
-	modules: {
-		app,
-		Base64,
-	},
-	state: {
-		hasLogin: false,
-		deviceId: '',
-		apkVersionInfo: "",
-		loginProvider: "",
-		areaFunc: '',
-		thisareaFuncID: '',
-		thisareaFuncSubID: '',
-		thisEditName: '',
-		thisEditSubName: '',
-		thisDictName: '',
-		_classAttrList: {},
-		_classGridStyleInfo: {},
-		_subClassAttrList: {},
-		_subClassGridStyleInfo: {},
-		_dicValueInfo: {},
-		DataObjRunCustomEventInfo: '',
-		querySelpsn: '',
-		ProjectGetAnalysisList: '',
-		addclassattr: '',
-		DelObj: '',
-		username: "sa",
-		userpwd: "0000",
-		url: "139.159.144.10:8080/mobox3", //115.29.185.26:5000
-		OIOrgSAPI: '', //115.29.185.26:5101
-		OIMoboxSAPI: '', //115.29.185.26:5102
-		OIDataSAPI: '', //115.29.185.26:5103
-		OIMongodbSvr: '' //115.29.185.26:5201
-	},
-	mutations: {
-		setDeviceId(state, ret) {
-			state.deviceId = ret;
-		},
-		setUrl(state, url) {
-			state.url = url;
-		},
-		setOrgSApi(state, url) {
-			state.OIOrgSAPI = url;
-		},
-		setMobxoSApi(state, url) {
-			state.OIMoboxSAPI = url;
-		},
-		setDataSApi(state, url) {
-			state.OIDataSAPI = url;
-		},
-		setMongodbSvr(state, url) {
-			state.OIMongodbSvr = url;
-		},
-		setApkVersionInfo(state, ret) {
-			state.apkVersionInfo = ret;
-		},
-		login(state, provider) {
-			state.hasLogin = true;
-			state.loginProvider = provider;
-		},
-		areaFunc(state, ret) {
-			state.areaFunc = ret;
-		},
-		setareaFuncid(state, id) {
-			state.thisareaFuncID = id;
-		},
-		setareaFunSubcid(state, id) {
-			state.thisareaFuncSubID = id;
-		},
-		seteditName(state, editName) {
-			state.thisEditName = editName;
-		},
-		seteditSubName(state, editName) {
-			state.thisEditSubName = editName;
-		},
-		setDictName(state, dictName) {
-			state.thisDictName = dictName;
-		},
-		classAttrList(state, ret) {
-			// state._classAttrList[state.thisareaFuncID] = ret;
-			Vue.set(state._classAttrList, state.thisareaFuncID, ret);
-		},
-		classGridStyleInfo(state, ret) {
-			// state._classGridStyleInfo[state.thisareaFuncID] = ret;
-			var data = {};
-			if (state._classGridStyleInfo[state.thisareaFuncID])
-				data = state._classGridStyleInfo[state.thisareaFuncID];
-			Vue.set(data, state.thisEditName, ret);
-			Vue.set(state._classGridStyleInfo, state.thisareaFuncID, data);
-		},
-		subClassAttrList(state, ret) {
-			Vue.set(state._subClassAttrList, state.thisareaFuncSubID, ret);
-		},
-		subClassGridStyleInfo(state, ret) {
-			var data = {};
-			if (state._subClassGridStyleInfo[state.thisareaFuncSubID])
-				data = state._subClassGridStyleInfo[state.thisareaFuncSubID];
-			Vue.set(data, state.thisEditSubName, ret);
-			Vue.set(state._subClassGridStyleInfo, state.thisareaFuncSubID, data);
-		},
-		dicValueInfo(state, ret) {
-			// state._dicValueInfo[state.thisareaFuncID] = ret;
-			Vue.set(state._dicValueInfo, state.thisDictName, ret);
-		},
-		DataObjRunCustomEventInfo(state, ret) {
-			state.DataObjRunCustomEventInfo = ret;
-		},
-		querySelpsn(state, ret) {
-			state.querySelpsn = ret;
-		},
-		ProjectGetAnalysisList(state, ret) {
-			state.ProjectGetAnalysisList = ret;
-		},
-		addclassattr(state, ret) {
-			state.addclassattr = ret;
-		},
-		DelObj(state, ret) {
-			state.DelObj = ret;
-		},
-		logout(state) {
-			state.hasLogin = false
-		},
-	},
-	getters: {
-		getDeviceId(state, ret) {
-			return state.deviceId
-		},
-		GetApkServionInfo(state) {
-			return state.apkVersionInfo
-		},
-		loginid(state) {
-			return state.loginProvider.loginid
-		},
-		getUrl(state) {
-			return state.url
-		},
-		getOrgSApi(state, url) {
-			return state.OIOrgSAPI;
-		},
-		getMobxoSApi(state, url) {
-			return state.OIMoboxSAPI;
-		},
-		getDataSApi(state, url) {
-			return state.OIDataSAPI;
-		},
-		getMongodbSvr(state, url) {
-			return state.OIMongodbSvr;
-		},
-		getclassAttrList(state) {
-			return state._classAttrList[state.thisareaFuncID];
-		},
-		getclassGridStyleInfo(state) {
-			if (state._classGridStyleInfo[state.thisareaFuncID])
-				return state._classGridStyleInfo[state.thisareaFuncID][state.thisEditName];
-			else
-				return "";
-		},
-		getSubClassAttrList(state) {
-			return state._subClassAttrList[state.thisareaFuncSubID];
-		},
-		getSubClassGridStyleInfo(state) {
-			if (state._subClassGridStyleInfo[state.thisareaFuncSubID])
-				return state._subClassGridStyleInfo[state.thisareaFuncSubID][state.thisEditSubName];
-			else
-				return "";
-		},
-		getdicValueInfo(state) {
-			return state._dicValueInfo[state.thisDictName];
-		}
-
-
-	},
-	actions: {
-		//{commit} 瑙ｆ瀯锛�-		//univerifyInfo 鑷畾涔夊弬鏁�-		GetApkVersionInfo: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				univerifyInfo = univerifyInfo || {};
-				univerifyInfo.server = univerifyInfo.server || '';
-				if (univerifyInfo.server.length == 0) {
-					reject({
-						"errMsg": '鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'
-					});
-				}
-				var openinfo = "http://" + univerifyInfo.server + "/"; //+"/OrgWebS"
-				if (univerifyInfo.server.includes("://")) {
-					openinfo = univerifyInfo.server + "/"
-				}
-				//璁剧疆鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧�-				commit("setUrl", openinfo);
-				// var ser = univerifyInfo.server.split('/');
-				// if(ser[1] == 'mobox3'){
-				// 	// reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸佽嚜鍔ㄦ洿鏂帮紒"});
-				// 	resolve({code:'00000',data:"",msg:""});
-				// 	return;
-				// }
-				uni.request({
-					url: openinfo + "PDA/GetApkVersionInfo",
-					data: {},
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						console.log(res);
-						if (res.statusCode == 404) {
-							reject({
-								"errMsg": "鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細" + openinfo +
-									",鏂规硶锛欸etApkVersionInfo,鏄惁姝ｇ‘"
-							});
-						} else if (res.statusCode == 500) {
-							reject({
-								"errMsg": "鏈壘鍒版洿鏂板寘鎵�湪鐩綍锛�
-							});
-						}
-						const ret = res.data
-						if (ret.code == '00000') {
-							commit("setApkVersionInfo", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		login: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				univerifyInfo = univerifyInfo || {};
-				univerifyInfo.server = univerifyInfo.server || '';
-				univerifyInfo.uname = univerifyInfo.uname || '';
-				univerifyInfo.pwd = univerifyInfo.pwd || '';
-				if (univerifyInfo.server.length == 0) {
-					reject({
-						"errMsg": '鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'
-					});
-				}
-				if (univerifyInfo.uname.length < 2) {
-					reject({
-						"errMsg": '璐﹀彿鏈�煭涓�2 涓瓧绗�'
-					});
-				}
-				if (univerifyInfo.pwd.length < 1) {
-					reject({
-						"errMsg": '瀵嗙爜鏈�煭涓�1涓瓧绗�'
-					});
-				}
-				var openinfo = "http://" + univerifyInfo.server + "/";
-				if (univerifyInfo.server.includes("://")) {
-					openinfo = univerifyInfo.server + "/"
-				}
-				//璁剧疆鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧�-				commit("setUrl", openinfo);
-				var ser = univerifyInfo.server.toLowerCase().split('/');
-				var url = openinfo + "PDA/SignIn";
-				var header = {
-					'content-type': 'application/x-www-form-urlencoded'
-				};
-				commit("setOrgSApi", '');
-				commit("setMobxoSApi", '');
-				commit("setDataSApi", '');
-				commit("setMongodbSvr", '');
-				if (ser[ser.length - 1] == 'mobox3') { //鍒ゆ柇鍦板潃鏄惁鏄疢obox3
-
-					const orgsport = univerifyInfo.orgsport || 5101
-					const moboxsport = univerifyInfo.moboxsport || 5102
-					const datasport = univerifyInfo.datasport || 5103
-					const mongodbsport = univerifyInfo.mongodbsport || 5201
-
-					var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/";
-					var mobxoSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
-					var dataSApi = "http://" + ser[0].split(':')[0] + ":" + datasport + "/";
-					var mongodbSvr = "http://" + ser[0].split(':')[0] + ":" + mongodbsport + "/";
-					if (univerifyInfo.server.includes("://")) {
-						orgSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + orgsport + "/";
-						mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
-						dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
-						mongodbSvr = ser[0] + "//" + ser[2].split(':')[0] + ":" + mongodbsport +
-							"/";
-					}
-					commit("setOrgSApi", orgSApi);
-					commit("setMobxoSApi", mobxoSApi);
-					commit("setDataSApi", dataSApi);
-					commit("setMongodbSvr", mongodbSvr);
-					url = orgSApi + 'api/user/ace/VerifyPassword';
-					univerifyInfo = {
-						app_type: "mobox",
-						user_login: Base64.encode(univerifyInfo.uname),
-						user_psw: Base64.encode(univerifyInfo.pwd),
-						client_info: {
-							type: 3, //瀹㈡埛绔被鍨嬶細0鈥揚C锛�鈥揥EB锛�鈥撳畨鍗擄紝3鈥撳畨鍗揚AD锛�鈥搃Phone锛�5鈥搃Pad锛�6鈥撳叾瀹�-							num: state.deviceId //PDA鐨勮澶囧彿
-						}
-					};
-					header = {};
-				}
-				console.log(univerifyInfo);
-				uni.request({
-					url: url,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: header,
-					success: (res) => {
-						console.log(res);
-						const ret = res.data
-						if (ret.code == '00000' || ret.err_code == 0) {
-							commit("login", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg ? ret.msg : ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		areaFunc: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.loginProvider.loginid.result.session_id);
-				univerifyInfo.loginInfo = JSON.stringify({
-					server: utils.session.getValue('server'),
-					uname: utils.session.getValue('account'),
-					pwd: utils.session.getValue('password'),
-					cname: plus.device.model,
-					type: "0"
-				});
-				var url = state.url + "PDA/PDAArea";
-				var header = {
-					'content-type': 'application/x-www-form-urlencoded'
-				};
-				if (state.OIMoboxSAPI) { //鍒ゆ柇鏄惁鏄疢obox3
-					url = state.OIMoboxSAPI + 'api/app/area/GetList?sessionid=' + state
-						.loginProvider.loginid.result.session_id;
-					univerifyInfo = {
-						app_type: univerifyInfo.app_type || "MES",
-					};
-					header = {};
-				}
-
-				uni.request({
-					url: url,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: header,
-					success: (res) => {
-						console.log(res);
-						if (res.statusCode == 404) {
-							reject({
-								"errMsg": "鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細" + openinfo
-							});
-						}
-						// if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
-						// 	uni.reLaunch({
-						// 		url: '../login/index'
-						// 	})
-						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
-						// }
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哸reaFunc銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.code == '00000' || ret.err_code == 0) {
-							commit("areaFunc", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-		// Mobox3鑾峰彇搴旂敤棰嗗煙涓嬬殑鍔熻兘鐐�-		GetFuncTree: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.loginProvider.loginid.result.session_id);
-				uni.request({
-					url: state.OIMoboxSAPI + 'api/app/GetFuncTree?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏咷etFuncTree銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.err_code == 0) {
-							// commit("areaFunc",ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		classAttrList: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				univerifyInfo.loginInfo = JSON.stringify({
-					server: utils.session.getValue('server'),
-					uname: utils.session.getValue('account'),
-					pwd: utils.session.getValue('password'),
-					cname: plus.device.model,
-					type: "0"
-				});
-
-				uni.request({
-					url: state.url + "PDA/PDAAttrList",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						console.log(res);
-						// if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
-						// 	uni.reLaunch({
-						// 		url: '../login/index'
-						// 	})
-						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
-						// }
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哻lassAttrList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.code == '00000') {
-							commit("classAttrList", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		classGridStyleInfo: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				univerifyInfo.loginInfo = JSON.stringify({
-					server: utils.session.getValue('server'),
-					uname: utils.session.getValue('account'),
-					pwd: utils.session.getValue('password'),
-					cname: plus.device.model,
-					type: "0"
-				});
-
-				uni.request({
-					url: state.url + "PDA/PDAGridStyleGetInfo",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						console.log(res);
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哻lassGridStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.code == '00000') {
-							// var data ={};
-							// Vue.set(data,univerifyInfo.name,ret);
-							commit("classGridStyleInfo", ret);
-							resolve(ret);
-						} else {
-
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		subClassAttrList: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				univerifyInfo.loginInfo = JSON.stringify({
-					server: utils.session.getValue('server'),
-					uname: utils.session.getValue('account'),
-					pwd: utils.session.getValue('password'),
-					cname: plus.device.model,
-					type: "0"
-				});
-
-				uni.request({
-					url: state.url + "PDA/PDAAttrList",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						console.log(res);
-						// if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
-						// 	uni.reLaunch({
-						// 		url: '../login/index'
-						// 	})
-						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
-						// }
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏唖ubClassAttrList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.code == '00000') {
-							commit("subClassAttrList", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		subClassGridStyleInfo: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				univerifyInfo.loginInfo = JSON.stringify({
-					server: utils.session.getValue('server'),
-					uname: utils.session.getValue('account'),
-					pwd: utils.session.getValue('password'),
-					cname: plus.device.model,
-					type: "0"
-				});
-
-				uni.request({
-					url: state.url + "PDA/PDAGridStyleGetInfo",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-
-						console.log(res);
-						// if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
-						// 	uni.reLaunch({
-						// 		url: '../login/index'
-						// 	})
-						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
-						// }
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏唖ubClassGridStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.code == '00000') {
-							// var data ={};
-							// Vue.set(data,univerifyInfo.name,ret);
-							commit("subClassGridStyleInfo", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		dicValueInfo: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				univerifyInfo.loginInfo = JSON.stringify({
-					server: utils.session.getValue('server'),
-					uname: utils.session.getValue('account'),
-					pwd: utils.session.getValue('password'),
-					cname: plus.device.model,
-					type: "0"
-				});
-
-				uni.request({
-					url: state.url + "PDA/PDADicValueGetInfo",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						// console.log(res);
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哾icValueInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.code == '00000') {
-							state.thisDictName = univerifyInfo.dic_name
-							commit("dicValueInfo", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		DataObjRunCustomEventInfo: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				univerifyInfo.loginInfo = JSON.stringify({
-					server: utils.session.getValue('server'),
-					uname: utils.session.getValue('account'),
-					pwd: utils.session.getValue('password'),
-					cname: plus.device.model,
-					type: "0"
-				});
-				uni.request({
-					url: state.url + "PDA/PDADataObjRunCustomEvent",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						// console.log(res);
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏咲ataObjRunCustomEventInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.code == '00000') {
-							commit("DataObjRunCustomEventInfo", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		querySelpsn: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				var url = state.url + "selpsn/queryjson";
-				var datajson = univerifyInfo;
-				var header = {
-					'content-type': 'application/x-www-form-urlencoded'
-				};
-				if (state.OIOrgSAPI) { //鍒ゆ柇鏄惁鏄疢obox3
-					url = state.OIOrgSAPI + 'api/user/query/query?sessionid=' + state.loginProvider
-						.loginid.result.session_id;
-					datajson = {
-						query_str: univerifyInfo.jp,
-					};
-					header = {};
-				}
-				uni.request({
-					url: url,
-					data: datajson,
-					method: 'POST',
-					dataType: "json",
-					header: header,
-					success: (res) => {
-						// console.log(res);
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏唓uerySelpsn銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.code == '00000' || ret.err_code == 0) {
-							commit("querySelpsn", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		ProjectGetAnalysisList: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				var url = state.url + "bpm/ProjectGetAnalysisList";
-				var header = {
-					'content-type': 'application/x-www-form-urlencoded'
-				};
-				if (state.OIMoboxSAPI) { //鍒ゆ柇鏄惁鏄疢obox3
-					// url = state.OIMoboxSAPI+'api/app/area/GetList?sessionid='+state.loginProvider.loginid.result.session_id;
-					// univerifyInfo = {
-					// 	app_type: "MES",
-					// };
-					// header={};
-					reject({
-						"errMsg": "Mobox3鏆傛椂鏈敮鎸侀�鎷╅」鐩帴鍙ｏ紒"
-					});
-					// resolve({code:'00000',data:"",msg:""});
-					return;
-				}
-
-				uni.request({
-					url: url,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: header,
-					success: (res) => {
-						console.log(res);
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哖rojectGetAnalysisList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-						if (ret.code == '00000') {
-							commit("ProjectGetAnalysisList", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.msg || ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		addclassattr: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				univerifyInfo.loginInfo = JSON.stringify({
-					server: utils.session.getValue('server'),
-					uname: utils.session.getValue('account'),
-					pwd: utils.session.getValue('password'),
-					cname: plus.device.model,
-					type: "0"
-				});
-				uni.request({
-					url: state.url + "PDA/addclassattr",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						// console.log(res);
-						// if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
-						// 	uni.reLaunch({
-						// 		url: '../login/index'
-						// 	})
-						// 	reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
-						// }
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哸ddclassattr銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-						if (ret.code == '00000') {
-							commit("addclassattr", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": JSON.stringify(ret)
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		DelObj: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				uni.request({
-					url: state.url + "PDA/DelObj",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (res) => {
-						console.log(res);
-						var ret = res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏咲elObj銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-						if (ret.code == '00000') {
-							commit("DelObj", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": JSON.stringify(ret)
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-
-		// api/class/attr/GetList?sessionid=SESSION_ID
-		// Mobox3寰楀埌鏁版嵁绫诲睘鎬�-		classAttrGetList: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				uni.request({
-					url: state.OIDataSAPI + 'api/class/attr/GetList?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哻lassAttrGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-						if (ret.err_code == 0) {
-							commit("classAttrList", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-		// api/class/attr/GetList?sessionid=SESSION_ID
-		// Mobox3寰楀埌鏁版嵁绫诲睘鎬�-		subClassAttrGetList: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				uni.request({
-					url: state.OIDataSAPI + 'api/class/attr/GetList?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏唖ubClassAttrGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.err_code == 0) {
-							commit("subClassAttrList", ret);
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-		// api/dict/item/GetInfo?sessionid=SESSION_ID
-		// Mobox3寰楀埌瀛楀吀椤瑰垪琛�-		DictItemGetList: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				uni.request({
-					url: state.OIMoboxSAPI + 'api/dict/item/GetInfo?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏咲ictItemGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.err_code == 0) {
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-		// api/dict/GetInfo2?sessionid=SESSION_ID
-		// Mobox3寰楀埌瀛楀吀淇℃伅
-		DictGetInfo: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				uni.request({
-					url: state.OIMoboxSAPI + 'api/dict/GetInfo2?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏咲ictGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.err_code == 0) {
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		// api/dataobj/Create?sessionid=SESSION_ID
-		// Mobox3鍒涘缓鏁版嵁瀵硅薄
-		createDataObj: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.url);
-				uni.request({
-					url: state.OIDataSAPI + 'api/dataobj/Create?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哻reateDataObj銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-
-
-						if (ret.err_code == 0) {
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg
-							});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-		// api/class/uistyle/GetInfo?sessionid=SESSION_ID
-		// Mobox3寰楀埌鏁版嵁绫绘樉绀烘牱寮忎俊鎭�-		UIStyleGetInfo: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				//  console.log(state.loginProvider.loginid.result.session_id);
-				// console.log(state.OIDataSAPI)
-				uni.request({
-					url: state.OIDataSAPI + 'api/class/uistyle/GetInfo?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哢IStyleGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-						if (ret.err_code == 0) {
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg || ret.errMsg
-							});
-						}
-					},
-					fail: (err) => {
-						console.log("fail", err);
-						reject(err);
-					}
-				})
-			})
-		},
-		// api/dataobj/RunCustomEvent?sessionid=SESSION_ID
-		// Mobox3鎵ц鑷畾涔夎剼鏈�-		runCustomEvent: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.loginProvider.loginid.result.session_id);
-				uni.request({
-					url: state.OIDataSAPI + 'api/dataobj/RunCustomEvent?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏唕unCustomEvent銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-						if (ret.err_code == 0) {
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg || ret.errMsg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-		// api/dataobj/Delete?sessionid=SESSION_ID
-		// Mobox3鍒犻櫎鏁版嵁瀵硅薄
-		dataObjDel: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.loginProvider.loginid.result.session_id);
-				uni.request({
-					url: state.OIDataSAPI + 'api/dataobj/Delete?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哾ataObjDel銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
-							}
-						}
-						if (ret.err_code == 0) {
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg || ret.errMsg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-		// api/dataobj/query/Query?sessionid=SESSION_ID
-		// Mobox3鏌ヨ鏁版嵁瀵硅薄
-		dataObjQuery: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.loginProvider.loginid.result.session_id);
-				uni.request({
-					url: state.OIDataSAPI + 'api/dataobj/query/Query?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哾ataObjQuery銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-						if (ret.err_code == 0) {
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg || ret.errMsg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-		// api/app/GetInfo?sessionid=SESSION_ID
-		// Mobox3鑾峰彇鍔熻兘鐐逛俊鎭�-		appGetInfo: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				// console.log(state.loginProvider.loginid.result.session_id);
-				uni.request({
-					url: state.OIMoboxSAPI + 'api/app/GetInfo?sessionid=' + state
-						.loginProvider.loginid.result.session_id,
-					data: univerifyInfo,
-					method: 'POST',
-					dataType: "json",
-					success: (_res) => {
-						// console.log(_res);
-						var ret = _res.data
-						if (typeof ret == 'string') {
-							try {
-								try {
-									try {
-										ret = JSON.parse(ret.replace(/\\"/g, '"'));
-									} catch (ex) {
-										ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
-									}
-								} catch (ex) {
-									ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
-										/[\r\n]/g,
-										'<br>').replace(/[\t]/g, '    '));
-								}
-							} catch (ex) {
-								console.log(ret)
-								return reject(
-									'灏哸ppGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
-								)
-							}
-						}
-						if (ret.err_code == 0) {
-							resolve(ret);
-						} else {
-							reject({
-								"errMsg": ret.err_msg || ret.errMsg
-							});
-						}
-					},
-					fail: (err) => {
-						// console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-
-	}
-})
-
-export default store
\ No newline at end of file
diff --git a/store/modules/app.js b/store/modules/app.js
deleted file mode 100644
index acbb187..0000000
--- a/store/modules/app.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export default {
-  state: {
-    appInfo:"Bullllllllll"
-  },
-  mutations: {
-    setAppInfo(state, value) {
-      state.appInfo= value;
-    }
-  },
-  actions: {
-    setAppInfoAction({ commit }, value) {
-      commit("setAppInfo", value);
-    },
-  },
-  getters:{}
-};
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
deleted file mode 100644
index c2f13e8..0000000
--- a/store/modules/user.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export default {
-  state: {
-	appInfo:'',
-	hasLogin:'',
-  },
-  mutations: {
-    setAppInfo(state, value) {
-      state.appInfo= value;
-    }
-  }, 
-  actions: {
-    setAppInfoAction({ commit }, value) {
-      commit("setAppInfo", value);
-    },
-  },
-  getters:{}
-};
\ No newline at end of file

--
Gitblit v1.9.1