From dc4e312fde92237060bc23c35016f4d6b7a9187e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 24 六月 2024 11:11:37 +0800
Subject: [PATCH] 属性类型多语言

---
 pages/modal/5602.vue |  858 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 480 insertions(+), 378 deletions(-)

diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index c39c947..3c9fe26 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -1,278 +1,167 @@
-<style>
-.v-headStyle:first-child{
-	margin-top: 15rpx;
-}
-.v-headStyle .txt_title{
-  font-size: 34rpx;
-  text-align: right;
-  display: inline-block;
-  vertical-align: 12px;
-}
-.v-headStyle input{
-	display: inline-block;
-	/* border: 1px solid #d5d5d5; */
-	/* width: 65%; */
-	width: 85%;    
-	height: 52rpx;
-    line-height: 34rpx;
-	background: #FFF;
-	border-radius: 0 !important;
-	color: #2d8cf0;
-	padding: 10rpx 8rpx 12rpx;
-	font-size: 34rpx;
-	font-family: inherit;
-	box-shadow: none !important;
-	transition-duration: 0.1s;
-	margin-top: 4rpx;
-}
-.v-headStyle input::-webkit-input-placeholder {
-	font-size: 12rpx;
-}
-.input-wrapper{
-	border: 1px solid #d5d5d5;
-    display: inline-block;
-    width: 65%;    
-	line-height: 22rpx;
-}
-[nvue] uni-view {
-    position: relative;
-    border: 0 solid #000;
-    box-sizing: border-box;
-}
-.uni-input {
-	/* border: none; */
-}
-.uni-icon{
-	/* border: 1px solid red; */
-	width: 8%;
-    font-family: uniicons;
-    font-size: 40rpx;
-    font-weight: 400;
-    font-style: normal;
-    /* width: 48rpx; */
-    height: 48rpx;
-    line-height: 48rpx;
-	color: #2d8cf0;
-    cursor: pointer;
-    display: inline-block;
-	vertical-align: 18rpx;
-}
-.view-content{
-	min-height: 700rpx;
-	/* border:1px solid red; */
-}
-.dv-panel{
-    background-color:#efefef;
-    padding: 20rpx 20rpx 4rpx 0px;
-    border-radius: 12rpx;
-    margin: 10rpx 0 20rpx 0;
-	text-align: right;
-}
-.dv-panel-input{
-	width: 100%;
-    display: inline-block;
-	text-align: left;
-}
-.dv-panel-input .dv-input{
-	margin-bottom: 2rpx;
-}
-.dv-panel .txt_title{
-  font-size: 34rpx;
-  text-align: right;
-  display: inline-block;
-}
-
-.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;
-}
-.dv-panel .form-item-span{
-	vertical-align: text-top;
-    color: #2d8cf0;
-	white-space: normal;
-	word-break: break-all;
-    display: inline-block;
-	width: calc(100% - 100px);
-}
-
-.dv-panel-button{
-    /* display: inline-block;
-	margin-right: 20rpx; */
-	width: 100%;
-	text-align: left;
-	padding-bottom: 20rpx;
-}
-.dv-panel-button checkbox-group {   
-    /* float: left; */
-    padding-left: 20px;
-	display: inline-block;
-}
-.dv-panel-button button { 
-	text-align: left;   
-	line-height: 1.8;
-    border: none;
-	font-size: 34rpx;
-	width: 180rpx;   
-	display: inline-block;
-    float: right;
-	text-align: center;
-}
-button.btn_cancel {
-	width:49.5%;
-	margin-top: 50rpx;
-	padding: 20rpx;
-	line-height: 1.5;
-	border: none;
-	font-size: 38rpx;
-	font-weight: bold;
-	float: left;
-	display: inline-block;
-}
-button.btn_add {
-	width:49.5%;
-	margin-top: 50rpx;
-	padding: 20rpx;
-	line-height: 1.5;
-	border: none;
-	font-size: 38rpx;
-	font-weight: bold;
-	float: right;
-	display: inline-block;
-}
-.logo {
-	height: 100rpx;
-    width: 460rpx;
-    display: flex;
-    margin: 38% auto;
-}
-.dv-border{
-	border: 1px solid red;
-}
-.view-imagetext{
-  text-align: center;
-  width: 88%;
-  padding: 20rpx 40rpx 0px 40rpx;
-  /* border:1px solid red; */
-}
-.view-imagetext .view-imagetext-uploadlist {
-  padding: 30rpx 0px 10rpx 0px;
-  vertical-align: middle;
-  display: inline-block;
-  width: 100%;
-  height: 100%;
-  text-align: center;
-  line-height: 100%;
-  border: 2rpx solid transparent;
-  border-radius: 8rpx;
-  overflow: hidden;
-  background: #fff;
-  position: relative;
-  /* box-shadow: 0 2rpx 2rpx rgba(0, 0, 0, 0.2);
-  margin-right: 8rpx; */
-}
-.view-imagetext .txt-text{
-  display: block;
-  margin: 20rpx;
-  font-weight: bold;
-}
-.view-detalist-centen{
-  text-align: center;
-  width: 100%;
-}
-  
-.view-detalist-centen .txt-detalist{
-  background: #94D5EF;
-  display: block;
-  width: 100%;
-  font-size: 36rpx;
-  line-height: 80rpx;
-  font-weight: 500;
-}
-.panel-active{
-  border:2px solid red;
-}
-.bk-active{
-  background-color: #D6FCB2;
-}
-</style>
-<style lang="scss">
-	.demo-uni-row {
-		margin-bottom: 0px;
-		display: block;
-	}
-	::v-deep .uni-row {
-		margin-bottom: 0px;
-	}
-	.view-tabpage ::v-deep .uni-row  {
-		margin-bottom: 5px;
-	}
-	.demo-uni-col {
-		height: 36px;
-		border-radius: 5px;
-	}
-	.demo-uni-row .uni-input{
-		width: calc(100% - 120px);
-	}
-	
-</style>
-
-
 
 <template>
