From 0ecc402885f332b21923bb12183dc072306f2b39 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 18:36:15 +0800
Subject: [PATCH] vue3

---
 pages/modal/3018_2.vue |  212 +++++++++++++++-------------------------------------
 1 files changed, 61 insertions(+), 151 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index a6080af..c1815f8 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -3,15 +3,15 @@
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
 			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
-				@click="onClick" @focus="ontap" @change="onEnterChange" @click-prefix="classAttr_extButton"
-				@click-suffix="classAttr_extButton"></OIForm>
+				@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
+				@on-click-suffix="classAttr_extButton"></OIForm>
 
 		</view>
 		<view class="view-bottom">
 			<view class="uni-padding-wrap" v-if="dropdownBtns.length>0">
 				<view class="uni-btn-v">
 					<a @tap="clickDropdownBtns">
-						<Icon class="mobox-normal-more" />
+						<text class="mobox-normal-more" />
 					</a>
 				</view>
 			</view>
@@ -51,7 +51,9 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from  '@/js/Base64.js';
 	import utils from "@/js/utils.js"
 	import dayjs from "dayjs";
 	import OIForm from '@/components/oi-form/index.vue'
@@ -64,11 +66,10 @@
 		runCustomEvent,
 		dataObjCreate
 	} from "@/api/data.js"
-
+	import buttonClickMixin from '@/mixins/button-click.js';
+	
 	export default {
-		modules: {
-			Base64,
-		},
+	mixins: [buttonClickMixin],
 		components: {
 			OIForm,
 		},
@@ -82,7 +83,6 @@
 				edit_select_compose_event: "", //閫夋嫨缁勬垚瀵硅薄鏃惰皟鐢� 				edit_compose_cls_id: "",
 				global_attr: [],
-				refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 				scanCodeVal: "",
 				popupType: "center",
 				check_list: {},
@@ -149,7 +149,6 @@
 					edit_select_compose_event: "", //閫夋嫨缁勬垚瀵硅薄鏃惰皟鐢� 					edit_compose_cls_id: "",
 					global_attr: [],
-					refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 					scanCodeVal: "",
 					popupType: "center",
 					check_list: {},
@@ -175,10 +174,10 @@
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.param = JSON.parse(options.param);
-			this.$data.title = this.$data.param.Add_BtnName ? this.$data.param.Add_BtnName : options
+			this.param = JSON.parse(options.param);
+			this.title = this.param.Add_BtnName ? this.param.Add_BtnName : options
 				.titlename; //璁剧疆鎸夐挳鏂囧瓧
-			this.$data.btnName = this.$data.param.Add_BtnName || ""
+			this.btnName = this.param.Add_BtnName || ""
 			this.loadData(options.paramValue)
 		},
 		computed: {
@@ -218,7 +217,7 @@
 				//浼犲叆鍙傛暟鍊� 				if (paramValue) {
 					const attrs = paramValue.attrs || [];
-					(this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+					(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
 						if (ele.name != "Layout") {
 							attrs.forEach(async (ele2, index2) => {
 								if (ele.fieldId == ele2.name) {
@@ -467,7 +466,7 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									$this.hideFormItems(result)
-									// console.log($this.$data.head_styledef);
+									// console.log($this.head_styledef);
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
@@ -579,7 +578,7 @@
 				const $this = this;
 				//console.log("onScanValue", item);
 				item.value = value
-				let newVal = item.value 
+				let newVal = item.value
 				if (typeof item.value == "string") {
 					newVal = item.value.trim()
 				}
@@ -603,7 +602,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.DataCls.id,
+							clsid: this.param.DataCls.id,
 							objid: "",
 							attr: req,
 							dataJson: [],
@@ -677,8 +676,12 @@
 				let newVal = item.value
 				if (typeof item.value == "string") {
 					newVal = item.value.trim()
-					if (!newVal)
+					if (!newVal) {
+						item.oldvalue = newVal;
+						var attr = item.fieldId;
+						this.head_styledef.form.model[attr] = newVal;
 						return
+					}
 				}
 				if (item.oldvalue != newVal) {
 					item.oldvalue = newVal;
@@ -709,7 +712,7 @@
 						rclsid: '',
 						robjid: '',
 						userlogin: '',
-						clsid: this.$data.param.DataCls.id,
+						clsid: this.param.DataCls.id,
 						objid: "",
 						attr: req,
 						dataJson: []
@@ -741,7 +744,7 @@
 					});
 					return;
 				}
-				this.$data.popupType = 'right'
+				this.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
 
@@ -755,15 +758,15 @@
 				// console.log(e.target.dataset);
 				var index = e.target.dataset.index;
 				var ischeck = e.target.dataset.ischeck;
-				var data = this.$data.check_list.items;
-				// this.$data.check_list.items=[];
-				if (this.$data.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫�+				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.$data.check_list.items = data;
+				this.check_list.items = data;
 
 			},
 			popup_cancel(e) { //寮规鍙栨秷
@@ -771,7 +774,7 @@
 			},
 			popup_sava(e) { //寮规纭畾
 				var $this = this;
-				var items = $this.$data.check_list.items;
+				var items = $this.check_list.items;
 				var data = [];
 				var name = "";
 				for (var i = 0; i < items.length; i++) {
@@ -785,7 +788,7 @@
 						});
 					}
 				}
-				if (!$this.$data.popupParam) {
+				if (!$this.popupParam) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: "popupParam涓虹┖锛�,
@@ -803,7 +806,7 @@
 					});
 					return;
 				}
-				var callback_eventid = $this.$data.popupParam.button_callback.trim();
+				var callback_eventid = $this.popupParam.button_callback.trim();
 				var info = {
 					eventid: callback_eventid,
 					edtype: "0",
@@ -811,12 +814,12 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: $this.$data.param.DataCls.id,
+					clsid: $this.param.DataCls.id,
 					objid: "",
-					attr: $this.$data.popupParam.req,
+					attr: $this.popupParam.req,
 					dataJson: data
 				}
-				$this.DataObjRunCustomEvent(info, $this.$data.popupParam.data_attr);
+				$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
 				this.$refs.popup.close();
 			},
 
