From e869d2fe4b0e850267c9540d249fb01d28a95bb8 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 27 九月 2024 09:43:12 +0800
Subject: [PATCH] test

---
 pages/modal/3018_2.vue |  227 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 135 insertions(+), 92 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 7bbbe9c..18a71e1 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -8,16 +8,14 @@
 					<uni-forms-item v-if="item.name != 'Layout'&& item.show==true" :label="item.label +'锛� "
 						:label-width="item.labelWidth+'px'">
 						<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> -->
-						<span class="form-item-span" v-if="item.disabled"
-							:style="'width: calc(100% - '+item.labelWidth+'px);'">{{item.value}}</span>
 						<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-						<uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+						<uni-data-select id="dv_select" v-if="item.name=='Select'"
 							:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
 							:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
 							@change="onchange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
 						<!-- 鏂囨湰妗�鏁板瓧妗�-->
 						<view class="input-wrapper"
-							v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
+							v-if="(item.name=='Input' || item.name=='InputNumber')">
 							<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
 								@change="classAttr_extButton(item)">&#xe568;</text>
 							<input class="uni-input" :class="item.disabled?'input-disabled':''"
@@ -30,7 +28,7 @@
 								@click="classAttr_extButton(item)">&#xe568;</text>
 						</view>
 						<!-- 澶氳鏂囨湰 -->
-						<view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled">
+						<view class="input-wrapper" v-if="item.name=='Textarea' ">
 							<textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
 								:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
 								@blur="onModelValue(item)" @click="onClick(item)" :data-index="index"
@@ -46,13 +44,22 @@
 								<text>{{item.label}}</text>
 							</label>
 						</checkbox-group>
+						<!-- 鍗曢�妗�-->
+						<radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
+							:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
+							@change="onModelValue(item)">
+							<label v-for="(item2) in item.selections" :key="item2.value">
+								<radio :value="item2.value" :checked="item2.value === item.value" />
+								<text>{{item2.label}}</text>
+							</label>
+						</radio-group>
 						<!-- Switch寮�叧 -->
 						<switch class="input-switch" v-if="item.name=='Switch'"
 							:class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value"
 							@change="onModelValue(item)" />
 						<!-- 鏃ユ湡鏃堕棿 -->
 						<view class="input-wrapper"
-							v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
+							v-if="(item.name=='TimePicker' || item.name=='DatePicker')">
 							<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
 								:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
 								<view class="picker">{{item.value}}</view>
@@ -65,10 +72,8 @@
 							:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
 							<uni-forms-item v-if="cols!=null  && cols.show==true" :label="cols.label +'锛�"
 								:label-width="cols.labelWidth+'px'">
-								<!-- <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text> -->
-								<span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
 								<view class="input-wrapper"
-									v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
+									v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
 									<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
 										@change="onchange(cols)">&#xe568;</text>
 									<input class="uni-input" :class="cols.disabled?'input-disabled':''"
@@ -81,12 +86,12 @@
 										@click="onchange(cols)">&#xe568;</text>
 								</view>
 								<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
-								<uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled"
+								<uni-data-select id="dv_select" v-if="cols.name=='Select' "
 									:class="cols.disabled?'input-disabled':''" v-model="cols.value"
 									:localdata="cols.dict" @change="onchange(cols)" :disabled="cols.disabled"
 									:clear="false"></uni-data-select>
 								<!-- 澶氳鏂囨湰 -->
-								<view class="input-wrapper" v-if="cols.name=='Textarea' && !cols.disabled">
+								<view class="input-wrapper" v-if="cols.name=='Textarea' ">
 									<textarea class="uni-input" :value="cols.value"
 										:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
 										:focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)"
@@ -95,7 +100,7 @@
 								</view>
 								<!-- 澶嶉�妗�-->
 								<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
-									:class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
+									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
 									@change="onModelValue(cols)" :data-ischeck="cols.value"
 									:style="{'margin-left':'10rpx'}">
 									<label>