-	<view class="content">
+	<view class="uni-page-modal-5602">
 		<!-- 琛ㄥご鏍峰紡 -->
-		<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items" >
-			<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
-			<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-			<uni-data-select id="dv_select" v-if="item.name=='Select'"
-				:class="item.disabled?'input-disabled':''"
-				v-model="item.value"
-				:localdata="item.dict"
-				@change="onEnterChange(item)"
-				:disabled="item.disabled"
-				:clear="false"
-			></uni-data-select>
-			<view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
-				<text v-if="item.setting.prefix" 
-					class="uni-icon" 
-					:class="[item.setting.prefix]"
-					@click="onEnterChange(item)">&#xe568;</text>
-				<input
-					class="uni-input"
+		<view class="view-header">
+			<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items" >
+				<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
+				<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
+			<!-- 	<uni-data-select id="dv_select" v-if="item.name=='Select'"
 					:class="item.disabled?'input-disabled':''"
-					:type="item.name=='Input'?'text':'number'" 
 					v-model="item.value"
+					:localdata="item.dict"
+					@change="onEnterChange(item)"
 					:disabled="item.disabled"
-					:placeholder="item.placeholder"
-					:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}" 
-					:focus="focusFieldId == item.fieldId"
-					@focus="ontap(index,item)" 
-					@keyup.enter="onEnterChange(item)"
-					@blur="onEnterChange(item)"
-				/>
-				<text v-if="item.setting.suffix" 
-					class="uni-icon" 
-					:class="[item.setting.suffix]"
-					@click="onEnterChange(item)">&#xe568;</text>
-		    </view>
+					:clear="false"
+				></uni-data-select> -->
+				<uni-data-picker class="dv_select"  v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
+					v-model="item.value"  :localdata="item.dict" @change="onEnterChange(item)" :readonly="item.disabled" :clear-icon="false" :popup-title="item.label" ></uni-data-picker>				
+				
+				<view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
+					<text v-if="item.setting.prefix" 
+						class="uni-icon" 
+						:class="[item.setting.prefix]"
+						@click="onEnterChange(item)">&#xe568;</text>
+					<input
+						class="uni-input"
+						:class="item.disabled?'input-disabled':''"
+						:type="item.name=='Input'?'text':'number'" 
+						v-model="item.value"
+						:disabled="item.disabled"
+						:placeholder="item.placeholder"
+						:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}" 
+						:focus="focusFieldId == item.fieldId"
+						@focus="ontap(index,item)" 
+						@keyup.enter="onEnterChange(item)"
+						@blur="onEnterChange(item)"
+					/>
+					<text v-if="item.setting.suffix" 
+						class="uni-icon" 
+						:class="[item.setting.suffix]"
+						@click="onEnterChange(item)">&#xe568;</text>
+				</view>
+			</view>
 		</view>
 		<view class="view-content">