@@ -824,18 +827,18 @@
 				var $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'),
 					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
 					}
 				};
 				if (data_attr) {
 					enviroment.edit_dlg = {
 						type: 'small', //灏忕獥鍙�-						class_id: this.$data.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
+						class_id: this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
 					}
 					if (data_attr) {
 						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -854,11 +857,11 @@
 				//     edtype: info.edtype, eventid: info.eventid, projectid: info.projectid.replace('{','').replace('}',''),
 				//     rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
 				//     attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: "",
-				// 	global_attr: JSON.stringify(this.$data.global_attr), dataJson:JSON.stringify(info.dataJson)
+				// 	global_attr: JSON.stringify(this.global_attr), dataJson:JSON.stringify(info.dataJson)
 				// }
 				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.$data.global_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 = {};
@@ -935,9 +938,9 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									$this.hideFormItems(result)
-									// console.log($this.$data.head_styledef);
+									// console.log($this.head_styledef);
 								} else if (action.action_type == 'set_global_attr') {
-									$this.$data.global_attr = action.value || [];
+									$this.global_attr = action.value || [];
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
@@ -977,63 +980,7 @@
 						console.log($this.head_styledef);
 
 						if (data.result) {
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.head_styledef.form.items
-									.length; c++) {
-									var attr = $this.$data.head_styledef.form.items[c];
-									//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-									if ($this.head_styledef.form.model[result[i].attr] ==
-										undefined) {
-										$this.head_styledef.form.model[result[i].attr] =
-											result[i]
-											.value;
-									}
-									//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-									if (attr.name != 'Layout') {
-										if (attr.fieldId == result[i].attr) {
-											attr.value = '';
-											attr.oldvalue = '';
-											attr.value = result[i].value;
-											attr.oldvalue = result[i].value;
-											$this.head_styledef.form.model[attr.fieldId] =
-												result[i]
-												.value;
-										}
-									} else if (attr.name == 'Layout') {
-										attr.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == result[i].attr) {
-													col.value = '';
-													col.oldvalue = '';
-													col.value = result[i].value;
-													col.oldvalue = result[i].value;
-													$this.head_styledef.form.model[col
-															.fieldId] =
-														result[i].value;
-												}
-											}
-										});
-									}
-								}
-
-								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i]
-											.attr) {
-											$this.$data.refdatastore[j].value = result[i]
-												.value;
-										}
-									}
-								}
-							}
+							$this.setFormValues(data.result)
 						}
 					}
 