@@ -103,15 +108,24 @@
 										<text>{{cols.label}}</text>
 									</label>
 								</checkbox-group>
+								<!-- 鍗曢�妗�-->
+								<radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
+									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
+									@change="onModelValue(cols)">
+									<label v-for="(cols2) in cols.selections" :key="cols2.value">
+										<radio :value="cols2.value" :checked="cols2.value === cols.value" />
+										<text>{{cols2.label}}</text>
+									</label>
+								</radio-group>
 								<!-- Switch寮�叧 -->
 								<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
-									:disabled="item.disabled" v-model="cols.value" @change="onModelValue(cols)"
+									:disabled="cols.disabled" v-model="cols.value" @change="onModelValue(cols)"
 									:style="{'margin-left':'10rpx'}" />
 								<!-- 鏃ユ湡鏃堕棿 -->
 								<view class="input-wrapper"
 									v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled">
 									<picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''"
-										:disabled="item.disabled" :value="cols.value" @change="onModelValue(cols)">
+										:disabled="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
 										<view class="picker">{{cols.value}}</view>
 									</picker>
 								</view>
@@ -130,9 +144,9 @@
 					</a>
 				</view>
 			</view>
-			<button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0"
-				:class="saving?'btn_disabled':''" :disabled="saving">{{title}}</button>
-			<button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>
+			<button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0 && btnName != ''"
+				:class="saving?'btn_disabled':''" :disabled="saving">{{btnName}}</button>
+			<button type="default" @tap="cancel" :class="(dropdownBtns.length> 0 || btnName != '')?'btn_cancel':'btn_cancel2'">{{translateSys('cancel')}}</button>
 
 		</view>
 		<!-- 鏅�寮圭獥 top bottom center left right -->
@@ -183,6 +197,7 @@
 		data() {
 			return {
 				title: this.translateSys('add2'),
+				btnName: "",
 				param: {},
 				edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
 				edit_ok_event: "", //寮圭獥鐐瑰嚮OK 瑙﹀彂浜嬩欢ID
@@ -285,6 +300,7 @@
 			this.$data.param = JSON.parse(options.param);
 			this.$data.title = this.$data.param.Add_BtnName ? this.$data.param.Add_BtnName : options
 				.titlename; //璁剧疆鎸夐挳鏂囧瓧
+			this.$data.btnName = this.$data.param.Add_BtnName || ""
 			this.loadData(options.paramValue)
 		},
 		computed: {
@@ -295,7 +311,7 @@
 		},
 
 		methods: {
-			
+
 			setData: function(obj) {
 				let that = this;
 				let keys = [];
@@ -456,8 +472,8 @@
 						if (item.is_default == '1')
 							itemName = item.name;
 						list.push({
-							text: item.value,
-							value: item.name,
+							text: item.name,
+							value: item.id,
 						});
 					});
 					//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
@@ -785,7 +801,7 @@
 						// console.log(obj_attr);
 						var req = Object.keys(obj_attr).map((a) => ({
 							attr: a,
-							val: obj_attr[a] || "",
+							value: obj_attr[a] || "",
 						}));
 
 						var info = {
@@ -821,7 +837,7 @@
 						// console.log(obj_attr);
 						var req = Object.keys(obj_attr).map((a) => ({
 							attr: a,
-							val: obj_attr[a] || "",
+							value: obj_attr[a] || "",
 						}));
 						var info = {
 							eventid: eventid,
@@ -853,7 +869,7 @@
 						// console.log(obj_attr);
 						var req = Object.keys(obj_attr).map((a) => ({
 							attr: a,
-							val: obj_attr[a] || "",
+							value: obj_attr[a] || "",
 						}));
 						var info = {
 							eventid: eventid,
@@ -900,9 +916,9 @@
 				}
 				this.$data.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-				this.$refs.popup.open($this.popupType);
+				this.$refs.popup.open(this.popupType);
 
-				this.DataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
+				this.dataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
 					item);
 			},
 			popupChange(e) {
@@ -951,16 +967,26 @@
 					});
 					return;
 				}
