From 310ab72840d7c7025273ac79363107a1f9e4bc8e Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 18 七月 2025 17:34:47 +0800
Subject: [PATCH] test

---
 pages/modal/3018_2.vue |  242 ++++++++++++++++++++++++++----------------------
 1 files changed, 132 insertions(+), 110 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index cb8a253..c888cad 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -1,8 +1,9 @@
 <template>
-	<view class="uni-page-modal-3018-2">
+	<view class="uni-page-modal-3018-2" :class="largeMode?'large-mode':''">
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
+			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form"
+				:hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " :focusId="focusFieldId"
 				@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
 				@on-click-suffix="classAttr_extButton"></OIForm>
 
@@ -75,6 +76,7 @@
 		},
 		data() {
 			return {
+				largeMode: getApp().globalData.largeMode || false,
 				title: this.translateSys('add2'),
 				btnName: "",
 				param: {},
@@ -106,7 +108,7 @@
 			if (e.index == 0) {
 				const $this = this
 				uni.scanCode({
-					scanType: ["qrCode"],
+					scanType: ["qrCode", 'barCode'],
 					success: function(res) {
 
 						if ($this.focusFieldId) {
@@ -275,7 +277,7 @@
 										if (itemName) {
 											styledefHead.form.model[ele.fieldId] = itemName;
 										}
-										ele.dict = selections.map((a) => {
+										ele.selections = selections.map((a) => {
 											return {
 												value: a.value,
 												text: a.label
@@ -311,7 +313,7 @@
 													styledefHead.form
 														.model[col.fieldId] = itemName;
 												}
-												col.dict = selections.map((a) => {
+												col.selections = selections.map((a) => {
 													return {
 														value: a.value,
 														text: a.label
@@ -332,6 +334,25 @@
 									}
 								}
 							}
+						}
+						const app = getApp()
+						if (app.globalData.bindClasses) {
+							styledefHead.form.items.push({
+								name: "Input",
+								label: this.translate("classes"),
+								labelWidth: 100,
+								disabled: true,
+								value: app.globalData.classes,
+								setting: {
+									width: 100,
+									height: 50,
+								},
+								bind: {
+									attr: "",
+								},
+								fieldId: "S_CLASSES",
+							})
+							styledefHead.form.model["S_CLASSES"] = app.globalData.classes
 						}
 
 					}
@@ -444,10 +465,8 @@
 						});
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
-							.info
-							.join(
-								'<br/>') : '';
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data.info.join('<br/>') : '';
 						if (tip) uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip,
@@ -470,9 +489,7 @@
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
-									if ($this
-										.focusOldFieldId ==
-										action.value) {
+									if ($this.focusOldFieldId == action.value) {
 										$this.setData({
 											focusFieldId: ""
 										})
@@ -528,50 +545,12 @@
 
 
 			ontap(item) { //鎵爜鍔熻兘
-				// console.log("ontap",item);
-				// 鎵撳紑钃濈墮閫傞厤鍣�-				// uni.openBluetoothAdapter({
-				//   success: function() {
-				// 	// 寮�鎼滅储钃濈墮璁惧
-				// 	uni.startBluetoothDevicesDiscovery({
-				// 	  success: function() {
-				// 		// 鐩戝惉鎵惧埌鏂拌澶囩殑浜嬩欢
-				// 		uni.onBluetoothDeviceFound(function(devices) {
-				// 		  // 杩欓噷鍙互杩囨护鍑篟FID鑺墖锛岃繛鎺ュ苟璇诲彇鏁版嵁
-				// 		  console.log(devices[0].deviceId);
-				// 		})
-				// 	  }
-				// 	})
-				//   }
-				// });
-				// 鐩戝惉NFC鍔熻兘鏄惁鍙敤
-				// uni.getNFCAdapterState({
-				//   success: function(res) {
-				// 	console.log(res);
-				//     if (res.errCode === 0) {
-				//       // NFC鍔熻兘鍙敤锛屽紑濮嬬洃鍚�-				//       uni.onNFCStart((res) => {
-				//         if (res.errCode === 0) {
-				//           // 寮�NFC鏍囩妫�祴
-				//           uni.makeNFCReaderStart({
-				//             success: function() {
-				//               // 鐩戝惉NFC鏍囩
-				//               uni.onNFCTagDiscovered(function(res) {
-				// 										  console.log(res);
-				//                 // 杩欓噷鍙互澶勭悊NFC鏍囩鏁版嵁
-				//               })
-				//             }
-				//           })
-				//         }
-				//       })
-				//     }
-				//   }
-				// })
+
 				this.focusOldFieldId = item.fieldId
 				getApp().onScan((result) => {
 					console.log(result);
 					// uni.hideKeyboard();
-					this.onScanValue(item, result.decodedata)
+					this.onScanValue(item, result)
 				})
 			},
 			onScanValue(item, value) {
@@ -749,7 +728,8 @@
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
 
-				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
+				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent
+					.id,
 					item);
 			},
 			popupChange(e) {
@@ -862,7 +842,8 @@
 				// }
 				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缂栫爜
+				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 = {};
@@ -910,14 +891,16 @@
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							content: tip + ',' + this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1024,7 +1007,8 @@
 					class_id: $this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
 				}
 				extinfo = Base64.encode(JSON.stringify(extinfo)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify($this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify($this
+					.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
 				req.forEach(item2 => {
 					obj_attr[item2.attr] = item2.value;
@@ -1079,14 +1063,16 @@
 							});
 						} else uni.showModal({
 							title: $this.translateSys("tip"),
-							content: tip + ',' + $this.translateSys('tip') + ':' + data
+							content: tip + ',' + $this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: $this.translateSys('close')
 						});
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1110,13 +1096,17 @@
 										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(
+											content: $this.translateSys(
+													"quotation_mark_left") +
+												action.action_type + $this
+												.translateSys(
 													"quotation_mark_right") +
-												$this.translate("tip_action_unprocessed")
+												$this.translate(
+													"tip_action_unprocessed")
 										});
 										d.show();
-									} else if (action.action_type == 'open_select_userdlg') {
+									} else if (action.action_type ==
+										'open_select_userdlg') {
 										var style = val.style;
 										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
 										var param = {
@@ -1152,13 +1142,15 @@
 														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info,
+													$this.DataObjRunCustomEvent(
+														info,
 														param
 														.data_attr);
 												}
 											}
 										});
-									} else if (action.action_type == 'open_data_query_dlg') {
+									} 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"),
@@ -1178,7 +1170,8 @@
 											$this.setData({
 												check_list: val.config
 											})
-											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+											if (val.config.appear_style ==
+												'sideslip') //鍒ゆ柇鏄惁鏄晶婊� 												$this.setData({
 													popupType: "right"
 												})
@@ -1198,7 +1191,8 @@
 												popupParam: popupParam
 											})
 										}
-									} else if (action.action_type == 'open_project_query_dlg') {
+									} else if (action.action_type ==
+										'open_project_query_dlg') {
 										//console.log(action.value.select_range);
 										//console.log(action.value.mulit_select);
 										var priRel = '-1';
@@ -1208,7 +1202,8 @@
 											priRel = '1';
 										else if (action.value.select_range == '鎴戝垱寤虹殑')
 											priRel = '2';
-										else if (action.value.select_range == '鎴戝弬涓庣殑' || action
+										else if (action.value.select_range == '鎴戝弬涓庣殑' ||
+											action
 											.value
 											.select_range == '鎴戝弬鍔犵殑')
 											priRel = '3';
@@ -1222,7 +1217,8 @@
 											req: req
 										}
 										uni.navigateTo({
-											url: '../selPrj/index?relation=' + priRel +
+											url: '../selPrj/index?relation=' +
+												priRel +
 												'&param=' +
 												JSON.stringify(param_),
 											events: {
@@ -1242,7 +1238,8 @@
 														var info = {
 															eventid: callback_eventid,
 															edtype: "2",
-															projectid: data[0].ID,
+															projectid: data[0]
+																.ID,
 															rclsid: "",
 															robjid: "",
 															userlogin: "",
@@ -1254,8 +1251,9 @@
 															dataJson: [],
 														}
 
-														$this.DataObjRunCustomEvent(
-															info);
+														$this
+															.DataObjRunCustomEvent(
+																info);
 													}
 												}
 											}
@@ -1265,12 +1263,14 @@
 											title: $this.translateSys("tip"),
 											content: $this.translateSys(
 													"quotation_mark_left") +
-												action.action_type + $this.translateSys(
+												action.action_type + $this
+												.translateSys(
 													"quotation_mark_right") + $this
 												.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
-											confirmText: $this.translateSys('close')
+											confirmText: $this.translateSys(
+												'close')
 										});
 									}
 								}