@@ -1069,18 +1016,6 @@
 					attr: a,
 					value: obj_attr[a] || "",
 				}));
-				if ($this.refdatastore.length > 0) {
-					for (var i = 0; i < $this.refdatastore.length; i++) {
-						if (!req.filter(function(s) {
-								return $this.refdatastore[i].attr == s.name
-							}).length) {
-							req.push({
-								'attr': $this.refdatastore[i].attr,
-								'value': $this.refdatastore[i].value
-							});
-						}
-					}
-				}
 
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
@@ -1208,7 +1143,7 @@
 														rclsid: '',
 														robjid: '',
 														userlogin: '',
-														clsid: $this.$data.param
+														clsid: $this.param
 															.DataCls
 															.id,
 														objid: "",
@@ -1297,8 +1232,8 @@
 														data[0].ID +
 														';' + data[0].Name;
 
-													// $this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
-													// $this.$data.classAttrList[param.index].Attr[param.iindex].ValID=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();
@@ -1392,24 +1327,18 @@
 
 				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'),
 					master: {
-						cls_id: this.$data.param.DataCls.id,
+						cls_id: this.param.DataCls.id,
 					}
 				};
 				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 
-				// console.log(obj_attr);
-				// var dataInfo={
-				//     class_id: this.$data.param.DataCls.id, data_obj_id: '', masterclsid: '',
-				//     req: JSON.stringify(req), upfile: JSON.stringify([]), post_data: JSON.stringify({}),
-				//     compose: JSON.stringify([]), refdatastore: JSON.stringify([]), extinfo: JSON.stringify(enviroment), 
-				// 	not_trigger_sys_event: ''
-				// };
+
 				var dataInfo = {
-					class_id: this.$data.param.DataCls.id,
+					class_id: this.param.DataCls.id,
 					class_name: '',
 					master_cls_id: '',
 					master_obj_id: '',
@@ -1472,12 +1401,12 @@
 						}
 
 
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -1585,10 +1514,10 @@
 
 						}
 					}
-					for (var c = 0; c < $this.$data.head_styledef.form
+					for (var c = 0; c < $this.head_styledef.form
 						.items
 						.length; c++) {
-						var attr = $this.$data.head_styledef.form.items[c];
+						var attr = $this.head_styledef.form.items[c];
 						// console.log(attr[j].Name+'=='+data[i].attr);
 						//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹� 						if ($this.head_styledef.form.model[data[i]
@@ -1633,32 +1562,13 @@
 							});
 						}
 					}
-					var length = 0;
-					if (!$this.$data.refdatastore.filter(function(s) {
-							return data[i].attr == s.attr
-						}).length) {
-						length = 1;
-						$this.$data.refdatastore.push(data[i]);
-					}
-					if (length == 0) {
-						for (var j = 0; j < $this.$data.refdatastore
-							.length; j++) {
-							if ($this.$data.refdatastore[j].attr == data[
-									i]
-								.attr) {
-								$this.$data.refdatastore[j].value = data[
-										i]
-									.value;
-							}
-						}
-					}
 				}
 
 			},
 			hideFormItems(data) {
 				const $this = this
 				data.forEach(async (attr, key) => {
-					$this.$data.head_styledef.form.items
+					$this.head_styledef.form.items
 						.forEach(
 							async (
 								ele, index) => {
@@ -1691,8 +1601,8 @@
 				});
 				var head_styledef = JSON.parse(JSON.stringify($this.$data
 					.head_styledef));
-				$this.$data.head_styledef = [];
-				$this.$data.head_styledef = head_styledef;
+				$this.head_styledef = [];
+				$this.head_styledef = head_styledef;
 			},
 			afterOK() {
 				this.saving = true
@@ -1710,7 +1620,7 @@
 				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: this.after_ok.id,
 					event_name: '',
@@ -1764,12 +1674,12 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -1936,12 +1846,12 @@
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -2020,7 +1930,7 @@
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this
 										.$data.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 
 						},

--
Gitblit v1.9.1