+				<!-- 鍒嗘嫞鐣岄潰 -->
+			<view v-if="param.Show_Welcom_Page==false" class="uni-panel-content">
+				<!-- 椤电 -->
+				<view class="dv-tab">
+					<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem"
+						styvarype="button">
+					</uni-segmented-control>
+				</view>
+				<swiper class="view-tabpage" :current="current" @change="changeSwiper">
+					<!-- 寰呭垎鎷g晫闈�-->
+					<swiper-item >
+						<view class="uni-panel-content">
+							<view class="view-tab-content" id="tabpanel" >
+								<image class="logo" v-if="detail1StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
+								<div class="dv-panel" v-for="(style,ii) in detail1StyleDefList" 
+									@tap="onPanelClick(ii)"
+									:id="'tabpanel'+style.form.htmlobjId"
+									:class="style.form.htmlobjId==active_id?'bk-active':activelist[ii].active==true?'bk-active':''">
+									<div class="dv-panel-input">
+										<div class="dv-input" v-for="(item,index) in style.form.items">
+											<!-- 鏅�甯冨眬 -->
+											<view v-if="item.name!='Layout'">
+												<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
+												<span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
+												<input
+													class="uni-input"
+													v-if="!item.disabled"
+													:type="item.name=='InputNumber'?'number':'text'" 
+													:value="item.value" 
+													:disabled="item.disabled"
+													:placeholder="item.placeholder"
+												/>
+											</view>
+											<!-- 鏍呮牸甯冨眬 -->
+											<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
+												<uni-col 
+													v-for="(cols,key) in item.setting.colList" 
+													:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col"
+												>
+													<view v-if="cols!=null" >
+														<text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
+														<span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
+														<input
+															class="uni-input"
+															v-if="!cols.disabled"
+															:type="cols.name=='InputNumber'?'number':'text'" 
+															:value="cols.value" 
+															:disabled="cols.disabled"
+															:placeholder="cols.placeholder"
+														/>
+													</view>
+												</uni-col>
+											</uni-row>
+										</div>
+									 </div>
+									<div class="dv-panel-button">
+										<checkbox-group v-if="param.Sub_Page[0].Select_Button==true">
+											<label>
+												<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
+												<!-- <text></text> -->
+											</label>
+										</checkbox-group>
+										<!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> -->
+										<button type="warn" @tap="delItem(ii)" v-if="param.Sub_Page[0].Del_Button==true">鍒犻櫎</button>
+									</div>
+								</div>
+							</view>
+							<view v-if="param.Sub_Page[0].OK_Button==true">
+								<button type="default" @tap="cancel" class="btn_cancel">鍙栨秷</button>
+							    <button type="primary" @tap="ok" class="btn_add">纭畾</button>
+							</view>
+						</view></swiper-item>
+						<!-- 宸插垎鎷g晫闈�-->
+					<swiper-item >
+						<view class="uni-panel-content">
+							<view class="view-tab-content" >
+								<image class="logo" v-if="detail2StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
+								<div class="dv-panel" v-for="(style,ii) in detail2StyleDefList">
+									<div class="dv-panel-input">
+										<div v-for="(item,index) in style.form.items">
+											<!-- 鏅�甯冨眬 -->
+											<view v-if="item.name!='Layout'">
+												<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
+												<span class="form-item-span">{{item.value}}</span>
+											</view>
+											<!-- 鏍呮牸甯冨眬 -->
+											<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
+												<uni-col 
+													:span="24 / item.setting.col"
+													v-for="(cols,key) in item.setting.colList" 
+												>
+													<view v-if="cols!=null" >
+														<text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
+														<span class="form-item-span">{{cols.value}}</span>
+													</view>
+												</uni-col>
+											</uni-row>
+										</div>
+									</div>
+									<div class="dv-panel-button">
+										<checkbox-group v-if="param.Sub_Page[1].Select_Button==true">
+											<label>
+												<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
+												<!-- <text></text> -->
+											</label>
+										</checkbox-group>
+										<!-- <button type="primary" @click="savaDataObj(style,ii)" v-if="param.Sub_Page[1].OK_Button==true">淇濆瓨</Button> -->
+										<button type="warn" @tap="delDataObj(style,ii)" v-if="param.Sub_Page[1].Del_Button==true">鍒犻櫎</button>
+									</div>
+								</div>
+							</view>
+							<view v-if=" param.Sub_Page[1].OK_Button==true">
+								<button type="default" @tap="cancel" class="btn_cancel">鍙栨秷</button>
+							    <button type="primary" @tap="ok2" class="btn_add">纭畾</button>
+							</view>	
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
 			<!-- 鍥炬枃/鏂囨湰 -->
 			<view class="view-imagetext" v-if="param.Show_Welcom_Page==true">
 			  <div class="view-imagetext-uploadlist">
