From d8872903e30f0a53abefcd279ae03258341e931f Mon Sep 17 00:00:00 2001 From: cuiqian2004 <cuiqian2004@163.com> Date: 星期四, 20 三月 2025 09:10:31 +0800 Subject: [PATCH] test --- pages/modal/3018_2.vue | 4 +--- pages/modal/5601.vue | 35 +++++++++++++++++++++-------------- pages/modal/3037_2.vue | 9 +++++++-- pages/modal/3200.vue | 4 +--- manifest.json | 4 ++-- pages/modal/form/index.vue | 4 +--- 6 files changed, 33 insertions(+), 27 deletions(-) diff --git a/manifest.json b/manifest.json index 7c48b89..13692ce 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "MoboxPDA", "appid" : "__UNI__56D451E", "description" : "", - "versionName" : "1.1.47", - "versionCode" : 1147, + "versionName" : "1.1.48", + "versionCode" : 1148, "transformPx" : false, /* 5+App鐗规湁鐩稿叧 */ "app-plus" : { diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue index 462bf79..a6080af 100644 --- a/pages/modal/3018_2.vue +++ b/pages/modal/3018_2.vue @@ -582,10 +582,8 @@ let newVal = item.value if (typeof item.value == "string") { newVal = item.value.trim() - if (!newVal) - return } - if (item.oldvalue != newVal) { + if (newVal) { item.oldvalue = newVal; var attr = item.fieldId; $this.head_styledef.form.model[attr] = newVal; diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue index 1aff5ff..a8d0c38 100644 --- a/pages/modal/3037_2.vue +++ b/pages/modal/3037_2.vue @@ -1073,15 +1073,20 @@ //console.log(e.target) getApp().onScan((result) => { console.log(result.decodedata); + item.value = result.decodedata + let newVal = item.value + if (typeof item.value == "string") { + newVal = item.value.trim() + } var isflag = true; for (var i in this.$data.subPanelList) { - if (this.$data.subPanelList[i].scanCodeVal == result.decodedata) + if (this.$data.subPanelList[i].scanCodeVal == newVal) isflag = false; } //瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁 if (isflag) { uni.hideKeyboard(); - this.$data.scanCodeVal = result.decodedata; + this.$data.scanCodeVal =newVal; var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID; if (eventid) { //涓绘暟鎹被灞炴� diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue index e8899f1..9427d83 100644 --- a/pages/modal/3200.vue +++ b/pages/modal/3200.vue @@ -1196,9 +1196,7 @@ var $this = this; console.log(item); let newVal = item.value.trim() - if (!newVal) - return - if (item.oldvalue != newVal) { + if (newVal) { item.oldvalue = newVal; var attr = item.fieldId; diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue index bf0326f..3055125 100644 --- a/pages/modal/5601.vue +++ b/pages/modal/5601.vue @@ -627,7 +627,7 @@ item.value = result.decodedata; var $this = this; let newVal = item.value.trim() - if (item.oldvalue != newVal) { + if (newVal) { item.oldvalue = newVal; var attr = item.fieldId; this.head_styledef.form.model[attr] = newVal; @@ -731,7 +731,7 @@ } }, - + classAttr_extButton(item) { var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�@@ -993,12 +993,15 @@ } else if (item.action_type == "clear_subpage_rows") { var value = item.value; - const pageData = $this.pageDetail.find((page) => { + const pageIndex = $this.pageDetail.findIndex((page) => { return value.page_name == page.Name; }); - if (pageData) { + if (pageIndex > -1) { + const pageData = $this.pageDetail[pageIndex] pageData.DefList = [] pageData.ExtData = {} + + $this.$set(this.pageDetail, pageIndex, pageData) } } else if (item.action_type == "set_dlg_current_edit_attr") { @@ -1126,9 +1129,12 @@ if (JSON.stringify(value.row) == '{}') { return; } - const pageData = this.pageDetail.find((page) => { + const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => { return value.page_name == page.Name; - }); + }) + if (pageIndex < 0) + return + const pageData = $this.pageDetail[pageIndex] if (pageData?.DefList) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� { value.row.forEach((row) => { @@ -1139,12 +1145,12 @@ }); }); } + $this.$set(this.pageDetail, pageIndex, pageData) }, //鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭 viewActionSetRow(value) { const $this = this - const pageIndex = $this.pageDetail.findIndex(( - page, index2, arr) => { + const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => { return value.page_name == page.Name; }) if (pageIndex < 0) @@ -1449,7 +1455,7 @@ }); } - + $this.$set(this.pageDetail, pageIndex, pageData) }, setFormValues(attrs) { const head_styledef = this.head_styledef @@ -2672,9 +2678,7 @@ // uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")}); result.action.forEach(item => { - if (item.action_type == - "insert_subtable_page_row" - ) { //鐮佺洏涓�+ if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓� var value = item.value; //鍔犺浇宸茬粡鐮佺洏鏁版嵁 $this.viewAceionRow(value); @@ -2750,12 +2754,15 @@ } else if (item.action_type == "clear_subpage_rows") { var value = item.value; - const pageData = $this.pageDetail.find((page) => { + const pageIndex = $this.pageDetail.findIndex((page) => { return value.page_name == page.Name; }); - if (pageData) { + if (pageIndex > -1) { + const pageData = $this.pageDetail[pageIndex] pageData.DefList = [] pageData.ExtData = {} + + $this.$set(this.pageDetail, pageIndex, pageData) } } else if (item.action_type == "set_dlg_current_edit_attr") { if ($this.focusOldFieldId == item.value) diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue index 55c95e5..e50b6c3 100644 --- a/pages/modal/form/index.vue +++ b/pages/modal/form/index.vue @@ -535,9 +535,7 @@ item.value = result.decodedata; var $this = this; let newVal = item.value.trim() - if (!newVal) - return - if (item.oldvalue != newVal) { + if (newVal) { item.oldvalue = newVal; var attr = item.fieldId; this.head_styledef.form.model[attr] = newVal; -- Gitblit v1.9.1