-
-				var fieldId = $this.$data.popupParam.item.fieldId;
-				$this.head_styledef.form.model[attr] = name;
-				for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
-					var attr = $this.$data.head_styledef.form.items[c];
-					if (attr.fieldId == fieldId) {
-						attr.value = name;
-					}
+				if (data.length == 0) {
+					uni.showModal({
+						title: this.translateSys("tip"),
+						content:this.translate("tip_no_select_data"),
+						showCancel: false,
+						confirmText: this.translateSys("cancel")
+					});
+					return;
 				}
-				console.log(data);
+				// var fieldId = $this.$data.popupParam.item.fieldId;
+				// $this.head_styledef.form.model[fieldId] = name;
+				// console.log(fieldId,$this.$data.popupParam.item);
+				// for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) {
+				// 	var attr = $this.$data.head_styledef.form.items[c];
+				// 	if (attr.fieldId == fieldId) {
+				// 		attr.value = name;
+				// 	}
+				// }
+				// console.log(data);
+				// console.log($this.head_styledef.form);
 				var callback_eventid = $this.$data.popupParam.button_callback.trim();
 				var info = {
 					eventid: callback_eventid,
@@ -1339,52 +1365,62 @@
 					});
 				});
 			},
-			DataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
+			dataObjRunCustomEvent_Return(eventid, data_attr, button_callback, item) {
+				const $this = this
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: $this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
-					button_name: this.translateSys('add2'),
+					button_name: $this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
+						cls_id: $this.param.DataCls.id, // 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 obj_attr = $this.head_styledef.form.model;
+				 console.log(obj_attr);
 				var req = Object.keys(obj_attr).map((a) => ({
 					attr: a,
-					val: obj_attr[a] || "",
+					value: obj_attr[a] || "",
 				}));
-				if (this.$data.refdatastore.length > 0) {
-					for (var i = 0; i < this.$data.refdatastore.length; i++) {
+				if ($this.refdatastore.length > 0) {
+					for (var i = 0; i < $this.refdatastore.length; i++) {
 						if (!req.filter(function(s) {
-								return this.$data.refdatastore[i].attr == s.name
+								return $this.refdatastore[i].attr == s.name
 							}).length) {
-							length = 1;
 							req.push({
-								'attr': this.$data.refdatastore[i].attr,
-								'val': this.$data.refdatastore[i].value
+								'attr': $this.refdatastore[i].attr,
+								'value': $this.refdatastore[i].value
 							});
 						}
 					}
 				}
+			
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
 					type: 'small', //灏忕獥鍙�-					class_id: this.$data.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
+					class_id: $this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
 				}
 				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
-				req.forEach(item => {
-					obj_attr[item.attr] = item.val;
+				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.$data.param.DataCls.id,
+					class_id: $this.param.DataCls.id,
 					class_name: '',
 					event_id: eventid,
 					event_name: '',
@@ -1394,11 +1430,11 @@
 					ref_cls_id: '',
 					rel_obj_id: '',
 					user_login: '',
-					data_json: '',
+					data_json: [],
 					compose_info: '',
 					ext_info: extinfo,
 					global_attr: global_attr,
-					input_param: '',
+					input_param:input_param,
 				};
 				console.log(dataInfo);
 				// return;
@@ -1409,22 +1445,22 @@
 							data
 							.err_info.join('<br/>') : '';
 						if (data.ret == 801) {
-							if (this.param.Only_Script_Error) {
+							if ($this.param.Only_Script_Error) {
 								let pos = tip.indexOf("锛�);
 								if (pos > -1) tip = tip.substring(pos + 1);
 							}
 							uni.showModal({
-								title: this.translateSys("tip"),
+								title: $this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: $this.translateSys("cancel")
 							});
 						} else uni.showModal({
-							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							title: $this.translateSys("tip"),
+							content: tip + ',' + $this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: $this.translateSys("cancel")
 						});
 						return false
 					} else {
@@ -1433,30 +1469,30 @@
 							.join(
 								'<br/>') : '';
 						if (tip) uni.showModal({
-							title: this.translateSys("tip"),
+							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: $this.translateSys("cancel")
 						});
 
 						if (data != "") {
 							var actions = data.action;
-							console.log(actions);
 							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(
+												$this.translateSys("tip"),
+											content: $this.translateSys(
 													"quotation_mark_left") +
 												action
-												.action_type + this.translateSys(
-													"quotation_mark_right") + this
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
 												.translate(
 													"tip_action_unprocessed")
 										});
@@ -1464,7 +1500,6 @@
 									} else if (action.action_type == 'open_select_userdlg') {
 										var style = val.style;
 										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
-										var $this = this;
 										var param = {
 											item: item,
 											button_callback: button_callback,
@@ -1507,33 +1542,33 @@
 									} 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(
+												$this.translateSys("tip"),
+											content: $this.translateSys(
 													"quotation_mark_left") +
 												action
-												.action_type + this.translateSys(
-													"quotation_mark_right") + this
+												.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
 												.translate(
 													"tip_action_unprocessed")
 										});
 										d.show();
 									} else if (action.action_type == 'open_common_dlg') {
-										var $this = this;
+		
 										if (val.common_dlg_id == 'check_list') {
-											$this.$data.check_list = val.config;
+											$this.setData({check_list:val.config})
 											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-												$this.$data.popupType = 'right';
+												$this.setData({popupType:"right"})
 											else
-												$this.$data.popupType = 'center'
+											$this.setData({popupType:"center"})
 											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-											$this.$refs.popup.open($this.$data.popupType);
+											$this.$refs.popup.open($this.popupType);
 											var popupParam = {
 												item: item,
 												button_callback: button_callback,
 												req: req,
 												data_attr: data_attr
 											}
-											$this.$data.popupParam = popupParam;
+											$this.setData({popupParam:popupParam})
 										}
 									} else if (action.action_type == 'open_project_query_dlg') {
 										//console.log(action.value.select_range);
@@ -1553,8 +1588,6 @@
 											priRel = '4';
 										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
 											priRel = '5';
-
-										var $this = this;
 										var param_ = {
 											item: item,
 											button_callback: button_callback,
@@ -1601,28 +1634,28 @@
 										});
 									} else {
 										uni.showModal({
-											title: this.translateSys("tip"),
-											content: this.translateSys(
+											title: $this.translateSys("tip"),
+											content: $this.translateSys(
 													"quotation_mark_left") +
-												action.action_type + this.translateSys(
-													"quotation_mark_right") + this
+												action.action_type + $this.translateSys(
+													"quotation_mark_right") + $this
 												.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
-											confirmText: this.translateSys("cancel")
+											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(
+								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")
+								confirmText: $this.translateSys("cancel")
 							});
 						}
 					}
@@ -1634,10 +1667,10 @@
 						exStr = ex
 					let tip = typeof ex.errMsg == "string" ? ex.errMsg : exStr
 					uni.showModal({
-						title: this.translateSys('tip') + "5.1",
+						title: $this.translateSys('tip') + "5.1",
 						content: exStr,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: $this.translateSys("cancel")
 					});
 				});
 			},
@@ -2168,6 +2201,16 @@
 				float: right;
 				display: inline-block;
 			}
+			.btn_cancel2 {
+				width: 90%;
+				margin: 0 10rpx;
+				background: #fff;
+				border: none;
+				color: #000;
+				font-size: 38rpx;
+				float: right;
+				display: inline-block;
+			}
 
 			.uni-padding-wrap {
 				margin: 2rpx 0 0 10rpx;

--
Gitblit v1.9.1