@@ -283,117 +172,16 @@
 				>{{param.Welcome_Page.Text}}</Text>
 			  </div>
 			</view>
-			<!-- 鍒嗘嫞鐣岄潰 -->
-			<view v-if="param.Show_Welcom_Page==false">
-				<!-- 椤电 -->
-				<view class="dv-tab">
-					<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem"
-						styvarype="button">
-					</uni-segmented-control>
-				</view>
-				<!-- 寰呭垎鎷g晫闈�-->
-				<view class="view-tabpage" id="tabpanel" v-if="current==0">
-					<image class="logo" v-if="detail1StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
-					<div class="dv-panel" v-for="(style,ii) in detail1StyleDefList" 
-						@tap="onPanelClick(ii)"
-						:id="'tabpanel'+style.form.htmlobjId"
-						:class="style.form.htmlobjId==active_id?'bk-active':activelist[ii].active==true?'bk-active':''">
-						<div class="dv-panel-input">
-							<div class="dv-input" v-for="(item,index) in style.form.items">
-								<!-- 鏅�甯冨眬 -->
-								<view v-if="item.name!='Layout'">
-									<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
-									<span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
-									<input
-										class="uni-input"
-										v-if="!item.disabled"
-										:type="item.name=='InputNumber'?'number':'text'" 
-										:value="item.value" 
-										:disabled="item.disabled"
-										:placeholder="item.placeholder"
-									/>
-								</view>
-								<!-- 鏍呮牸甯冨眬 -->
-								<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
-									<uni-col 
-										v-for="(cols,key) in item.setting.colList" 
-										:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col"
-									>
-										<view v-if="cols!=null" >
-											<text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
-											<span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
-											<input
-												class="uni-input"
-												v-if="!cols.disabled"
-												:type="cols.name=='InputNumber'?'number':'text'" 
-												:value="cols.value" 
-												:disabled="cols.disabled"
-												:placeholder="cols.placeholder"
-											/>
-										</view>
-									</uni-col>
-								</uni-row>
-							</div>
-						 </div>
-						<div class="dv-panel-button">
-							<checkbox-group v-if="param.Sub_Page[0].Select_Button==true">
-								<label>
-									<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
-									<!-- <text></text> -->
-								</label>
-							</checkbox-group>
-							<!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> -->
-							<button type="warn" @tap="delItem(ii)" v-if="param.Sub_Page[0].Del_Button==true">鍒犻櫎</button>
-						</div>
-					</div>
-				</view>
-				<!-- 宸插垎鎷g晫闈�-->
-				<view class="view-tabpage2" v-if="current==1">
-					<image class="logo" v-if="detail2StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
-					<div class="dv-panel" v-for="(style,ii) in detail2StyleDefList">
-						<div class="dv-panel-input">
-							<div v-for="(item,index) in style.form.items">
-								<!-- 鏅�甯冨眬 -->
-								<view v-if="item.name!='Layout'">
-									<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
-									<span class="form-item-span">{{item.value}}</span>
-								</view>
-								<!-- 鏍呮牸甯冨眬 -->
-								<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
-									<uni-col 
-										:span="24 / item.setting.col"
-										v-for="(cols,key) in item.setting.colList" 
-									>
-										<view v-if="cols!=null" >
-											<text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
-											<span class="form-item-span">{{cols.value}}</span>
-										</view>
-									</uni-col>
-								</uni-row>
-							</div>
-						</div>
-						<div class="dv-panel-button">
-							<checkbox-group v-if="param.Sub_Page[1].Select_Button==true">
-								<label>
-									<checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
-									<!-- <text></text> -->
-								</label>
-							</checkbox-group>
-							<!-- <button type="primary" @click="savaDataObj(style,ii)" v-if="param.Sub_Page[1].OK_Button==true">淇濆瓨</Button> -->
-							<button type="warn" @tap="delDataObj(style,ii)" v-if="param.Sub_Page[1].Del_Button==true">鍒犻櫎</button>
-						</div>
-					</div>
-				</view>
-			</view>
+		
 		</view>