@@ -1278,9 +1278,11 @@
 						} else {
 							uni.showModal({
 								title: $this.translateSys('tip') + "5.2",
-								content: $this.translateSys("quotation_mark_left") +
+								content: $this.translateSys(
+										"quotation_mark_left") +
 									"before_click_button" + $this.translateSys(
-										"quotation_mark_right") + $this.translateSys(
+										"quotation_mark_right") + $this
+									.translateSys(
 										"comma") + 'event_id' + eventid,
 								showCancel: false,
 								confirmText: $this.translateSys('close')
@@ -1374,7 +1376,8 @@
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							content: tip + ',' + this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: this.translateSys('close')
@@ -1382,7 +1385,8 @@
 						this.saving = false
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1405,7 +1409,8 @@
 						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+								url: '../modal/3018_2?param=' + JSON.stringify(this
+										.$data
 										.param) +
 									"&titlename=" + this.title
 							});
@@ -1470,7 +1475,7 @@
 				const $this = this
 				const head_styledef = this.head_styledef
 				for (var i = 0; i < data.length; i++) {
-					const attr = attr
+					const attr = data[i]
 					if (attr.choice_list) {
 						for (var c = 0; c < head_styledef.form.items.length; c++) {
 							const item = head_styledef.form.items[c];
@@ -1486,7 +1491,11 @@
 											"value": val
 										});
 									}
-									item.dict = dictItemList;
+									if (item.useDict) {
+										item.dict = dictItemList;
+									} else {
+										item.selections = dictItemList;
+									}
 								}
 							} else if (item.name == 'Layout') {
 								item.setting.colList.forEach(col => {
@@ -1502,7 +1511,11 @@
 													"value": val
 												});
 											}
