From 7662665a4f88da0f8afa804bd4a34dfbefc1fb56 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 29 八月 2025 15:17:59 +0800
Subject: [PATCH] get_pre_page_subtable_next_row

---
 pages/modal/5602.vue | 1227 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 982 insertions(+), 245 deletions(-)

diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 215b07b..40de5d0 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-page-modal-5602">
+	<view class="uni-page-modal-5602" :class="largeMode?'large-mode':''">
 		<!-- 琛ㄥご鏍峰紡 -->
 		<view class="view-header">
 			<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
@@ -20,15 +20,15 @@
 				<view class="input-wrapper" :style="{'width':`calc(96% - ${item.labelWidth}px)`}"
 					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>
+						@click="classAttr_extButton(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)" @click="onClick(item)"
-						@keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)" />
+						@keyup.enter="onEnterChange(item)" @blur="onEnterChange(item)" :maxlength="-1" />
 					<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
-						@click="onEnterChange(item)">&#xe568;</text>
+						@click="classAttr_extButton(item)">&#xe568;</text>
 				</view>
 			</view>
 		</view>
@@ -38,7 +38,7 @@
 				<!-- 椤电 -->
 				<view class="dv-tab">
 					<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem"
-						styvarype="button">
+						styvarype="text">
 					</uni-segmented-control>
 				</view>
 				<swiper class="view-tabpage" :current="current" @change="changeSwiper">
@@ -63,7 +63,7 @@
 													<input class="uni-input" v-if="!item.disabled"
 														:type="item.name=='InputNumber'?'number':'text'"
 														v-model="item.value" :disabled="item.disabled"
-														:placeholder="item.placeholder" />
+														:placeholder="item.placeholder" :maxlength="-1" />
 												</view>
 												<!-- 鏍呮牸甯冨眬 -->
 												<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
@@ -77,7 +77,7 @@
 															<input class="uni-input" v-if="!cols.disabled"
 																:type="cols.name=='InputNumber'?'number':'text'"
 																v-model="cols.value" :disabled="cols.disabled"
-																:placeholder="cols.placeholder" />
+																:placeholder="cols.placeholder" :maxlength="-1" />
 														</view>
 													</uni-col>
 												</uni-row>
@@ -168,19 +168,38 @@
 			</view>
 
 		</view>
-		<!-- <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>
+			<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':'200px','height':check_list.height?check_list.height+'px':'88%'}">
+					<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+						<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'}">
+								<label>
+									<checkbox :value="item.check" :checked="item.check" />
+									<text>{{item.name}}</text>
+								</label>
+							</checkbox-group>
+						</view>
+					</view>
+					<view class="popup-footer">
+						<button type="default" @tap="popup_sava" class="btn_popup_add">{{translateSys('ok')}}</button>
+						<button type="default" @tap="popup_cancel"
+							class="btn_popup_cancel">{{translateSys('cancel')}}</button>
+					</view>
+				</view>
+			</uni-popup>
 		</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>
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from '@/js/Base64.js';
 	import {
 		appGetInfo,
 		dictGetInfo
@@ -191,13 +210,12 @@
 		dataObjCreate,
 		dataObjDel
 	} from "@/api/data.js"
-
+import {showInfo,
+		showError} from "@/js/Page.js"
 	export default {
-		modules: {
-			Base64,
-		},
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys("sorting"),
 				ClsID: "Distribution_CNTR_Detail",
 				ClsID2: "Picking_Result",
@@ -226,6 +244,12 @@
 				activelist: [],
 				okLoading: false,
 				ok2Loading: false,
+
+
+				global_attr: [],
+				popupType: "center",
+				check_list: {},
+				popupParam: {},
 			};
 		},
 		onLoad(options) {
@@ -233,10 +257,11 @@
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.title = options.titlename;
-			this.$data.param = JSON.parse(options.param);
-			// console.log(this.$data.param);
-			this.loadData(options.paramValue)
+			this.title = options.titlename;
+			this.param = JSON.parse(options.param);
+			// console.log(this.param);
+			const paramValue = options.paramValue ? JSON.parse(options.paramValue) : undefined
+			this.loadData(paramValue)
 		},
 		methods: {
 			setData: function(obj) {
@@ -263,46 +288,26 @@
 
 			async loadData(paramValue) {
 				//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�-				await this.Head_UIStyleGetInfo(this.$data.ClsID, this.$data.param.Input_UI_Style.ID);
+				await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID);
 				//浼犲叆鍙傛暟鍊� 				if (paramValue) {
-					const attrs = paramValue.attrs || [];
-					(this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
-						if (ele.name != "Layout") {
-							attrs.forEach(async (ele2, index2) => {
-								if (ele.fieldId == ele2.name) {
-									ele.value = ele2.value;
-								}
-							});
-						} else {
-							ele.setting.colList.forEach(async (col) => {
-								if (col) {
-									attrs.forEach(async (ele2,
-										index2) => {
-										if (col.fieldId == ele2.name) {
-											col.value = ele2.value;
-										}
-									});
-								}
-							});
-						}
-					})
+					this.setFormValues(paramValue)
 				}
 
 				//鍔犺浇鍒濆鐣岄潰
-				if (this.$data.param.Show_Welcom_Page) {
-					this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
-					this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
-					this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
+				if (this.param.Show_Welcom_Page) {
+					this.param.Welcome_Page.Img = this.param.Welcome_Page.Img.replace(/ /g, '+');
+					this.param.Welcome_Page.Width = parseInt(this.param.Welcome_Page.Width);
+					this.param.Welcome_Page.Height = parseInt(this.param.Welcome_Page.Height);
 				}
 				//鍔犺浇Tab椤电
-				this.$data.items.push(this.$data.param.Sub_Page[0].Name);
-				this.$data.items.push(this.$data.param.Sub_Page[1].Name);
-				await this.Detail1_UIstyleGetInfo(this.ClsID, this.$data.param.Sub_Page[0].UI_Style.ID);
-				await this.Detail2_UIstyleGetInfo(this.ClsID2, this.$data.param.Sub_Page[1].UI_Style.ID);
+				this.items.push(this.param.Sub_Page[0].Name);
+				this.items.push(this.param.Sub_Page[1].Name);
+				await this.Detail1_UIstyleGetInfo(this.ClsID, this.param.Sub_Page[0].UI_Style.ID);
+				await this.Detail2_UIstyleGetInfo(this.ClsID2, this.param.Sub_Page[1].UI_Style.ID);
 
 
-				console.log(this.$data.param);
+				console.log(this.param);
 			},
 			changeSwiper(evt) {
 				let index = evt.target.current || evt.detail.current;
@@ -351,13 +356,27 @@
 						if (!result.style_def.includes('"')) styledef = Base64.decode(result
 							.style_def);
 					}