-		<view v-if="current==0 && param.Sub_Page[0].OK_Button==true">
+		<!-- <view v-if="current==0 && param.Sub_Page[0].OK_Button==true">
 			<button type="default" @tap="cancel" class="btn_cancel">鍙栨秷</button>
 		    <button type="primary" @tap="ok" class="btn_add">纭畾</button>
 		</view>
 		<view v-if="current==1 && param.Sub_Page[1].OK_Button==true">
 			<button type="default" @tap="cancel" class="btn_cancel">鍙栨秷</button>
 		    <button type="primary" @tap="ok2" class="btn_add">纭畾</button>
-		</view>
+		</view> -->
     </view>
 </template>
 
@@ -410,6 +198,7 @@
       ClsID2: "Sorting_Result",
       param: {},
 	  focusFieldId:"",
+	  focusOldFieldId:"",
 	  head_styledef:{
 		form:{
 			items:[]
@@ -477,7 +266,12 @@
 	  		});
 	  	});
 	  },
-	  
+	  changeSwiper(evt) {
+	  	let index = evt.target.current || evt.detail.current;
+	  	this.setData({
+	  		current: index
+	  	})
+	  },
     async Head_UIStyleGetInfo(class_id,style_id){   //鑾峰彇鑷畾涔夎〃鍗曟牱寮� 		var $this = this;
 		var dataInfo={
@@ -642,6 +436,7 @@
 	
 	ontap(index,item){ //鎵爜鍔熻兘
 		// var $ele = e;
+		this.focusOldFieldId = item.fieldId
 		getApp().onScan((result)=>{
 			console.log(result.decodedata);
 			item.value = result.decodedata;
@@ -829,7 +624,7 @@
 								else if(item.action_type == "set_subtable_page_content"){  //宸插垎鎷� 									$this.$data.param.Show_Welcom_Page=false;
 									var value = item.value;
-									if(value.clear == true && $this.$data.detail1StyleDefList.length>0 && value.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鍒嗘嫞鏄惁鏈夋暟鎹�+									if( value.clear_confirm != false && value.clear == true && $this.$data.detail1StyleDefList.length>0 && value.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鍒嗘嫞鏄惁鏈夋暟鎹� 										uni.showModal({
 											title: '鎻愮ず',
 											content: '绯荤粺妫�祴鍒版湁寰呭垎鎷d腑鐨勬暟鎹紝缁х画鎿嶄綔浼氭竻绌猴紝鏄惁缁х画锛�,
@@ -910,9 +705,14 @@
 									}
 								}
 								else if (item.action_type == "set_dlg_current_edit_attr") {
-									if($this.focusFieldId == item.value)
+									if($this.focusOldFieldId == item.value)
 										$this.setData({focusFieldId: ""})
-									$this.setData({focusFieldId:item.value})
+									else{
+										$this.setData({focusFieldId:$this.focusOldFieldId})	
+									}
+									$this.$nextTick(()=> {
+										$this.setData({focusFieldId:item.value})
+									});
 								}
 								else if(item.action_type == "set_dlg_attr"){
 								  // value = {"attr":"xxx", "value":"xxx"}
@@ -1623,7 +1423,7 @@
 						  } else if(item.action_type == "set_subtable_page_content"){  //鍔犺浇澶氭潯鏁版嵁
 							$this.param.Show_Welcom_Page=false;
 							var value = item.value;
-							if(value.clear == true && $this.detail1StyleDefList.length>0){ //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,寰呭垎鎷f槸鍚︽湁鏁版嵁
+							if(value.clear_confirm != false && value.clear == true && $this.detail1StyleDefList.length>0){ //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,寰呭垎鎷f槸鍚︽湁鏁版嵁
 								uni.showModal({
 									title: '鎻愮ず',
 									content: '绯荤粺妫�祴鍒版湁寰呭垎鎷d腑鐨勬暟鎹紝缁х画鎿嶄綔浼氭竻绌猴紝鏄惁缁х画锛�,
@@ -1672,9 +1472,14 @@
 						  	}
 						  }
 						  else if (item.action_type == "set_dlg_current_edit_attr") {
-							  if($this.focusFieldId == item.value)
+							if($this.focusOldFieldId == item.value)
 								$this.setData({focusFieldId: ""})
-						  	$this.setData({focusFieldId:item.value})
+							else{
+								$this.setData({focusFieldId:$this.focusOldFieldId})	
+							}
+							$this.$nextTick(()=> {
+								$this.setData({focusFieldId:item.value})
+							});
 						  }
 						  else if(item.action_type == "refresh"){  //鍒锋柊
 						    var value = item.value;
@@ -1733,3 +1538,300 @@
   },
 };
 </script>
+<style lang="scss">
+	.uni-page-modal-5602{
+		
+		display: flex;
+		height: 100vh;
+		width: 750rpx;
+		flex-direction: column !important;
+		.view-header{
+			display: flex;
+			width: 100%;
+			flex-direction: column;
+			margin-top: 15rpx;
+		}
+		.v-headStyle{
+			width: 100%;
+		}
+		.view-content{
+			display:flex;
+			flex: 1;
+			width: 100%;
+			flex-direction: column;
+			min-height: 100px;
+		}
+		.view-tab-content{
+			display:flex;
+			flex: 1;
+			width: calc(100% - 30rpx);
+			padding:0 15rpx;
+			flex-direction: column;
+			overflow-y: auto;
+		}
+		
+		.dv-tab {
+			width: calc(100% - 30rpx);
+			padding:0 15rpx;
+		}
+		.view-tabpage {
+			width: 100%;
+			flex: 1;
+		}
+		.uni-panel-content {
+			display: flex;
+			width: 100%;
+			height: 100%;
+			flex-direction: column !important;
+		}
+		.view-bottom{
+			display:flex;
+			flex-direction:row;
+			width: calc(100% - 30rpx);
+			padding:10rpx 15rpx 30rpx 15rpx;
+		}
+		.v-headStyle:first-child{
+			margin-top: 15rpx;
+		}
+		.v-headStyle .txt_title{
+		  font-size: 34rpx;
+		  text-align: right;
+		  display: inline-block;
+		  vertical-align: 12px;
+		}
+		.v-headStyle input{
+			display: inline-block;
+			/* border: 1px solid #d5d5d5; */
+			/* width: 65%; */
+			width: 85%;    
+			height: 52rpx;
+			line-height: 34rpx;
+			background: #FFF;
+			border-radius: 0 !important;
+			color: #2d8cf0;
+			padding: 10rpx 8rpx 12rpx;
+			font-size: 34rpx;
+			font-family: inherit;
+			box-shadow: none !important;
+			transition-duration: 0.1s;
+			margin-top: 4rpx;
+		}
+		.v-headStyle input::-webkit-input-placeholder {
+			font-size: 12rpx;
+		}
+		.input-wrapper{
+			border: 1px solid #d5d5d5;
+			display: inline-block;
+			width: 65%;    
+			line-height: 22rpx;
+		}
+		[nvue] uni-view {
+			position: relative;
+			border: 0 solid #000;
+			box-sizing: border-box;
+		}
+		.uni-input {
+			/* border: none; */
+		}
+		.uni-icon{
+			/* border: 1px solid red; */
+			width: 8%;
+			font-family: uniicons;
+			font-size: 40rpx;
+			font-weight: 400;
+			font-style: normal;
+			/* width: 48rpx; */
+			height: 48rpx;
+			line-height: 48rpx;
+			color: #2d8cf0;
+			cursor: pointer;
+			display: inline-block;
+			vertical-align: 18rpx;
+		}
+		.dv-panel{
+			background-color:#efefef;
+			padding: 20rpx 20rpx 4rpx 0px;
+			border-radius: 12rpx;
+			margin: 10rpx 0 20rpx 0;
+			text-align: right;
+		}
+		.dv-panel-input{
+			width: 100%;
+			display: inline-block;
+			text-align: left;
+		}
+		.dv-panel-input .dv-input{
+			margin-bottom: 2rpx;
+		}
+		.dv-panel .txt_title{
+		  font-size: 34rpx;
+		  text-align: right;
+		  display: inline-block;
+		}
+		.dv_select {
+			display: inline-block;
+			width: 66%;
+			background: #FFF;
+			border-radius: 0 !important;
+			color: #2d8cf0;
+			/* padding: 10rpx 8rpx 12rpx; */
+			font-size: 34rpx;
+			font-family: inherit;
+			box-shadow: none !important;
+			transition-duration: 0.1s;
+			margin-top: 0rpx;
+			vertical-align: 20rpx;
+		}
+		
+		.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;
+		}
+		.dv-panel .form-item-span{
+			vertical-align: text-top;
+			color: #2d8cf0;
+			white-space: normal;
+			word-break: break-all;
+			display: inline-block;
+			width: calc(100% - 100px);
+		}
+
+		.dv-panel-button{
+			/* display: inline-block;
+			margin-right: 20rpx; */
+			width: 100%;
+			text-align: left;
+			padding-bottom: 20rpx;
+		}
+		.dv-panel-button checkbox-group {   
+			/* float: left; */
+			padding-left: 20px;
+			display: inline-block;
+		}
+		.dv-panel-button button { 
+			text-align: left;   
+			line-height: 1.8;
+			border: none;
+			font-size: 34rpx;
+			width: 180rpx;   
+			display: inline-block;
+			float: right;
+			text-align: center;
+		}
+		button.btn_cancel {
+			width:49.5%;
+			margin-top: 50rpx;
+			padding: 20rpx;
+			line-height: 1.5;
+			border: none;
+			font-size: 38rpx;
+			font-weight: bold;
+			float: left;
+			display: inline-block;
+		}
+		button.btn_add {
+			width:49.5%;
+			margin-top: 50rpx;
+			padding: 20rpx;
+			line-height: 1.5;
+			border: none;
+			font-size: 38rpx;
+			font-weight: bold;
+			float: right;
+			display: inline-block;
+		}
+		.logo {
+			height: 100rpx;
+			width: 460rpx;
+			display: flex;
+			margin: 38% auto;
+		}
+		.dv-border{
+			border: 1px solid red;
+		}
+		.view-imagetext{
+			text-align: center;
+			width: calc(100% - 80rpx);
+			padding: 20rpx 40rpx 0px 40rpx;
+			height:calc(100% - 30rpx);
+			overflow: hidden;
+		}
+		.view-imagetext .view-imagetext-uploadlist {
+		  padding: 30rpx 0px 10rpx 0px;
+		  vertical-align: middle;
+		  display: inline-block;
+		  width: 100%;
+		  height: 100%;
+		  text-align: center;
+		  line-height: 100%;
+		  border: 2rpx solid transparent;
+		  border-radius: 8rpx;
+		  overflow: hidden;
+		  background: #fff;
+		  position: relative;
+		  /* box-shadow: 0 2rpx 2rpx rgba(0, 0, 0, 0.2);
+		  margin-right: 8rpx; */
+		}
+		.view-imagetext .txt-text{
+		  display: block;
+		  margin: 20rpx;
+		  font-weight: bold;
+		}
+		.view-detalist-centen{
+		  text-align: center;
+		  width: 100%;
+		}
+		  
+		.view-detalist-centen .txt-detalist{
+		  background: #94D5EF;
+		  display: block;
+		  width: 100%;
+		  font-size: 36rpx;
+		  line-height: 80rpx;
+		  font-weight: 500;
+		}
+		.panel-active{
+		  border:2px solid red;
+		}
+		.bk-active{
+		  background-color: #D6FCB2;
+		}
+	
+	
+		.demo-uni-row {
+			margin-bottom: 0px;
+			display: block;
+		}
+		::v-deep .uni-row {
+			margin-bottom: 0px;
+		}
+		.view-tabpage ::v-deep .uni-row  {
+			margin-bottom: 5px;
+		}
+		.demo-uni-col {
+			height: 36px;
+			border-radius: 5px;
+		}
+		.demo-uni-row .uni-input{
+			width: calc(100% - 120px);
+		}
+	}
+</style>
+
+

--
Gitblit v1.9.1