ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
hehaibing-1996
2025-02-27 18:40:50 +08:00
parent 8525529a7f
commit 6d9386a079
4 changed files with 109 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PDA/PDA/pages/bind/bind.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="bg-image"> <view class="bg-image">
<bindSelectMat ref="proup" @close="handlePopupClose" @selected="bindSelectedMat" /> <bindSelectMat type="dialog" ref="proup" @close="handlePopupClose" @selected="bindSelectedMat" />
<view class="diy-flex-row"> <view class="diy-flex-row">
<view style="flex: 3"> <view style="flex: 3">
@ -14,7 +14,7 @@
<view class="uni-input-wrapper" style="flex: 60;"> <view class="uni-input-wrapper" style="flex: 60;">
<input id="inputMatCode" class="uni-input" style="font-size: 50rpx; padding: 10rpx;" <input id="inputMatCode" class="uni-input" style="font-size: 50rpx; padding: 10rpx;"
:placeholder="placeholderText" v-model="matCodeCondition" @blur="queryMatList"></input> :placeholder="placeholderText" v-model="matCodeCondition" ></input>
</view> </view>
<view style="flex: 3;"> <view style="flex: 3;">
@ -136,6 +136,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
@ -435,6 +436,7 @@
} else { } else {
this.clearMatInfo(); this.clearMatInfo();
saveConfig('matCodeCondition', this.matCodeCondition); saveConfig('matCodeCondition', this.matCodeCondition);
this.$refs.proup.show(); this.$refs.proup.show();
} }
}, },

72
PDA/PDA/pages/bindSelectMat/bindSelectMat.vue
View File

@ -1,17 +1,17 @@
<template> <template>
<view class="popup-container" v-if="visible"> <view class="popup-container" v-if="visible">
<view class="popup-content"> <view class="popup-content">
<scroll-view class="scroll-view" scroll-y="true"> <scroll-view :scroll-top="scrollTop" direction="vertical" class="scroll-Y" scroll-with-animation="true"
<!-- <uni-list-item v-for="(item, index) in matBaseInfoList" :key="index" :title="item.matCode" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" @scrollend="end"
:note="item.matName" :rightText="item.matSpec" @click="onItemClick(item)"></uni-list-item> :show-scrollbar="showScrollbar">
--> <view v-for="(item, index) in matBaseInfoList" :key="index" class="list-item"
<view v-for="(item, index) in matBaseInfoList" :key="index" class="list-item" @click="onItemClick(item)"> @click="onItemClick(item)">
{{ item.matCode }} - {{ item.matName }} - {{ item.matSpec }} {{ item.matCode }} - {{ item.matName }}
</view> </view>
</scroll-view> </scroll-view>
<button style="background-color: darkred;color: white;" @click="handleClose">关&nbsp;&nbsp;&nbsp;&nbsp;闭</button>
<button @click="handleClose">关闭</button>
</view> </view>
</view> </view>
</template> </template>
@ -35,14 +35,19 @@
matCodeCondition: '', matCodeCondition: '',
userName: '', userName: '',
matBaseInfoList: [], // 用于存储物料数据的数组 matBaseInfoList: [], // 用于存储物料数据的数组
scrollTop: 0,
showScrollbar: true
}; };
}, },
methods: { methods: {
show() { show() {
this.visible = true; this.visible = true;
this.matCodeCondition = getConfig('matCodeCondition', ''); this.matCodeCondition = getConfig('matCodeCondition', '');
console.log('scroll - view height:', this.matCodeCondition);
this.userName = getConfig('userName', ''); this.userName = getConfig('userName', '');
var serverIPAndPort = getServerIPAndPort(); var serverIPAndPort = getServerIPAndPort();
//获取列表 //获取列表
uni.request({ uni.request({
url: 'http://' + serverIPAndPort + '/matBaseInfo/getMatBaseInfo', // 请求的接口地址 url: 'http://' + serverIPAndPort + '/matBaseInfo/getMatBaseInfo', // 请求的接口地址
@ -67,24 +72,25 @@
if (res.data.code == 200) { if (res.data.code == 200) {
if (res.data.data.lists != null && res.data.data.lists.length > 0) { if (res.data.data.lists != null && res.data.data.lists.length > 0) {
this.matBaseInfoList = res.data.data.lists; this.matBaseInfoList = res.data.data.lists;
console.log('matBaseInfoList:', this.matBaseInfoList);
} else { } else {
this.visible = false; this.visible = false;
this.matBaseInfoList = null;
uni.showToast({ uni.showToast({
title: '根据查询条件未查询到物料!', title: '根据查询条件未查询到物料!',
icon: 'none', icon: 'none',
duration: 1500 duration: 2000
}); });
} }
} else { } else {
this.visible = false; this.visible = false;
this.matBaseInfoList = null;
uni.showToast({ uni.showToast({
title: '查询物料失败:' + res.data.message, title: '查询物料失败:' + res.data.message,
icon: 'none', icon: 'none',
duration: 1500 duration: 2000
}); });
} }
} else { } else {
uni.showToast({ uni.showToast({
title: '查询物料失败:服务器返回错误状态码' + res.statusCode, title: '查询物料失败:服务器返回错误状态码' + res.statusCode,
@ -106,7 +112,6 @@
console.log('请求完成', event); console.log('请求完成', event);
} }
}); });
}, },
handleClose() { handleClose() {
this.visible = false; this.visible = false;
@ -114,7 +119,19 @@
}, },
onItemClick(item) { onItemClick(item) {
this.visible = false; this.visible = false;
this.$emit('selected',item); this.$emit('selected', item);
},
upper() {
console.log('scrolltoupper');
},
lower() {
console.log('scrolltolower');
},
scroll() {
console.log('scroll');
},
end() {
console.log('scrollend');
} }
} }
}; };
@ -122,14 +139,16 @@
<style scoped> <style scoped>
.list-item { .list-item {
padding: 10px; padding: 10px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
font-size: 35rpx;
} }
.popup-container { .popup-container {
width: 100%; width: 100%;
height: 100%; max-height: calc(100vh - 300rpx);
z-index: 1; z-index: 2;
overflow: auto;
} }
.popup-content { .popup-content {
@ -138,16 +157,17 @@
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
/* 使用transform来居中 */
width: 650rpx; width: 650rpx;
max-height: 750rpx; max-height: calc(100vh - 300rpx);
background-color: rgba(0, 0, 0, 1);
background-color: white; background-color: white;
z-index: 2; z-index: 2;
overflow: auto;
} }
.scroll-view { .scroll-Y {
max-width: 700rpx; border-radius: 5rpx;
/* 设置滚动区域的高度 */ height: calc(100vh - 600rpx);
z-index: 4;
overflow: auto;
} }
</style> </style>