-					$this.$data.head_styledef = result.style_def ? JSON.parse(styledef) : {};
-					// this.form = this.head_styledef.form.model;
-					// console.log($this.$data.head_styledef);
+					$this.head_styledef = result.style_def ? JSON.parse(styledef) : {};
 					if ($this.head_styledef.form?.items) {
 						$this.head_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'mast');
+							} else {
+								if (ele?.name === "Select") {
+									const selections = ele?.selections || []
+									//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+									let itemName = ele.value || "";
+									if (itemName) {
+										$this.head_styledef.form
+											.model[ele.fieldId] = itemName;
+									}
+									$this.head_styledef.form.items[index].dict = selections.map((a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
 							}
 							if ($this.focusFieldId == "") {
 								if (ele.name == 'Input' || ele.name == 'InputNumber') {
@@ -398,17 +417,34 @@
 						if (!result.style_def.includes('"')) styledef = Base64.decode(result
 							.style_def);
 					}
-					$this.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
-					$this.$data.detail1_styledef.SelBut_Checked = true;
-					// console.log($this.$data.detail1_styledef);
-					// $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
+					$this.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.detail1_styledef.SelBut_Checked = true;
+					// console.log($this.detail1_styledef);
+					// $this.detail1StyleDefList.push($this.detail1_styledef);
 					// var aa = JSON.stringify(this.detail1_styledef);
-					// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
-					// console.log($this.$data.detail1StyleDefList);
+					// $this.detail1StyleDefList.push(JSON.parse(aa));
+					// console.log($this.detail1StyleDefList);
 					if ($this.detail1_styledef.form?.items) {
 						$this.detail1_styledef.form.items.forEach(async (ele, index) => {
 							if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
 								await this.DictGetInfo(ele.bind.dict, index, 'sub');
+							} else {
+								if (ele?.name === "Select") {
+									const selections = ele?.selections || []
+									//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
+									let itemName = ele.value || "";
+									if (itemName) {
+										$this.detail1_styledefform
+											.model[ele.fieldId] = itemName;
+									}
+									$this.detail1_styledef.form.items[index].dict = selections.map((a) => {
+										return {
+											value: a.value,
+											text: a.label
+										}
+									})
+								}
+
 							}
 						});
 					}
@@ -441,8 +477,8 @@
 						if (!result.style_def.includes('"')) styledef = Base64.decode(result
 							.style_def);
 					}
-					$this.$data.detail2_styledef = result.style_def ? JSON.parse(styledef) : {};
-					$this.$data.detail2_styledef.SelBut_Checked = true;
+					$this.detail2_styledef = result.style_def ? JSON.parse(styledef) : {};
+					$this.detail2_styledef.SelBut_Checked = true;
 				} catch (ex) {
 					// console.log(ex);
 					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
@@ -499,7 +535,7 @@
 						var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
 						$this.detail1_styledef = [];
 						$this.detail1_styledef = detail1_styledef;
-						// console.log($this.$data.detail1_styledef);
+						// console.log($this.detail1_styledef);
 					}
 
 				} catch (ex) {
@@ -519,8 +555,8 @@
 				// var $ele = e;
 				this.focusOldFieldId = item.fieldId
 				getApp().onScan((result) => {
-					console.log(result.decodedata);
-					item.value = result.decodedata;
+					console.log(result);
+					item.value = result;
 					//uni.hideKeyboard();
 					var $this = this;
 
@@ -613,21 +649,43 @@
 					var attr = item.fieldId;
 					this.head_styledef.form.model[attr] = item.value;
 					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-					var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�-					var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� 					var isflag = false;
 
 					if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠� 						this.onChange(onChangeEvent);
 					}
-					// if(onSuffixClickCallbackEvent.id){   //鍚庡浘鏍囩偣鍑讳簨浠�-					//   this.onSuffixClick(onSuffixClickCallbackEvent);
-					// }
-					// if(onSuffixClickEvent.id){   //鍚庡浘鏍囩偣鍑诲洖璋�-					//   this.onSuffixClickCallback(onSuffixClickEvent);
-					// }
 				}
 			},
