From ade379c26e00929b7295b37d7c274ccbb0026b7d Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 12 六月 2025 12:27:26 +0800
Subject: [PATCH] test
---
pages/modal/5601.vue | 12 +-
pages/modal/3202.vue | 12 +-
pages/modal/3200.vue | 13 +-
App.vue | 96 +++++++++++++++++------
pages/modal/5600.vue | 28 +++++-
pages/modal/3202_view.vue | 13 +-
api/data.js | 21 ++++
7 files changed, 138 insertions(+), 57 deletions(-)
diff --git a/App.vue b/App.vue
index 6d5eefa..66024d6 100644
--- a/App.vue
+++ b/App.vue
@@ -1,4 +1,8 @@
<script>
+ import {
+ showModal,
+ showToast,
+ } from "@/js/Page.js"
export default {
globalData: {
largeMode: false,
@@ -20,21 +24,25 @@
bindClasses: false,
classes: ""
},
+ data() {
+ //鑾峰彇鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧�+ return {
+
+ }
+ },
onLaunch: function() {
console.log('App Launch');
+ this.deviceInfo = uni.getSystemInfoSync();
this.initscan();
},
+ onUnload() {
+
+ // // 姹夊痉闇嶅皵 PDA rfid鎵爜椤甸潰鍗歌浇鏃堕噴鏀捐祫婧�+ // const rfidModule = uni.requireNativePlugin('HandheldRFID');
+ // rfidModule.closeModule();
+ },
onShow: function() {
- // const args = plus.runtime.arguments || ""
- // if(args)
- // {
- // uni.showModal({
- // title: "App鍙傛暟",
- // content: args,
- // showCancel: false,
- // confirmText:"cancel"
- // });
- // }
+
console.log('App Show')
},
onHide: function() {
@@ -43,11 +51,20 @@
methods: {
initscan() {
let that = this;
- var main = plus.android.runtimeMainActivity(), //鑾峰彇activity
- IntentFilter = plus.android.importClass('android.content.IntentFilter'), //寮曞叆杩囨护鍣�+ console.log("deviceInfo", this.deviceInfo)
+ if (this.deviceInfo?.brand.includes('alps')) { // 姹夊痉闇嶅皵璁惧鐗瑰緛
+
+ // const rfidModule = uni.requireNativePlugin('HandheldRFID');
+ // console.log("rfidModule",rfidModule)
+ // rfidModule.initModule((res) => {
+ // console.log("rfid initModule", res)
+ // })
+ } else {
+ var main = plus.android.runtimeMainActivity() //鑾峰彇activity
+ var IntentFilter = plus.android.importClass('android.content.IntentFilter') //寮曞叆杩囨护鍣� // Intent = plus.android.importClass('android.content.Intent'),
- filter = new IntentFilter(),
- receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
+ var filter = new IntentFilter()
+ var receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
onReceive: function(context, intent) { //瀹炵幇onReceiver鍥炶皟鍑芥暟
//console.log('onReceive',intent);
plus.android.importClass(intent);
@@ -59,24 +76,48 @@
decodesource,
decodedata: decodedata || data,
decodelabeltype,
-
};
console.log('onReceive', scanResult);
uni.$emit("scanresult", scanResult);
}
});
- filter.addAction("com.pda.formobox"); //鐩戝惉鎵爜骞挎挱
- filter.addAction('com.rfid.scan') //
- main.registerReceiver(receiver, filter); //娉ㄥ唽鐩戝惉
+ filter.addAction("com.pda.formobox"); //鐩戝惉鎵爜骞挎挱
+ filter.addAction('com.rfid.scan') //
+ main.registerReceiver(receiver, filter); //娉ㄥ唽鐩戝惉
+ }
},
onScan(callback) {
console.log('onScan');
- uni.$off("scanresult");
- uni.$on("scanresult", (result) => {
- callback(result);
- });
- }
+ if (this.deviceInfo?.brand.includes('alps')) { // 姹夊痉闇嶅皵璁惧鐗瑰緛
+ // const rfidModule = uni.requireNativePlugin('HandheldRFID');
+ // rfidModule.startScan((res) => {
+ // if (res.code) {
+ // console.log(res)
+ // let data = res.data || ""
+ // if (Array.isArray(data)) {
+ // data = data.map((a) => a.epc).join(",")
+ // }
+ // var scanResult = {
+ // decodesource: "epc",
+ // decodedata: data,
+ // decodelabeltype: "",
+ // };
+ // console.log(scanResult)
+ // callback(scanResult);
+ // } else {
+ // console.log("rfid startScan", res)
+ // }
+ // })
+ } else {
+ uni.$off("scanresult");
+ uni.$on("scanresult", (result) => {
+ callback(result);
+ });
+ }
+
+ },
+
}
}
</script>
@@ -148,20 +189,23 @@
.uni-data-tree {
font-size: 24px !important;
+
.input-value {
height: 45px !important;
font-size: 24px !important;
}
+
.placeholder {
- font-size: 24px !important;
+ font-size: 24px !important;
}
}
+
.segmented-control__text {
font-size: 24px !important;
height: 45px;
-
+
}
-
+
}
</style>
\ No newline at end of file
diff --git a/api/data.js b/api/data.js
index 692c4fb..cfde8f0 100644
--- a/api/data.js
+++ b/api/data.js
@@ -4,12 +4,29 @@
} from '@/js/Base64.js';
import utils from "@/js/utils.js"
+
+/**
+ * api/wms/basisver/Get?sessionid=SESSION_ID
+ * 鏁版嵁妯″瀷鐗堟湰
+ * @returns
+ */
+export const basisver_get = () => {
+ const app = getApp()
+ var url = app.globalData.mobox3ApiUrl.data + 'api/wms/basisver/Get?sessionid=' + app.globalData.sessionId
+ return http.request({
+ method: "GET",
+ header: {},
+ url,
+ })
+}
+
+
/**
* api/class/attr/GetList
* 寰楀埌鏁版嵁绫诲睘鎬у垪琛� * @param
- {class_id, //鏁版嵁绫籭d
- class_name, //鏁版嵁绫诲悕绉�鏍规嵁id鎴栧悕绉伴兘鍙�+ {class_id, //鏁版嵁绫籭d
+ class_name, //鏁版嵁绫诲悕绉�鏍规嵁id鎴栧悕绉伴兘鍙� group_name} //鍒嗙粍鍚嶇О锛屽鏋滄湭鎸囧畾锛屽垯杩斿洖鎵�湁鍒嗙粍灞炴�
* @returns
*/
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index f5ffc6b..189d64b 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -1551,10 +1551,11 @@
return;
}
var styleStr = JSON.stringify($this.detail1_styledef);
- var detailStyle = JSON.parse(styleStr);
- if (detailStyle.form) {
- data.content.forEach(cont => {
- detailStyle = JSON.parse(styleStr);
+ data.content.forEach(cont => {
+ let detailStyle = JSON.parse(styleStr);
+ if (detailStyle.form) {
+
+
detailStyle.SelBut_Checked = data.checkbox ?? true;
detailStyle.form.objId = cont.id;
@@ -1611,8 +1612,8 @@
} else {
$this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷� }
- });
- }
+ }
+ });
},
diff --git a/pages/modal/3202.vue b/pages/modal/3202.vue
index 6917850..ee5792e 100644
--- a/pages/modal/3202.vue
+++ b/pages/modal/3202.vue
@@ -921,9 +921,10 @@
}
var styleStr = JSON.stringify($this.detail1_styledef);
var detailStyle = JSON.parse(styleStr);
- if (detailStyle.form) {
- data.content.forEach(cont => {
- detailStyle = JSON.parse(styleStr);
+
+ data.content.forEach(cont => {
+ var detailStyle = JSON.parse(styleStr);
+ if (detailStyle.form) {
detailStyle.SelBut_Checked = data.checkbox ?? true;
detailStyle.form.objId = cont.id;
@@ -980,8 +981,9 @@
} else {
$this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷� }
- });
- }
+ }
+ });
+
},
//鐐逛腑琛ㄥ崟
diff --git a/pages/modal/3202_view.vue b/pages/modal/3202_view.vue
index 0ab4c7e..f2a9904 100644
--- a/pages/modal/3202_view.vue
+++ b/pages/modal/3202_view.vue
@@ -55,7 +55,7 @@
},
data() {
return {
- largeMode: getApp().globalData.largeMode || false,
+ largeMode: getApp().globalData.largeMode || false,
title: this.translateSys('add2'),
param: {},
styledef: {},
@@ -322,9 +322,10 @@
return;
}
let styleStr = JSON.stringify(this.detail1_styledef); //宸茬爜鐩�- let detailStyle = JSON.parse(styleStr);
+
list.forEach((cont) => {
let attrs = [];
+ let detailStyle = JSON.parse(styleStr);
Object.keys(cont).forEach((a) => {
attrs.push({
attr: a,
@@ -403,7 +404,7 @@
async runCustomEvent(dataInfo) {
try {
var $this = this;
-
+
runCustomEvent(dataInfo).then(result => {
console.log(result);
@@ -548,7 +549,7 @@
})
},
onButtonClicked(btn) {
-
+
let enviroment = {
button: "top",
button_name: btn.ShowName,
@@ -561,12 +562,12 @@
} else {
this.$Message.warning(this.$t("sys.unrealized"));
}
-
+
},
async onTriggerEvent(btn, enviroment) {
let data_json = [];
let jsonlist = [];
-
+
let detailStyleList = this.detail1StyleDefList;
detailStyleList.forEach((style) => {
let detail_attr = {};
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 85050d8..6eeecee 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -132,7 +132,7 @@
</div>
<div class="dv-panel-button">
<checkbox v-if="param.Sub_Page[1].Select_Button==true" :value="ii"
- :checked="style.SelBut_Checked" />
+ :checked="style.SelBut_Checked" />
<!-- <text></text> -->
<!-- <button type="primary" @click="savaDataObj(style,ii)" v-if="param.Sub_Page[1].OK_Button==true">淇濆瓨</Button> -->
@@ -194,12 +194,13 @@
<script>
import {
Base64
- } from '@/js/Base64.js';
+ } from '@/js/Base64.js';
import {
appGetInfo,
dictGetInfo
} from "@/api/mobox.js"
import {
+ basisver_get,
getUIStyleInfo,
runCustomEvent,
dataObjCreate,
@@ -209,7 +210,7 @@
export default {
data() {
return {
- largeMode: getApp().globalData.largeMode || false,
+ largeMode: getApp().globalData.largeMode || false,
title: this.translateSys("coding_disk"),
ClsID: 'CG_Detail',
param: {},
@@ -279,7 +280,22 @@
});
});
},
+ async getBasisVer() {
+ try {
+ const res = await basisver_get();
+ const basisver = (res.ver || "").toLowerCase();
+ return basisver;
+ } catch (ex) {
+ return "";
+ }
+ },
async loadData(paramValue) {
+ let clsDetailId = "CG_Detail";
+ const basisver = await this.getBasisVer();
+ if (basisver >= "v16.5") {
+ clsDetailId = "INV_Detail";
+ }
+ this.ClsID = clsDetailId;
//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID);
//浼犲叆鍙傛暟鍊�@@ -1867,8 +1883,8 @@
}
console.log($this.head_styledef);
if (data.result) {
- $this.setFormValues( data.result)
- }
+ $this.setFormValues(data.result)
+ }
}
}).catch(ex => {
@@ -1903,7 +1919,7 @@
attr: a,
value: obj_attr[a] || "",
}));
-
+
var extinfo = enviroment;
extinfo.edit_dlg = {
type: 'small', //灏忕獥鍙�diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 7a5a586..2d83d01 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -1446,10 +1446,10 @@
return;
}
var styleStr = JSON.stringify(pageData.StyleDef);
- var detailStyle = JSON.parse(styleStr);
- if (detailStyle.form) {
- data.content.forEach(cont => {
- detailStyle = JSON.parse(styleStr);
+
+ data.content.forEach(cont => {
+ var detailStyle = JSON.parse(styleStr);
+ if (detailStyle.form) {
detailStyle.SelBut_Checked = data.checkbox ?? true;
detailStyle.form.objId = cont.id;
@@ -1508,9 +1508,9 @@
}
// $this.setData({pageDetail:pageD})
$this.$set(this.pageDetail, pageIndex, pageData)
+ }
+ });
- });
- }
$this.$set(this.pageDetail, pageIndex, pageData)
},
setFormValues(attrs) {
--
Gitblit v1.9.1