From 986da22689dc9a5faef751c02348fb1f47584414 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 18:53:01 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA

---
 pages/modal/3018_2.vue                         |    1 
 components/oi-form/list/input-number/index.vue |   11 
 components/oi-form/list/textarea/index.vue     |    4 
 components/oi-form/index.vue                   |    6 
 pages/modal/3200_view.vue                      |    2 
 pages/modal/5601.vue                           |   44 ++-
 pages/modal/3037_2.vue                         |  147 ++++++++------
 components/oi-form/list/input/index.vue        |    2 
 pages/modal/3037.vue                           |  258 -------------------------
 pages/modal/3200.vue                           |  111 ++++++----
 components/oi-form/list/index.vue              |    3 
 main.js                                        |    1 
 12 files changed, 183 insertions(+), 407 deletions(-)

diff --git a/components/oi-form/index.vue b/components/oi-form/index.vue
index 5de15fd..bc92baf 100644
--- a/components/oi-form/index.vue
+++ b/components/oi-form/index.vue
@@ -93,12 +93,6 @@
 				this.$emit("on-click-suffix", item)
 			},
 		},
-		// beforeUpdate() {
-		// 	console.log("beforeUpdate form", this.form)
-		// },
-		// updated() {
-		// 	console.log("updated form", this.form)
-		// }
 	};
 </script>
 
diff --git a/components/oi-form/list/index.vue b/components/oi-form/list/index.vue
index 93d8c1f..b2d9f5d 100644
--- a/components/oi-form/list/index.vue
+++ b/components/oi-form/list/index.vue
@@ -29,7 +29,7 @@
 			<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>
@@ -112,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 c2c3cbf..22e57c6 100644
--- a/components/oi-form/list/input-number/index.vue
+++ b/components/oi-form/list/input-number/index.vue
@@ -33,15 +33,10 @@
 			onClick(e) {
 				this.$emit("on-click", e)
 			},
-
-		},
-		watch: {
-			data: {
-				handler(newVal) {
-					console.log("watch input-number", newVal)
-				},
-				deep: true, // 娣卞害鐩戝惉
+			onFocus(e) {
+				this.$emit("on-focus", e)
 			},
+
 		},
 	};
 </script>
diff --git a/components/oi-form/list/input/index.vue b/components/oi-form/list/input/index.vue
index c212abe..5c0c04a 100644
--- a/components/oi-form/list/input/index.vue
+++ b/components/oi-form/list/input/index.vue
@@ -47,7 +47,7 @@
 				this.onChange(e)
 			},
 			onClick(e) {
-				this.$emit("click", e)
+				this.$emit("on-click", e)
 			},
 			onFocus(e) {
 				this.$emit("on-focus", e)
diff --git a/components/oi-form/list/textarea/index.vue b/components/oi-form/list/textarea/index.vue
index 79fa22a..b10ff9e 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>
diff --git a/main.js b/main.js
index 963bcc9..90c45f7 100644
--- a/main.js
+++ b/main.js
@@ -19,7 +19,6 @@
 const i18n = new VueI18n(i18nConfig)
 
 const app = new Vue({
-	store,
 	...App,
 	i18n,
 })
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index c1815f8..537f304 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -688,6 +688,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);
 					}
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index ce2f174..60422cc 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -2765,68 +2765,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;
-														}
-													}
-												}
 											}
 										}
 									}
@@ -3116,73 +3054,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
 														]
@@ -4184,68 +4055,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;
-													}
-												}
-											}
 										}
 									}
 								}
@@ -4565,74 +4374,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 ==
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index b2cb137..64bf0e8 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -33,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>
@@ -502,16 +532,16 @@
 											}
 										}
 										var length = 0;
-										if (!$this.refdatastore.filter(function(s) {
+										if (!$this.$data.refdatastore.filter(function(s) {
 												return result[i].attr == s.attr
 											}).length) {
 											length = 1;
-											$this.refdatastore.push(result[i]);
+											$this.$data.refdatastore.push(result[i]);
 										}
 										if (length == 0) {
-											for (var j = 0; j < $this.refdatastore.length; j++) {
-												if ($this.refdatastore[j].attr == result[i].attr) {
-													$this.refdatastore[j].value = result[i].value;
+											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;
 												}
 											}
 										}
@@ -1093,8 +1123,8 @@
 					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isflag) {
 						uni.hideKeyboard();
-						this.scanCodeVal = newVal;
-						var eventid = this.param.Scan_Code.Input_Change_Event.ID;
+						this.$data.scanCodeVal =newVal;
+						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 							//涓绘暟鎹被灞炴�
 							var obj_attr = this.head_styledef.form.model;
@@ -1572,16 +1602,16 @@
 
 										}
 										var length = 0;
-										if (!$this.refdatastore.filter(function(s) {
+										if (!$this.$data.refdatastore.filter(function(s) {
 												return result[i].attr == s.attr
 											}).length) {
 											length = 1;
-											$this.refdatastore.push(result[i]);
+											$this.$data.refdatastore.push(result[i]);
 										}
 										if (length == 0) {
-											for (var j = 0; j < $this.refdatastore.length; j++) {
-												if ($this.refdatastore[j].attr == result[i].attr) {
-													$this.refdatastore[j].value = result[i].value;
+											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;
 												}
 											}
 										}
@@ -1829,16 +1859,16 @@
 											}
 										}
 										var length = 0;
-										if (!$this.refdatastore.filter(function(s) {
+										if (!$this.$data.refdatastore.filter(function(s) {
 												return result[i].attr == s.attr
 											}).length) {
 											length = 1;
-											$this.refdatastore.push(result[i]);
+											$this.$data.refdatastore.push(result[i]);
 										}
 										if (length == 0) {
-											for (var j = 0; j < $this.refdatastore.length; j++) {
-												if ($this.refdatastore[j].attr == result[i].attr) {
-													$this.refdatastore[j].value = result[i].value;
+											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;
 												}
 											}
 										}
@@ -2272,61 +2302,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 e33cbc5..c5309ae 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -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>
@@ -1924,9 +1958,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,
@@ -1967,47 +2029,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 f8c0970..f9c889a 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -8,7 +8,7 @@
 
 					<!-- 鑷畾涔夎〃鍗曠被鍨嬫樉绀�-->
 					<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 12bcb8e..d22290d 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -24,6 +24,7 @@
 								</image>
 								<checkbox-group @change="checkboxChange">
 									<div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
+									<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':''">
@@ -31,7 +32,7 @@
 										<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> -->
@@ -1291,6 +1292,13 @@
 													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 => {
@@ -1416,7 +1424,15 @@
 								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)
@@ -1483,6 +1499,7 @@
 						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 => {
@@ -3085,10 +3102,6 @@
 				padding: 0px;
 				margin: 0;
 
-				.dv-panel-form-item {
-					margin: 0;
-					padding: 0px;
-				}
 
 				.uni-forms-item {
 					padding-bottom: 5rpx;
@@ -3115,15 +3128,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);
 					}
 				}
-
 
 
 			}
@@ -3247,13 +3255,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;

--
Gitblit v1.9.1