+			classAttr_extButton(item) {
+				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠�+				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�+
+				if (!onSuffixClickCallbackEvent.id) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content: this.translate('icon_click_callback_empty'),
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return;
+				}
+				if (!onSuffixClickEvent.id) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content: this.translate('icon_click_event_empty'),
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return;
+				}
+				this.popupType = 'right'
+				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+				this.$refs.popup.open(this.popupType);
+
+				this.dataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
+					item);
+			},
+
 			getDetailAttrList(list, selectButton) {
 				const detailAttrList = [];
 				list.forEach(style => {
@@ -725,7 +783,7 @@
 						var dataInfo = {
 							ed_type: 0,
 							start_transaction: '',
-							class_id: this.$data.head_styledef.form.clsId,
+							class_id: this.head_styledef.form.clsId,
 							class_name: '',
 							event_id: event.id,
 							event_name: '',
@@ -768,6 +826,8 @@
 							} else {
 								var tip = result.info ? typeof result.info == 'string' ? result.info :
 									result.info.join('<br/>') : '';
+								tip = tip || result.err_info
+
 								if (tip) uni.showModal({
 									title: this.translateSys("tip"),
 									content: tip,
@@ -778,16 +838,16 @@
 								if (result.result_type == 0 && result.action) {
 									result.action.forEach(item => {
 										if (item.action_type == "insert_subtable_page_row") { //鍒嗘嫞涓�-											$this.$data.param.Show_Welcom_Page = false;
+											$this.param.Show_Welcom_Page = false;
 											var value = item.value;
 											$this.viewAceionRow(value);
 										} else if (item.action_type ==
 											"set_subtable_page_content") { //宸插垎鎷�-											$this.$data.param.Show_Welcom_Page = false;
+											$this.param.Show_Welcom_Page = false;
 											var value = item.value;
 											if (value.clear_confirm != false && value.clear ==
-												true && $this.$data.detail1StyleDefList.length >
-												0 && value.page_name == $this.$data.param.Sub_Page[
+												true && $this.detail1StyleDefList.length >
+												0 && value.page_name == $this.param.Sub_Page[
 													0].Name) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鍒嗘嫞鏄惁鏈夋暟鎹� 												uni.showModal({
 													title: this.translateSys("tip"),
@@ -816,11 +876,11 @@
 													}
 												});
 											} else {
-												if (value.page_name == $this.$data.param.Sub_Page[
+												if (value.page_name == $this.param.Sub_Page[
 														0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-													$this.$data.detail1StyleDefList = [];
+													$this.detail1StyleDefList = [];
 												} else {
-													$this.$data.detail2StyleDefList = [];
+													$this.detail2StyleDefList = [];
 												}
 												$this.viewAceionContent(value);
 											}
@@ -863,7 +923,7 @@
 												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 												//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 												value.row.forEach(row => {
-													$this.$data.detail1StyleDefList
+													$this.detail1StyleDefList
 														.forEach((ele, index) => {
 															if (ele.form.objId == row
 																.id) {
@@ -880,12 +940,12 @@
 										} else if (item.action_type ==
 											"set_subtable_page_ext_data") {
 											var value = item.value;
-											if (value.page_name == $this.$data.param.Sub_Page[0]
+											if (value.page_name == $this.param.Sub_Page[0]
 												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 												$this.setData({
 													detail1ExtData: value.ext_data
 												})
-											} else if (value.page_name == $this.$data.param
+											} else if (value.page_name == $this.param
 												.Sub_Page[1].Name) {
 												$this.setData({
 													detail2ExtData: value.ext_data
@@ -893,13 +953,13 @@
 											}
 										} else if (item.action_type == "clear_subpage_rows") {
 											var value = item.value;
-											if (value.page_name == $this.$data.param.Sub_Page[0]
+											if (value.page_name == $this.param.Sub_Page[0]
 												.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 												$this.setData({
 													detail1StyleDefList: [],
 													detail1ExtData: {}
 												})
-											} else if (value.page_name == $this.$data.param
+											} else if (value.page_name == $this.param
 												.Sub_Page[1].Name) {
 												$this.setData({
 													detail2StyleDefList: [],
@@ -925,42 +985,7 @@
 										} else if (item.action_type == "set_dlg_attr") {
 											// value = {"attr":"xxx", "value":"xxx"}
 											var data = item.value;
-											$this.$data.head_styledef.form.items.forEach(async (
-												ele, index) => {
-												data.forEach(async (ele2, index) => {
-													if (ele.fieldId == ele2
-														.attr) {
-														if (ele.name ==
-															'Select' &&
-															ele2
-															.choice_list) {
-															const
-																dictItemList = [];
-															const
-																choiceList =
-																ele2
-																.choice_list ||
-																[];
-															for (let d in
-																	choiceList) {
-																const val =
-																	choiceList[
-																		d];
-																dictItemList
-																	.push({
-																		text: val,
-																		value: val
-																	});
-															}
-															ele.dict =
-																dictItemList;
-														}
-														ele.value = ele2
-															.value;
-
-													}
-												});
-											});
+											$this.setFormValues(data)
 										}
 									});
 								} else {
@@ -1008,6 +1033,9 @@
 					number1 = parseInt(value1)
 				if (value2)
 					number2 = parseInt(value2)
+				if (!operation) {
+					return value2;
+				}
 				if (operation == "+") {
 					return number1 + number2
 				} else if (operation == "-") {
@@ -1015,53 +1043,190 @@
 				} else if (operation == "*") {
 					return number1 * number2
 				} else if (operation == "/") {
-					if (number2)
-						return number1 / number2
-					else
-						return number1
-				} else return number2
+					if (number2) return number1 / number2;
+					else {
+						throw new Error(`${this.translate("illegal_dividend")}'${value2}'`);
+						return 0;
+					}
+				} else if (operation == "=") {
+					return value2;
+				} else {
+					throw new Error(`${this.translate("unrecognized_operator")}'${operation}'`);
+					return 0;
+				}
 			},
-			//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
+			setFormValues(attrs) {
+				const head_styledef = this.head_styledef
+				if (!Array.isArray(attrs)) {
+					return
+				}
+				console.log(attrs)
+				attrs.forEach(async (attr, key) => {
+					if (attr.choice_list) {
+						var dictItemList = [];
+						attr.choice_list.forEach(async (val, index) => {
+							dictItemList.push({
+								text: val,
+								value: val
+							});
+						});
+
+						head_styledef.form.items.forEach(async (attr_item, index) => {
+							if (attr_item.name != "Layout") {
+								if (attr_item.fieldId == attr.attr) {
+									if (attr_item.useDict) {
+										attr_item.dict = dictItemList;
+									} else {
+										attr_item.selections = dictItemList;
+									}
+								}
+							} else if (attr_item.name == "Layout") {
+								attr_item.setting.colList.forEach((col) => {
+									if (col) {
+										if (col.fieldId == attr.attr) {
+											if (col.useDict) {
+												col.dict = dictItemList;
+											} else {
+												col.selections = dictItemList;
+											}
+										}
+									}
+								});
+							}
+						});
+					}
+					if (!head_styledef.form.model[attr.attr]) {
+						head_styledef.form.model[attr.attr] = attr.value;
+					}
+					head_styledef.form.items.forEach(async (ele) => {
+						if (ele.name != "Layout") {
+							if (ele.fieldId == attr.attr) {
+								ele.value = attr.value;
+								ele.oldvalue = attr.value;
+							}
+						} else if (ele.name == "Layout") {
+							ele.setting.colList.forEach((col) => {
+								if (col) {
+									if (col.fieldId == attr.attr) {
+										col.value = attr.value;
+										col.oldvalue = attr.value;
+									}
+								}
+							});
+						}
+
+					})
+					//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+				})
+				console.log(head_styledef)
+				this.setData({
+					head_styledef: head_styledef
+				})
+			}, //鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
 			viewActionSetRow(value) {
 				const $this = this
 				var detailStyleDefList = []
-				if (value.page_name == $this.$data.param.Sub_Page[1].Name) {
-					detailStyleDefList = $this.$data.detail2StyleDefList
-				} else if (value.page_name == $this.$data.param.Sub_Page[0].Name) {
-					detailStyleDefList = $this.$data.detail1StyleDefList
+				if (value.page_name == $this.param.Sub_Page[1].Name) {
+					detailStyleDefList = $this.detail2StyleDefList
+				} else if (value.page_name == $this.param.Sub_Page[0].Name) {
+					detailStyleDefList = $this.detail1StyleDefList
 				}
 				detailStyleDefList.forEach(ele => {
 					value.row.forEach((rowData) => {
-						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)
-										}
-									} 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)
-												}
+						if (rowData.id) {
+							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)
 											}
-										})
-									}
+										} 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 (rowData.condition) {
+							const conditions = rowData.condition;
+							let bFindCondition = true;
+							for (let i in conditions) {
+								const condition = conditions[i];
+								let bFind = false;
+								for (let i2 in ele.form.items) {
+									const ele2 = ele.form.items[i2];
+									if (ele2.name != "Layout") {
+										if (ele2.fieldId == condition.attr) {
+											if (condition.value == ele2.value) {
+												bFind = true;
+											}
+											break;
+										}
+									} else {
+										const colList = ele2.setting.colList || [];
+										for (let i3 in colList) {
+											const col = colList[i3];
+											if (col.fieldId == condition.attr) {
+												if (condition.value == col.value) {
+													bFind = true;
+												}
+												break;
+											}
+										}
+										if (bFind) break;
+									}
+								}
+								if (!bFind) {
+									bFindCondition = false;
+									break;
+								}
+							}
+							if (bFindCondition) {
+								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)
+											}
+										} 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)
+													}
+												}
+											})
+										}
+									});
+								});
+
+							}
 						}
 					})
 				});