87
PDA/PDA/unpackage/dist/dev/app-plus/app-service.js vendored
View File

@ -581,14 +581,17 @@ if (uni.restoreGlobal) {
visible: false, visible: false,
matCodeCondition: "", matCodeCondition: "",
userName: "", userName: "",
matBaseInfoList: [] matBaseInfoList: [],
// 用于存储物料数据的数组 // 用于存储物料数据的数组
scrollTop: 0,
showScrollbar: true
}; };
}, },
methods: { methods: {
show() { show() {
this.visible = true; this.visible = true;
this.matCodeCondition = getConfig("matCodeCondition", ""); this.matCodeCondition = getConfig("matCodeCondition", "");
formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:46", "scroll - view height:", this.matCodeCondition);
this.userName = getConfig("userName", ""); this.userName = getConfig("userName", "");
var serverIPAndPort = getServerIPAndPort(); var serverIPAndPort = getServerIPAndPort();
uni.request({ uni.request({
@ -615,20 +618,23 @@ if (uni.restoreGlobal) {
if (res.data.code == 200) { if (res.data.code == 200) {
if (res.data.data.lists != null && res.data.data.lists.length > 0) { if (res.data.data.lists != null && res.data.data.lists.length > 0) {
this.matBaseInfoList = res.data.data.lists; this.matBaseInfoList = res.data.data.lists;
formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:75", "matBaseInfoList:", this.matBaseInfoList);
} else { } else {
this.visible = false; this.visible = false;
this.matBaseInfoList = null;
uni.showToast({ uni.showToast({
title: "根据查询条件未查询到物料!", title: "根据查询条件未查询到物料!",
icon: "none", icon: "none",
duration: 1500 duration: 2e3
}); });
} }
} else { } else {
this.visible = false; this.visible = false;
this.matBaseInfoList = null;
uni.showToast({ uni.showToast({
title: "查询物料失败:" + res.data.message, title: "查询物料失败:" + res.data.message,
icon: "none", icon: "none",
duration: 1500 duration: 2e3
}); });
} }
} else { } else {
@ -647,7 +653,7 @@ if (uni.restoreGlobal) {
}); });
}, },
complete: (event) => { complete: (event) => {
formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:106", "请求完成", event); formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:112", "请求完成", event);
} }
}); });
}, },
@ -658,6 +664,18 @@ if (uni.restoreGlobal) {
onItemClick(item) { onItemClick(item) {
this.visible = false; this.visible = false;
this.$emit("selected", item); this.$emit("selected", item);
},
upper() {
formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:125", "scrolltoupper");
},
lower() {
formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:128", "scrolltolower");
},
scroll() {
formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:131", "scroll");
},
end() {
formatAppLog("log", "at pages/bindSelectMat/bindSelectMat.vue:134", "scrollend");
} }
} }
}; };
@ -668,10 +686,16 @@ if (uni.restoreGlobal) {
}, [ }, [
vue.createElementVNode("view", { class: "popup-content" }, [ vue.createElementVNode("view", { class: "popup-content" }, [
vue.createElementVNode("scroll-view", { vue.createElementVNode("scroll-view", {
class: "scroll-view", "scroll-top": $data.scrollTop,
"scroll-y": "true" direction: "vertical",
class: "scroll-Y",
"scroll-with-animation": "true",
onScrolltoupper: _cache[0] || (_cache[0] = (...args) => $options.upper && $options.upper(...args)),
onScrolltolower: _cache[1] || (_cache[1] = (...args) => $options.lower && $options.lower(...args)),
onScroll: _cache[2] || (_cache[2] = (...args) => $options.scroll && $options.scroll(...args)),
onScrollend: _cache[3] || (_cache[3] = (...args) => $options.end && $options.end(...args)),
"show-scrollbar": $data.showScrollbar
}, [ }, [
vue.createCommentVNode(' <uni-list-item v-for="(item, index) in matBaseInfoList" :key="index" :title="item.matCode"\r\n :note="item.matName" :rightText="item.matSpec" @click="onItemClick(item)"></uni-list-item>\r\n '),
(vue.openBlock(true), vue.createElementBlock( (vue.openBlock(true), vue.createElementBlock(
vue.Fragment, vue.Fragment,
null, null,
@ -680,15 +704,16 @@ if (uni.restoreGlobal) {
key: index, key: index,
class: "list-item", class: "list-item",
onClick: ($event) => $options.onItemClick(item) onClick: ($event) => $options.onItemClick(item)
}, vue.toDisplayString(item.matCode) + " - " + vue.toDisplayString(item.matName) + " - " + vue.toDisplayString(item.matSpec), 9, ["onClick"]); }, vue.toDisplayString(item.matCode) + " - " + vue.toDisplayString(item.matName), 9, ["onClick"]);
}), }),
128 128
/* KEYED_FRAGMENT */ /* KEYED_FRAGMENT */
)) ))
]), ], 40, ["scroll-top", "show-scrollbar"]),
vue.createElementVNode("button", { vue.createElementVNode("button", {
onClick: _cache[0] || (_cache[0] = (...args) => $options.handleClose && $options.handleClose(...args)) style: { "background-color": "darkred", "color": "white" },
}, "关闭") onClick: _cache[4] || (_cache[4] = (...args) => $options.handleClose && $options.handleClose(...args))
}, "关    闭")
]) ])
])) : vue.createCommentVNode("v-if", true); ])) : vue.createCommentVNode("v-if", true);
} }
@ -738,10 +763,10 @@ if (uni.restoreGlobal) {
this.userName = getConfig("userName", "admin"); this.userName = getConfig("userName", "admin");
const self = this; const self = this;
recive(function(res) { recive(function(res) {
formatAppLog("log", "at pages/bind/bind.vue:210", "Success:" + res.data); formatAppLog("log", "at pages/bind/bind.vue:211", "Success:" + res.data);
self.analysisScanCode(res.data); self.analysisScanCode(res.data);
}, function(err) { }, function(err) {
formatAppLog("log", "at pages/bind/bind.vue:213", "Error:", JSON.stringify(err)); formatAppLog("log", "at pages/bind/bind.vue:214", "Error:", JSON.stringify(err));
}); });
}, },
methods: { methods: {
@ -749,11 +774,11 @@ if (uni.restoreGlobal) {
cameraScanCode() { cameraScanCode() {
uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
formatAppLog("log", "at pages/bind/bind.vue:221", "扫码结果:", res.result); formatAppLog("log", "at pages/bind/bind.vue:222", "扫码结果:", res.result);
this.analysisScanCode(res.result); this.analysisScanCode(res.result);
}, },
fail: (err) => { fail: (err) => {
formatAppLog("error", "at pages/bind/bind.vue:225", "扫码失败:", err); formatAppLog("error", "at pages/bind/bind.vue:226", "扫码失败:", err);
} }
}); });
}, },
@ -845,12 +870,12 @@ if (uni.restoreGlobal) {
} }
}, },
complete: (event) => { complete: (event) => {
formatAppLog("log", "at pages/bind/bind.vue:329", "请求完成", event); formatAppLog("log", "at pages/bind/bind.vue:330", "请求完成", event);
} }
}); });
}, },
bindSelectedMat: function(item) { bindSelectedMat: function(item) {
formatAppLog("log", "at pages/bind/bind.vue:335", "用户选择了项目:", item); formatAppLog("log", "at pages/bind/bind.vue:336", "用户选择了项目:", item);
this.matCode = item.matCode; this.matCode = item.matCode;
this.matName = item.matName; this.matName = item.matName;
this.matSpec = item.matSpec; this.matSpec = item.matSpec;
@ -914,7 +939,7 @@ if (uni.restoreGlobal) {
}); });
}, },
complete: (event) => { complete: (event) => {
formatAppLog("log", "at pages/bind/bind.vue:403", "请求完成", event); formatAppLog("log", "at pages/bind/bind.vue:404", "请求完成", event);
} }
}); });
}, },
@ -1019,7 +1044,7 @@ if (uni.restoreGlobal) {
}); });
}, },
complete: (event) => { complete: (event) => {
formatAppLog("log", "at pages/bind/bind.vue:516", "请求完成", event); formatAppLog("log", "at pages/bind/bind.vue:518", "请求完成", event);
} }
}); });
}, },
@ -1110,7 +1135,7 @@ if (uni.restoreGlobal) {
}); });
}, },
complete: (event) => { complete: (event) => {
formatAppLog("log", "at pages/bind/bind.vue:618", "请求完成", event); formatAppLog("log", "at pages/bind/bind.vue:620", "请求完成", event);
} }
}); });
}, },
@ -1136,7 +1161,7 @@ if (uni.restoreGlobal) {
this.matSpec = ""; this.matSpec = "";
}, },
handlePopupClose() { handlePopupClose() {
formatAppLog("log", "at pages/bind/bind.vue:648", "弹出层已关闭"); formatAppLog("log", "at pages/bind/bind.vue:650", "弹出层已关闭");
} }
} }
}; };
@ -1144,6 +1169,7 @@ if (uni.restoreGlobal) {
const _component_bindSelectMat = vue.resolveComponent("bindSelectMat"); const _component_bindSelectMat = vue.resolveComponent("bindSelectMat");
return vue.openBlock(), vue.createElementBlock("view", { class: "bg-image" }, [ return vue.openBlock(), vue.createElementBlock("view", { class: "bg-image" }, [
vue.createVNode(_component_bindSelectMat, { vue.createVNode(_component_bindSelectMat, {
type: "dialog",
ref: "proup", ref: "proup",
onClose: $options.handlePopupClose, onClose: $options.handlePopupClose,
onSelected: $options.bindSelectedMat onSelected: $options.bindSelectedMat
@ -1173,16 +1199,15 @@ if (uni.restoreGlobal) {
class: "uni-input", class: "uni-input",
style: { "font-size": "50rpx", "padding": "10rpx" }, style: { "font-size": "50rpx", "padding": "10rpx" },
placeholder: $data.placeholderText, placeholder: $data.placeholderText,
"onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => $data.matCodeCondition = $event), "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => $data.matCodeCondition = $event)
onBlur: _cache[2] || (_cache[2] = (...args) => $options.queryMatList && $options.queryMatList(...args)) }, null, 8, ["placeholder"]), [
}, null, 40, ["placeholder"]), [
[vue.vModelText, $data.matCodeCondition] [vue.vModelText, $data.matCodeCondition]
]) ])
]), ]),
vue.createElementVNode("view", { style: { "flex": "3" } }), vue.createElementVNode("view", { style: { "flex": "3" } }),
vue.createElementVNode("view", { style: { "flex": "30" } }, [ vue.createElementVNode("view", { style: { "flex": "30" } }, [
vue.createElementVNode("button", { vue.createElementVNode("button", {
onClick: _cache[3] || (_cache[3] = (...args) => $options.queryMatList && $options.queryMatList(...args)) onClick: _cache[2] || (_cache[2] = (...args) => $options.queryMatList && $options.queryMatList(...args))
}, "查询") }, "查询")
]) ])
]) ])
@ -1207,7 +1232,7 @@ if (uni.restoreGlobal) {
}, [ }, [
vue.createElementVNode("picker", { vue.createElementVNode("picker", {
range: $data.shelfTypeOptions, range: $data.shelfTypeOptions,
onChange: _cache[4] || (_cache[4] = (...args) => $options.shelfTypeOptionChange && $options.shelfTypeOptionChange(...args)), onChange: _cache[3] || (_cache[3] = (...args) => $options.shelfTypeOptionChange && $options.shelfTypeOptionChange(...args)),
"range-key": "shelfTypeName", "range-key": "shelfTypeName",
value: $data.selectedShelfTypeIndex, value: $data.selectedShelfTypeIndex,
style: { "font-size": "35rpx" } style: { "font-size": "35rpx" }
@ -1230,7 +1255,7 @@ if (uni.restoreGlobal) {
class: "mini-btn", class: "mini-btn",
type: "warn", type: "warn",
size: "mini", size: "mini",
onClick: _cache[5] || (_cache[5] = (...args) => $options.callEmptyShelf && $options.callEmptyShelf(...args)) onClick: _cache[4] || (_cache[4] = (...args) => $options.callEmptyShelf && $options.callEmptyShelf(...args))
}, "呼叫货架") }, "呼叫货架")
]) ])
]), ]),
@ -1321,7 +1346,7 @@ if (uni.restoreGlobal) {
class: "uni-input", class: "uni-input",
style: { "font-size": "40rpx" }, style: { "font-size": "40rpx" },
placeholder: "请输入物料数量", placeholder: "请输入物料数量",
"onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => $data.matQty = $event) "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => $data.matQty = $event)
}, },
null, null,
512 512
@ -1332,7 +1357,7 @@ if (uni.restoreGlobal) {
]), ]),
vue.createElementVNode("view", { style: { "flex": "40" } }, [ vue.createElementVNode("view", { style: { "flex": "40" } }, [
vue.createElementVNode("button", { vue.createElementVNode("button", {
onClick: _cache[7] || (_cache[7] = (...args) => $options.bind && $options.bind(...args)), onClick: _cache[6] || (_cache[6] = (...args) => $options.bind && $options.bind(...args)),
class: "mini-btn", class: "mini-btn",
style: { "margin-left": "10rpx" }, style: { "margin-left": "10rpx" },
type: "warn", type: "warn",
@ -1349,7 +1374,7 @@ if (uni.restoreGlobal) {
range: $data.shelfAreaOptions, range: $data.shelfAreaOptions,
"range-key": "locationAreaName", "range-key": "locationAreaName",
value: $data.selectedShelfAreaIndex, value: $data.selectedShelfAreaIndex,
onChange: _cache[8] || (_cache[8] = (...args) => $options.onShelfAreaChange && $options.onShelfAreaChange(...args)), onChange: _cache[7] || (_cache[7] = (...args) => $options.onShelfAreaChange && $options.onShelfAreaChange(...args)),
style: { "font-size": "35rpx" } style: { "font-size": "35rpx" }
}, [ }, [
vue.createElementVNode( vue.createElementVNode(
@ -1364,7 +1389,7 @@ if (uni.restoreGlobal) {
vue.createElementVNode("button", { vue.createElementVNode("button", {
style: { "font-size": "40rpx", "margin": "15rpx", "background-color": "green" }, style: { "font-size": "40rpx", "margin": "15rpx", "background-color": "green" },
size: "mini", size: "mini",
onClick: _cache[9] || (_cache[9] = (...args) => $options.sendShelfBack && $options.sendShelfBack(...args)) onClick: _cache[8] || (_cache[8] = (...args) => $options.sendShelfBack && $options.sendShelfBack(...args))
}, "送货架") }, "送货架")
]) ])
]) ])

4
PDA/PDA/unpackage/dist/dev/app-plus/manifest.json vendored
View File

@ -94,7 +94,9 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ]
}, },
"apple": {}, "apple": {
"dSYMs": false
},
"plugins": { "plugins": {
"audio": { "audio": {
"mp3": { "mp3": {