-											col.dict = dictItemList;
+											if (col.useDict) {
+												col.dict = dictItemList;
+											} else {
+												col.selections = dictItemList;
+											}
 										}
 									}
 								});
@@ -1556,28 +1569,28 @@
 				}
 
 			},
-			hideFormItems(data) {
-				const $this = this
+			hideFormItems(attrs) {
+				if (!Array.isArray(attrs)) {
+					return
+				}
 				const head_styledef = this.head_styledef
-				data.forEach(async (attr, key) => {
-					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;
-									}
-								}
-							});
-						}
-					});
+				if (!head_styledef.hiddenIds) {
+					head_styledef.hiddenIds = []
+				}
+				attrs.forEach((attr) => {
+					let index = head_styledef.hiddenIds.findIndex((id) => id == attr.attr);
+					if (attr.show) {
+						if (index > -1) head_styledef.hiddenIds.splice(index, 1);
+					} else {
+						if (index == -1) head_styledef.hiddenIds.push(attr.attr);
+					}
 				});
+
+				this.setData({
+					head_styledef: head_styledef
+				})
 			},
+
 			afterOK() {
 				this.saving = true
 				const $this = this
@@ -1590,7 +1603,8 @@
 						value: obj_attr[a],
 					})),
 				};
-				if (!this.after_ok.id.includes('{')) this.after_ok.id = '{' + this.after_ok.id + '}';
+				if (!this.after_ok.id.includes('{')) this.after_ok.id = '{' + this.after_ok.id +
+					'}';
 				var dataInfo = {
 					ed_type: "0",
 					start_transaction: true,
@@ -1630,7 +1644,8 @@
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							content: tip + ',' + this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: this.translateSys('close')
@@ -1638,7 +1653,8 @@
 						this.saving = false
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1651,7 +1667,8 @@
 						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+								url: '../modal/3018_2?param=' + JSON.stringify(this
+										.$data
 										.param) +
 									"&titlename=" + this.title
 							});
@@ -1803,14 +1820,16 @@
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
-							content: tip + ',' + this.translateSys('tip') + ':' + data
+							content: tip + ',' + this.translateSys('tip') + ':' +
+								data
 								.ret,
 							showCancel: false,
 							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
-						var tip = data.info ? typeof data.info == 'string' ? data.info : data
+						var tip = data.info ? typeof data.info == 'string' ? data.info :
+							data
 							.info
 							.join(
 								'<br/>') : '';
@@ -1823,7 +1842,8 @@
 						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
+								url: '../modal/3018_2?param=' + JSON.stringify(this
+										.$data
 										.param) +
 									"&titlename=" + this.title
 							});
@@ -1890,7 +1910,8 @@
 					cls_name: btn.Cls_Name,
 					Edit_dlg: btn.Edit_dlg
 				};
-				const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg
+				const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn
+					.Edit_dlg
 					.Name +
 					"&type=addDataObj"
 				var $this = this;
@@ -1902,7 +1923,8 @@
 							console.log(resData);
 							//鍒锋柊
 							uni.redirectTo({
-								url: '../modal/3018_2?param=' + JSON.stringify(this
+								url: '../modal/3018_2?param=' + JSON.stringify(
+										this
 										.$data.param) +
 									"&titlename=" + this.title
 							});

--
Gitblit v1.9.1