-				if (value.page_name == $this.$data.param.Sub_Page[1].Name) {
+				if (value.page_name == $this.param.Sub_Page[1].Name) {
 					$this.setData({
 						detail2StyleDefList: detailStyleDefList
 					})
-				} else if (value.page_name == $this.$data.param.Sub_Page[0].Name) {
+				} else if (value.page_name == $this.param.Sub_Page[0].Name) {
 					$this.setData({
 						detail1StyleDefList: detailStyleDefList
 					})
@@ -1075,12 +1240,12 @@
 				if (JSON.stringify(data.row) == '{}') {
 					return;
 				}
-				var styleStr = JSON.stringify(this.$data.detail1_styledef);
+				var styleStr = JSON.stringify(this.detail1_styledef);
 				if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
-					styleStr = JSON.stringify(this.$data.detail2_styledef);
+					styleStr = JSON.stringify(this.detail2_styledef);
 				} else {
-					if (data.page_name == this.$data.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
-						styleStr = JSON.stringify(this.$data.detail2_styledef); //寰呭垎鎷�+					if (data.page_name == this.param.Sub_Page[1].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
+						styleStr = JSON.stringify(this.detail2_styledef); //寰呭垎鎷� 					}
 				}
 				data.row.forEach(row => {
@@ -1108,19 +1273,19 @@
 						});
 
 						if (type) { //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
-							this.$data.detail2StyleDefList.push(detailStyle);
-							// console.log(this.$data.detail2StyleDefList);
+							this.detail2StyleDefList.push(detailStyle);
+							// console.log(this.detail2StyleDefList);
 						} else {
-							if (data.page_name == this.$data.param.Sub_Page[1]
+							if (data.page_name == this.param.Sub_Page[1]
 								.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
-								this.$data.detail2StyleDefList.push(detailStyle);
-								// console.log(this.$data.detail2StyleDefList);
+								this.detail2StyleDefList.push(detailStyle);
+								// console.log(this.detail2StyleDefList);
 							} else {
-								this.$data.detail1StyleDefList.push(detailStyle);
+								this.detail1StyleDefList.push(detailStyle);
 								this.activelist.push({
 									active: false
 								});
-								// console.log(this.$data.detail1StyleDefList);
+								// console.log(this.detail1StyleDefList);
 							}
 						}
 					}
@@ -1138,9 +1303,9 @@
 				if (JSON.stringify(data.content) == '{}') {
 					return;
 				}
-				var styleStr = JSON.stringify($this.$data.detail2_styledef); //宸插垎鎷�-				if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
-					styleStr = JSON.stringify($this.$data.detail1_styledef); //寰呭垎鎷�+				var styleStr = JSON.stringify($this.detail2_styledef); //宸插垎鎷�+				if (data.page_name == $this.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+					styleStr = JSON.stringify($this.detail1_styledef); //寰呭垎鎷� 				}
 				data.content.forEach(cont => {
 
@@ -1167,7 +1332,7 @@
 							});
 						});
 
-						if (data.page_name == $this.$data.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+						if (data.page_name == $this.param.Sub_Page[0].Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 							//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩� 							if (data.clear == false) {
 								var isflag = true;
@@ -1201,7 +1366,7 @@
 							$this.activelist.push({
 								active: false
 							});
-							// console.log($this.$data.detail1StyleDefList);
+							// console.log($this.detail1StyleDefList);
 						} else {
 							if (data.clear == false) {
 								//濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�@@ -1233,7 +1398,7 @@
 							} else {
 								$this.detail2StyleDefList.push(detailStyle); //宸插垎鎷� 							}
-							// console.log($this.$data.detail2StyleDefList);
+							// console.log($this.detail2StyleDefList);
 						}
 					}
 				});
@@ -1315,7 +1480,7 @@
 			async del(style, event) {
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				this.head_styledef.form.items.forEach(item => {
 					head_attr[item.fieldId] = item.value;
 				});
 				// console.log(head_attr);
@@ -1396,7 +1561,7 @@
 			async del2(style, event) {
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				this.head_styledef.form.items.forEach(item => {
 					head_attr[item.fieldId] = item.value;
 				});
 				// console.log(head_attr);
@@ -1482,8 +1647,567 @@
 					ele.active = false;
 				});
 				this.activelist[value].active = true;
-				// console.log(this.$data.activelist);
+				// console.log(this.activelist);
 			},
+			popupChange(e) {
+				console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show);
+			},
+			checkChange(e) { //寮规check閫夋嫨
+				// console.log(e.target.dataset);
+				var index = e.target.dataset.index;
+				var ischeck = e.target.dataset.ischeck;
+				var data = this.check_list.items;
+				// this.check_list.items=[];
+				if (this.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫�+					for (var i in data) {
+						data[i].check = false;
+					}
+				}
+				data[index].check = ischeck ? false : true;
+				this.check_list.items = data;
+
+			},
+			popup_cancel(e) { //寮规鍙栨秷
+				this.$refs.popup.close();
+			},
+			popup_sava(e) { //寮规纭畾
+				var $this = this;
+				var items = $this.check_list.items;
+				var data = [];
+				var name = "";
+				for (var i = 0; i < items.length; i++) {
+					if (items[i].check == true) {
+						if (name)
+							name += ';';
+						name += items[i].name;
+						data.push({
+							id: items[i].id,
+							name: items[i].name
+						});
+					}
+				}
+				if (!$this.popupParam) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content: "popupParam涓虹┖锛�,
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return;
+				}
+				if (data.length == 0) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content: this.translate("tip_no_select_data"),
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return;
+				}
+				var callback_eventid = $this.popupParam.button_callback.trim();
+				var info = {
+					eventid: callback_eventid,
+					edtype: "0",
+					projectid: '',
+					rclsid: '',
+					robjid: '',
+					userlogin: '',
+					clsid: $this.ClsID,
+					objid: "",
+					attr: $this.popupParam.req,
+					dataJson: data
+				}
+				$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
+				this.$refs.popup.close();
+			},
+
+			async DataObjRunCustomEvent(info, data_attr) {
+				var $this = this;
+				var enviroment = {
+					'function': '3000', // 鍔熻兘鐐圭紪鍙�+					cls_id: this.ClsID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					'button': 'top', // top/bottom
+					button_name: this.translateSys('add2'),
+					master: {
+						cls_id: this.ClsID, // button=bottom鏃�master鐨刢ls_id
+						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
+					}
+				};
+				if (data_attr) {
+					enviroment.edit_dlg = {
+						type: 'small', //灏忕獥鍙�+						class_id: this.ClsID, //褰撳墠鏁版嵁绫籭d
+					}
+					if (data_attr) {
+						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�+							name: data_attr.Name, //瀛楁灞炴�
+							text: data_attr.DispName, //鏄剧ず鏂囨湰
+							group_name: data_attr.GroupName, //灞炴�缁�+							type: data_attr.Type, //瀛楁绫诲瀷
+							readonly: data_attr.ReadOnly, //鏄惁鍙
+							button_img: data_attr.button_img, //寮曠敤鎸夐挳鐨勫浘鏍�+							button_tooltip: data_attr.button_tooltip //寮曠敤鎸夐挳鐨則ooltip
+						}
+					}
+				}
+				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var input_param = Base64.encode(JSON.stringify(info.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				if (info.dataJson)
+					info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var obj_attr = {};
+				info.attr.forEach(item => {
+					obj_attr[item.attr] = item.value;
+				});
+				if (!info.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
+				var dataInfo = {
+					ed_type: info.edtype,
+					start_transaction: true,
+					class_id: info.clsid,
+					class_name: '',
+					event_id: info.eventid,
+					event_name: '',
+					data_obj_id: info.objid,
+					obj_attr: obj_attr,
+					prj_id: info.projectid,
+					ref_cls_id: info.rclsid,
+					rel_obj_id: info.robjid,
+					user_login: info.userlogin,
+					data_json: info.dataJson,
+					compose_info: '',
+					ext_info: enviroment,
+					global_attr: global_attr,
+					input_param: input_param,
+				};
+				console.log(dataInfo);
+				// return;
+				runCustomEvent(dataInfo).then(data => {
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							if (this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
+							}
+							uni.showModal({
+								title: this.translateSys("tip"),
+								content: tip,
+								showCancel: false,
+								confirmText: this.translateSys("cancel")
+							});
+						} else uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip + ',' + this.translateSys('tip') + ':' + data
+								.ret,
+							showCancel: false,
+							confirmText: this.translateSys("cancel")
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: this.translateSys("cancel")
+						});
+
+						var actionlist = data.action;
+						if (actionlist) {
+							console.log(actionlist);
+							for (var i = 0; i < actionlist.length; i++) {
+								var action = actionlist[i];
+								if (action.action_type == 'set_dlg_attr') {
+									var result = action.value;
+									$this.setFormValues(result)
+								} else if (action.action_type == 'set_dlg_attr_show') {
+									var result = action.value;
+									result.forEach(async (attr, key) => {
+										$this.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
+																		) {
+																			col.show =
+																				attr
+																				.show;
+																		}
+																	}
+																});
+													}
+												});
+									});
+									var head_styledef = JSON.parse(JSON.stringify($this.$data
+										.head_styledef));
+									$this.head_styledef = [];
+									$this.head_styledef = head_styledef;
+									// console.log($this.head_styledef);
+								} else if (action.action_type == 'set_global_attr') {
+									$this.global_attr = action.value || [];
+								} else {
+									uni.showModal({
+										title: this.translateSys("tip"),
+										content: this.translateSys(
+												"quotation_mark_left") +
+											action
+											.action_type + this.translateSys(
+												"quotation_mark_right") + this
+											.translate(
+												"tip_action_unprocessed"),
+										showCancel: false,
+										confirmText: this.translateSys("cancel")
+									});
+								}
+							}
+						}
+						console.log($this.head_styledef);
+						if (data.result) {
+							$this.setFormValues(data.result)
+						}
+					}
+
+				}).catch(ex => {
+					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+					uni.showModal({
+						title: this.translateSys("error") + "3.1",
+						content: exStr,
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+				});
+			},
+			dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
+				const $this = this
+				var enviroment = {
+					'function': '3000', // 鍔熻兘鐐圭紪鍙�+					cls_id: $this.ClsID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					'button': 'top', // top/bottom
+					button_name: $this.translateSys('add2'),
+					master: {
+						cls_id: $this.ClsID, // button=bottom鏃�master鐨刢ls_id
+						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
+					}
+				};
+				var obj_attr = $this.head_styledef.form.model;
+				console.log(obj_attr);
+				var req = Object.keys(obj_attr).map((a) => ({
+					attr: a,
+					value: obj_attr[a] || "",
+				}));
+				var extinfo = enviroment;
+				extinfo.edit_dlg = {
+					type: 'small', //灏忕獥鍙�+					class_id: $this.ClsID, //褰撳墠鏁版嵁绫籭d
+				}
+				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var obj_attr = {};
+				req.forEach(item2 => {
+					obj_attr[item2.attr] = item2.value;
+				});
+				let input_param = Base64.encode(
+					JSON.stringify(
+						Object.keys(obj_attr).map((a) => ({
+							attr: a,
+							value: obj_attr[a] || "",
+						}))
+					)
+				);
+
+				if (!eventid.includes('{')) eventid = '{' + eventid + '}';
+				var dataInfo = {
+					ed_type: "0",
+					start_transaction: true,
+					class_id: $this.ClsID,
+					class_name: '',
+					event_id: eventid,
+					event_name: '',
+					data_obj_id: '',
+					obj_attr: obj_attr,
+					prj_id: '',
+					ref_cls_id: '',
+					rel_obj_id: '',
+					user_login: '',
+					data_json: [],
+					compose_info: '',
+					ext_info: extinfo,
+					global_attr: global_attr,
+					input_param: input_param,
+				};
+				console.log(dataInfo);
+				// return;
+				runCustomEvent(dataInfo).then(data => {
+					if (data.ret != 0) {
+						var tip = data.err_info ? typeof data.err_info == 'string' ? data
+							.err_info :
+							data
+							.err_info.join('<br/>') : '';
+						if (data.ret == 801) {
+							if ($this.param.Only_Script_Error) {
+								let pos = tip.indexOf("锛�);
+								if (pos > -1) tip = tip.substring(pos + 1);
+							}
+							uni.showModal({
+								title: $this.translateSys("tip"),
+								content: tip,
+								showCancel: false,
+								confirmText: $this.translateSys("cancel")
+							});
+						} else uni.showModal({
+							title: $this.translateSys("tip"),
+							content: tip + ',' + $this.translateSys('tip') + ':' + data
+								.ret,
+							showCancel: false,
+							confirmText: $this.translateSys("cancel")
+						});
+						return false
+					} else {
+						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+							.info
+							.join(
+								'<br/>') : '';
+						if (tip) uni.showModal({
+							title: $this.translateSys("tip"),
+							content: tip,
+							showCancel: false,
+							confirmText: $this.translateSys("cancel")
+						});
+
+						if (data != "") {
+							var actions = data.action;
+							if (actions) {
+								for (var i = 0; i < actions.length; i++) {
+									var action = actions[i];
+									console.log(action)
+									var val = action.value;
+									var enviroment = JSON.stringify(enviroment);
+
+									if (action.action_type == 'open_panel') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												$this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_select_userdlg') {
+										var style = val.style;
+										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
+										var param = {
+											item: item,
+											button_callback: button_callback,
+											req: req,
+											data_attr: data_attr
+										}
+										uni.navigateTo({
+											url: '../selpsn/index?mulit=false&param=' +
+												JSON
+												.stringify(
+													param),
+											events: {
+												AddPer(data, param) {
+													// console.log(param);
+													console.log(data);
+													var callback_eventid = param
+														.button_callback
+														.trim();
+													var info = {
+														eventid: callback_eventid,
+														edtype: "0",
+														projectid: '',
+														rclsid: '',
+														robjid: '',
+														userlogin: '',
+														clsid: $this.param
+															.DataCls
+															.id,
+														objid: "",
+														attr: param.req,
+														inputparameter: data,
+														dataJson: [],
+													}
+													$this.DataObjRunCustomEvent(info,
+														param
+														.data_attr);
+												}
+											}
+										});
+									} else if (action.action_type == 'open_data_query_dlg') {
+										var d = dialog({
+											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
+												$this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed")
+										});
+										d.show();
+									} else if (action.action_type == 'open_common_dlg') {
+
+										if (val.common_dlg_id == 'check_list') {
+											$this.setData({
+												check_list: val.config
+											})
+											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+												$this.setData({
+													popupType: "right"
+												})
+											else
+												$this.setData({
+													popupType: "center"
+												})
+											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+											$this.$refs.popup.open($this.popupType);
+											var popupParam = {
+												item: item,
+												button_callback: button_callback,
+												req: req,
+												data_attr: data_attr
+											}
+											$this.setData({
+												popupParam: popupParam
+											})
+										}
+									} else if (action.action_type == 'open_project_query_dlg') {
+										//console.log(action.value.select_range);
+										//console.log(action.value.mulit_select);
+										var priRel = '-1';
+										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+											priRel = '0';
+										else if (action.value.select_range == '鎴戣礋璐ｇ殑椤圭洰')
+											priRel = '1';
+										else if (action.value.select_range == '鎴戝垱寤虹殑')
+											priRel = '2';
+										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+											.value
+											.select_range == '鎴戝弬鍔犵殑')
+											priRel = '3';
+										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+											priRel = '4';
+										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+											priRel = '5';
+										var param_ = {
+											item: item,
+											button_callback: button_callback,
+											req: req
+										}
+										uni.navigateTo({
+											url: '../selPrj/index?relation=' + priRel +
+												'&param=' +
+												JSON.stringify(param_),
+											events: {
+												AddPer(data, param) {
+													var attr = param.item.fieldId;
+													$this.head_styledef.form.model[
+															attr] =
+														data[0].ID +
+														';' + data[0].Name;
+
+													// $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+													// $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
+													var callback_eventid = param
+														.button_callback
+														.trim();
+													if (callback_eventid) {
+														var info = {
+															eventid: callback_eventid,
+															edtype: "2",
+															projectid: data[0].ID,
+															rclsid: "",
+															robjid: "",
+															userlogin: "",
+															clsid: $this.$data
+																.param
+																.DataCls.id,
+															objid: "",
+															attr: param.req,
+															dataJson: [],
+														}
+
+														$this.DataObjRunCustomEvent(
+															info);
+													}
+												}
+											}
+										});
+									} else {
+										uni.showModal({
+											title: $this.translateSys("tip"),
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
+												.translate(
+													"tip_action_unprocessed"),
+											showCancel: false,
+											confirmText: $this.translateSys("cancel")
+										});
+									}
+								}
+							}
+						} else {
+							uni.showModal({
+								title: $this.translateSys('tip') + "5.2",
+								content: $this.translateSys("quotation_mark_left") +
+									"before_click_button" + $this.translateSys(
+										"quotation_mark_right") + $this.translateSys(
+										"comma") + 'event_id' + eventid,
+								showCancel: false,
+								confirmText: $this.translateSys("cancel")
+							});
+						}
+					}
+
+				}).catch(ex => {
+					// console.log(ex);
+					let exStr = JSON.stringify(ex)
+					if (exStr == "{}")
+						exStr = ex
+					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
+					uni.showModal({
+						title: $this.translateSys('tip') + "5.1",
+						content: exStr,
+						showCancel: false,
+						confirmText: $this.translateSys("cancel")
+					});
+				});
+			},
+
 
 			//纭畾
 			ok() {
@@ -1491,15 +2215,15 @@
 				this.After_OK_Event = this.param.Sub_Page[0].After_ok;
 				// console.log(this.Before_OK_Event);
 				// console.log(this.After_OK_Event);
-				if (this.$data.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
-					this.sava(this.$data.Before_OK_Event);
-				else if (this.$data.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
-					this.sava(this.$data.After_OK_Event);
+				if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
+					this.sava(this.Before_OK_Event);
+				else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
+					this.sava(this.After_OK_Event);
 			},
 			sava(event) {
 				var $this = this;
 
-				if (this.$data.detail1StyleDefList.length == 0) {
+				if (this.detail1StyleDefList.length == 0) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate(
@@ -1517,13 +2241,13 @@
 				this.okLoading = true
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				this.head_styledef.form.items.forEach(item => {
 					head_attr[item.fieldId] = item.value;
 				});
 				// console.log(head_attr);
 				//鑾峰彇姝ｅ湪鍒嗘嫞灞炴�
 				var detailAttrList = [];
-				this.$data.detail1StyleDefList.forEach(style => {
+				this.detail1StyleDefList.forEach(style => {
 					var detail_attr = {};
 					style.form.items.forEach(item => {
 						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�@@ -1543,7 +2267,7 @@
 				});
 				// console.log(detailAttrList);
 				//鑾峰彇姝ｅ湪鍒嗘嫞閲屾病鏈夋樉绀虹殑瀛楁
-				this.$data.detail1StyleDefList.forEach(style => {
+				this.detail1StyleDefList.forEach(style => {
 					style.form.attrs.forEach(attr => {
 						for (var key in detailAttrList) {
 							if (style.form.objId == detailAttrList[key]['id']) {
@@ -1609,15 +2333,15 @@
 				this.After_OK_Event = this.param.Sub_Page[1].After_ok;
 				// console.log(this.Before_OK_Event);
 				// console.log(this.After_OK_Event);
-				if (this.$data.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
-					this.sava2(this.$data.Before_OK_Event);
-				else if (this.$data.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
-					this.sava2(this.$data.After_OK_Event);
+				if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
+					this.sava2(this.Before_OK_Event);
+				else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
+					this.sava2(this.After_OK_Event);
 			},
 			sava2(event) {
 				var $this = this;
 
-				if (this.$data.detail1StyleDefList.length == 0) {
+				if (this.detail1StyleDefList.length == 0) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: this.translate(
@@ -1635,13 +2359,13 @@
 				this.ok2Loading = true
 				//鑾峰彇琛ㄥご灞炴�
 				var head_attr = {};
-				this.$data.head_styledef.form.items.forEach(item => {
+				this.head_styledef.form.items.forEach(item => {
 					head_attr[item.fieldId] = item.value;
 				});
 				// console.log(head_attr);
 				//鑾峰彇宸插垎鎷ｅ睘鎬� 				var detailAttrList = [];
-				this.$data.detail1StyleDefList.forEach(style => {
+				this.detail1StyleDefList.forEach(style => {
 					var detail_attr = {};
 					style.form.items.forEach(item => {
 						if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�@@ -1661,7 +2385,7 @@
 				});
 				// console.log(detailAttrList);
 				//鑾峰彇宸插垎鎷ｉ噷娌℃湁鏄剧ず鐨勫瓧娈�-				this.$data.detail1StyleDefList.forEach(style => {
+				this.detail1StyleDefList.forEach(style => {
 					style.form.attrs.forEach(attr => {
 						for (var key in detailAttrList) {
 							if (style.form.objId == detailAttrList[key]['id']) {
@@ -1732,7 +2456,7 @@
 				var dataInfo = {
 					ed_type: 0,
 					start_transaction: true,
-					class_id: this.$data.ClsID,
+					class_id: this.ClsID,
 					class_name: '',
 					event_id: event.ID,
 					event_name: '',
@@ -1775,6 +2499,7 @@
 					} else {
 						var tip = result.info ? typeof result.info == 'string' ? result.info : result.info
 							.join('<br/>') : '';
+						tip = tip || result.err_info
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
@@ -1791,19 +2516,19 @@
 										$this.viewAceionRow(value, '');
 										// $this.viewAceionRow(value,'add');
 										//娓呯┖鏉＄爜鍐呭
-										$this.$data.head_styledef.form.items.forEach((item,
+										$this.head_styledef.form.items.forEach((item,
 											index) => {
 											if (item.fieldId != "S_CNTR_CODE") {
 												item.value = '';
 												item.oldvalue = '';
-												$this.$data.head_styledef.form.model[item
+												$this.head_styledef.form.model[item
 													.fieldId] = '';
 											}
 										});
 										//娓呴櫎寰呭垎鎷ｄ腑鎴愬姛鐨勬暟鎹�-										// $this.$data.detail1StyleDefList.forEach((style,index)=>{
+										// $this.detail1StyleDefList.forEach((style,index)=>{
 										//   if(style.form.items[0].fieldId == json.attrs[0].attr && style.form.items[0].value == json.attrs[0].value){ 
-										// 	$this.$data.detail1StyleDefList.splice(index,1);
+										// 	$this.detail1StyleDefList.splice(index,1);
 										// 	return;
 										//   }
 										// });
@@ -1854,7 +2579,7 @@
 											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 											//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� 											value.row.forEach(row => {
-												$this.$data.detail1StyleDefList.forEach((
+												$this.detail1StyleDefList.forEach((
 													ele, index) => {
 													if (ele.form.objId == row.id) {
 														$this.$data
@@ -1869,12 +2594,12 @@
 
 									} else if (item.action_type == "set_subtable_page_ext_data") {
 										var value = item.value;
-										if (value.page_name == $this.$data.param.Sub_Page[0]
+										if (value.page_name == $this.param.Sub_Page[0]
 											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 											$this.setData({
 												detail1ExtData: value.ext_data
 											})
-										} else if (value.page_name == $this.$data.param.Sub_Page[1]
+										} else if (value.page_name == $this.param.Sub_Page[1]
 											.Name) {
 											$this.setData({
 												detail2ExtData: value.ext_data
@@ -1882,13 +2607,13 @@
 										}
 									} else if (item.action_type == "clear_subpage_rows") {
 										var value = item.value;
-										if (value.page_name == $this.$data.param.Sub_Page[0]
+										if (value.page_name == $this.param.Sub_Page[0]
 											.Name) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
 											$this.setData({
 												detail1StyleDefList: [],
 												detail1ExtData: {}
 											})
-										} else if (value.page_name == $this.$data.param.Sub_Page[1]
+										} else if (value.page_name == $this.param.Sub_Page[1]
 											.Name) {
 											$this.setData({
 												detail2StyleDefList: [],
@@ -1913,41 +2638,7 @@
 									} else if (item.action_type == "set_dlg_attr") {
 										// value = {"attr":"xxx", "value":"xxx"}
 										var data = item.value;
-										$this.$data.head_styledef.form.items.forEach(async (
-											ele, index) => {
-											data.forEach(async (ele2, index) => {
-												if (ele.fieldId == ele2
-													.attr) {
-													if (ele.name ==
-														'Select' &&
-														ele2
-														.choice_list) {
-														const
-															dictItemList = [];
-														const
-															choiceList =
-															ele2
-															.choice_list || [];
-														for (let d in
-																choiceList) {
-															const val =
-																choiceList[
-																	d];
-															dictItemList
-																.push({
-																	text: val,
-																	value: val
-																});
-														}
-														ele.dict =
-															dictItemList;
-													}
-													ele.value = ele2
-														.value;
-
-												}
-											});
-										});
+										$this.setFormValues(data)
 									} else if (item.action_type == "refresh") { //鍒锋柊
 										var value = item.value;
 										//娓呴櫎寰呭垎鎷ｆ垚鍔熺殑鏁版嵁
@@ -1962,8 +2653,8 @@
 										//鍒锋柊褰撳墠椤甸潰
 										uni.redirectTo({
 											url: '../modal/5602?param=' + JSON.stringify(
-													this.$data.param) + "&titlename=" +
-												this.$data.title
+													this.param) + "&titlename=" +
+												this.title
 										});
 									} else if (item.action_type == "prompt") { //鎵撳紑绯荤粺鎻愮ず寮规
 										var value = '';
@@ -1980,16 +2671,16 @@
 									}
 								});
 							} else {
-								if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+								if ($this.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
 									if (type == '1') {
-										$this.sava($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+										$this.sava($this.After_OK_Event); //鎵ц纭畾鍚庝簨浠� 									} else {
-										$this.sava2($this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+										$this.sava2($this.After_OK_Event); //鎵ц纭畾鍚庝簨浠� 									}
 								}
 							}
 						} else {
-							// $this.$data.detail2StyleDefList=[];
+							// $this.detail2StyleDefList=[];
 							if (result.info) {
 								uni.showModal({
 									title: this.translateSys("tip"),
@@ -2010,7 +2701,6 @@
 						this.okLoading = false
 					else if (type == "2")
 						this.ok2Loading = false
-
 					let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
 					uni.showModal({
 						title: this.translateSys("error") + "8.1",
@@ -2377,5 +3067,52 @@
 		.demo-uni-row .uni-input {
 			width: calc(100% - 120px);
 		}
+
+		.popup-header {
+			font-size: 42rpx;
+			font-weight: bold;
+			margin: 20rpx 20rpx 0px 20rpx;
+		}
+
+		.view_popup_CheckList {
+			margin-bottom: 20rpx;
+		}
+
+		.popup-footer {
+			float: right;
+			position: absolute;
+			bottom: 0;
+			right: 20rpx;
+		}
+
+		button.btn_popup_add {
+			width: 180rpx;
+			margin-top: 50rpx;
+			margin-right: 20rpx;
+			padding: 15rpx;
+			line-height: 1.5;
+			background: #27A6E1;
+			border: none;
+			color: #fff;
+			font-size: 38rpx;
+			font-weight: bold;
+			/* float: left; */
+			display: inline-block;
+		}
+
+		button.btn_popup_cancel {
+			width: 180rpx;
+			margin-top: 50rpx;
+			padding: 15rpx;
+			line-height: 1.5;
+			background: #27A6E1;
+			border: none;
+			color: #fff;
+			font-size: 38rpx;
+			font-weight: bold;
+			/* float: right; */
+			display: inline-block;
+		}
+
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1