From 0b6999151fd5840eb17af7126f7275608b9db2fe Mon Sep 17 00:00:00 2001
From: wangsiyang <524156191@qq.com>
Date: Fri, 5 Sep 2025 15:22:43 +0800
Subject: [PATCH] =?UTF-8?q?rrsUI=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/bottomBtn/bottomBtn.vue | 242 +++++++++++
components/colorui/components/cu-custom.vue | 6 +-
components/colorui/main.css | 8 +-
package-lock.json | 6 +
pages.json | 10 +-
pages/index.vue | 10 +-
pages/login.vue | 60 ++-
pages/register.vue | 22 +-
pages/work/index.vue | 282 ++++++++++---
pages/work/wms/clearEmptyLoc.vue | 98 ++++-
pages/work/wms/emptyPalletOut.vue | 224 +++++++----
pages/work/wms/manualCall.vue | 164 ++++++--
pages/work/wms/palletInfoQuery.vue | 96 ++++-
pages/work/wms/returnEmptyRack.vue | 32 +-
pages/work/wms/skuCreatePallet.vue | 423 ++++++++++++--------
pages/work/wms/skuCreatePalletByCode.vue | 261 ++++++++----
pages/work/wms/surplusOut.vue | 159 ++++++--
pages/work/wms/surplusReturn.vue | 125 +++++-
static/images/loginBg.jpg | Bin 0 -> 696451 bytes
static/images/loginBg.png | Bin 0 -> 700473 bytes
static/images/pass.png | Bin 0 -> 638 bytes
static/images/right.png | Bin 0 -> 263 bytes
static/images/tabbar/home.png | Bin 3265 -> 634 bytes
static/images/tabbar/homeS.png | Bin 0 -> 532 bytes
static/images/tabbar/home_.png | Bin 3229 -> 0 bytes
static/images/tabbar/mine.png | Bin 4235 -> 561 bytes
static/images/tabbar/mineS.png | Bin 0 -> 625 bytes
static/images/tabbar/mine_.png | Bin 4219 -> 0 bytes
static/images/tabbar/work.png | Bin 4108 -> 665 bytes
static/images/tabbar/workS.png | Bin 0 -> 547 bytes
static/images/tabbar/work_.png | Bin 5008 -> 0 bytes
static/images/user.png | Bin 0 -> 685 bytes
static/images/work/组合 1747.png | Bin 0 -> 1998 bytes
static/images/work/组合 1749.png | Bin 0 -> 2216 bytes
static/images/work/组合 1752.png | Bin 0 -> 2261 bytes
static/images/work/组合 1753.png | Bin 0 -> 3134 bytes
static/images/work/组合 1756.png | Bin 0 -> 2069 bytes
static/images/work/组合 1758.png | Bin 0 -> 2061 bytes
static/images/work/组合 1759.png | Bin 0 -> 2261 bytes
static/images/work/组合 1762.png | Bin 0 -> 2300 bytes
static/images/work/组合 1763.png | Bin 0 -> 2134 bytes
static/images/work/组合 1764.png | Bin 0 -> 2191 bytes
static/json/dynamicRouter.json | 18 +-
static/scss/colorui.css | 6 +-
44 files changed, 1707 insertions(+), 545 deletions(-)
create mode 100644 components/bottomBtn/bottomBtn.vue
create mode 100644 package-lock.json
create mode 100644 static/images/loginBg.jpg
create mode 100644 static/images/loginBg.png
create mode 100644 static/images/pass.png
create mode 100644 static/images/right.png
create mode 100644 static/images/tabbar/homeS.png
delete mode 100644 static/images/tabbar/home_.png
create mode 100644 static/images/tabbar/mineS.png
delete mode 100644 static/images/tabbar/mine_.png
create mode 100644 static/images/tabbar/workS.png
delete mode 100644 static/images/tabbar/work_.png
create mode 100644 static/images/user.png
create mode 100644 static/images/work/组合 1747.png
create mode 100644 static/images/work/组合 1749.png
create mode 100644 static/images/work/组合 1752.png
create mode 100644 static/images/work/组合 1753.png
create mode 100644 static/images/work/组合 1756.png
create mode 100644 static/images/work/组合 1758.png
create mode 100644 static/images/work/组合 1759.png
create mode 100644 static/images/work/组合 1762.png
create mode 100644 static/images/work/组合 1763.png
create mode 100644 static/images/work/组合 1764.png
diff --git a/components/bottomBtn/bottomBtn.vue b/components/bottomBtn/bottomBtn.vue
new file mode 100644
index 0000000..fa63fc9
--- /dev/null
+++ b/components/bottomBtn/bottomBtn.vue
@@ -0,0 +1,242 @@
+
+
+
+
+
+ {{ texts[0] }}
+ {{ texts[1] }}
+ {{ texts[2] }}
+
+
+
+
+ {{ texts[0] }}
+ {{ texts[1] }}
+
+
+
+
+ {{ texts[0] }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/colorui/components/cu-custom.vue b/components/colorui/components/cu-custom.vue
index b09f70d..a87886f 100644
--- a/components/colorui/components/cu-custom.vue
+++ b/components/colorui/components/cu-custom.vue
@@ -1,7 +1,7 @@
-
+
@@ -61,5 +61,7 @@
diff --git a/components/colorui/main.css b/components/colorui/main.css
index fade3b2..7e34636 100644
--- a/components/colorui/main.css
+++ b/components/colorui/main.css
@@ -11,7 +11,7 @@
初始化
==================== */
body {
- background-color: #f1f1f1;
+ background-color: #fff;
font-size: 28upx;
color: #333333;
font-family: Helvetica Neue, Helvetica, sans-serif;
@@ -180,7 +180,7 @@ switch .uni-switch-input {
switch .wx-switch-input:not([class*="bg-"]),
switch .uni-switch-input:not([class*="bg-"]) {
- background: #8799a3 !important;
+ background: #165DFF !important;
}
switch .wx-switch-input::after,
@@ -1071,7 +1071,7 @@ button.cuIcon.lg {
flex-direction: column;
justify-content: center;
font-size: 28upx;
- z-index: 9999;
+ z-index: 99;
line-height: 2.4em;
}
@@ -1885,7 +1885,7 @@ button.cuIcon.lg {
padding-right: 150upx;
/* #endif */
box-shadow: 0upx 0upx 0upx;
- z-index: 9999;
+ z-index: 99;
}
.cu-custom .cu-bar .border-custom {
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..e230349
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "pda_uniapp",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
diff --git a/pages.json b/pages.json
index 3952cc5..fa9d451 100644
--- a/pages.json
+++ b/pages.json
@@ -199,24 +199,24 @@
}
],
"tabBar": {
- "color": "#000000",
- "selectedColor": "#000000",
+ "selectedColor":"#165DFF",
+ "color":"#4E5969",
"borderStyle": "white",
"backgroundColor": "#ffffff",
"list": [{
"pagePath": "pages/index",
"iconPath": "static/images/tabbar/home.png",
- "selectedIconPath": "static/images/tabbar/home_.png",
+ "selectedIconPath": "static/images/tabbar/homeS.png",
"text": "首页"
}, {
"pagePath": "pages/work/index",
"iconPath": "static/images/tabbar/work.png",
- "selectedIconPath": "static/images/tabbar/work_.png",
+ "selectedIconPath": "static/images/tabbar/workS.png",
"text": "工作台"
}, {
"pagePath": "pages/mine/index",
"iconPath": "static/images/tabbar/mine.png",
- "selectedIconPath": "static/images/tabbar/mine_.png",
+ "selectedIconPath": "static/images/tabbar/mineS.png",
"text": "我的"
}]
},
diff --git a/pages/index.vue b/pages/index.vue
index a7e2680..d66747d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -126,6 +126,12 @@
\ No newline at end of file
diff --git a/pages/work/wms/manualCall.vue b/pages/work/wms/manualCall.vue
index ae5971b..11d5e3b 100644
--- a/pages/work/wms/manualCall.vue
+++ b/pages/work/wms/manualCall.vue
@@ -1,42 +1,59 @@
-
- 返回
+
+
人工叫料
-
-
-
-
-
-
-
-
-
-
-
- {{ item.text }}
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
@@ -74,6 +91,9 @@
import {
formatDate
} from 'tough-cookie';
+ import {
+ bottomBtn
+ } from '@/components/bottomBtn/bottomBtn.vue'
export default {
data() {
return {
@@ -86,7 +106,7 @@
isButtonDisabled: false,
autoCall: true,
skuInfo: "",
- countQty:"",
+ countQty: "",
callStatus: "已开启自动呼叫空容器",
//表单中的数据信息
formData: {
@@ -225,7 +245,9 @@
onReady() {
this.$refs.form.setRules(this.rules)
},
-
+ component: {
+ bottomBtn
+ },
watch: {
async skuType(newVal) {
@@ -239,7 +261,7 @@
this.filteredSkuList = data.map(item => ({
value: item.skuCode,
text: `${item.skuCode} - ${item.skuName}`,
- qtyDesc:`托数:${item.ext1} 总数量:${item.ext2}`
+ qtyDesc: `托数:${item.ext1} 总数量:${item.ext2}`
}));
}
},
@@ -252,7 +274,7 @@
.map(item => ({
value: item.skuCode,
text: `${item.skuCode} - ${item.skuName}`,
- qtyDesc:`托数:${item.ext1} 总数量:${item.ext2}`
+ qtyDesc: `托数:${item.ext1} 总数量:${item.ext2}`
}));
this.showSkuDropdown = true;
},
@@ -298,10 +320,10 @@
this.skuTypeList = await getSkuTypes();
console.log("this.skutypeList", this.skuTypeList)
},
- changeSkuType(){
- this.skuInput='';
- this.skuInfo='';
- this.countQty='';
+ changeSkuType() {
+ this.skuInput = '';
+ this.skuInfo = '';
+ this.countQty = '';
},
//获取物料列表
// async getSkus() {
@@ -501,6 +523,83 @@
\ No newline at end of file
diff --git a/pages/work/wms/skuCreatePalletByCode.vue b/pages/work/wms/skuCreatePalletByCode.vue
index 2361427..094ccfb 100644
--- a/pages/work/wms/skuCreatePalletByCode.vue
+++ b/pages/work/wms/skuCreatePalletByCode.vue
@@ -1,41 +1,60 @@
-
- 返回
+
+
一码通组盘 AGV入库
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
-
-
+
+
- {{callStatus}}
-
-
-
-
-
-
+ {{callStatus}}
+
+
+
+
@@ -55,10 +74,12 @@
-
\ No newline at end of file
diff --git a/pages/work/wms/surplusOut.vue b/pages/work/wms/surplusOut.vue
index 5c90cb8..caa5fd3 100644
--- a/pages/work/wms/surplusOut.vue
+++ b/pages/work/wms/surplusOut.vue
@@ -1,43 +1,60 @@
-
- 返回
+
+
余料出库
注意:余料出库后请人工拉走,系统会自动清除托盘信息
-
+
-
-
-
-
-
-
-
-
-
-
- {{ item.text }}
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
-
+
+
+
+
-
-
+
+
+
@@ -76,6 +93,9 @@
import {
formatDate
} from 'tough-cookie';
+ import {
+ bottomBtn
+ } from '@/components/bottomBtn/bottomBtn.vue'
export default {
data() {
return {
@@ -88,7 +108,7 @@
isButtonDisabled: false,
autoCall: true,
skuInfo: "",
- countQty:"",
+ countQty: "",
callStatus: "已开启自动呼叫空容器",
//表单中的数据信息
formData: {
@@ -202,6 +222,9 @@
msg: null
};
},
+ component: {
+ bottomBtn
+ },
onLoad() {
//加载物料下拉值列表
this.getSkuTypes()
@@ -241,7 +264,7 @@
this.filteredSkuList = data.map(item => ({
value: item.skuCode,
text: `${item.skuCode} - ${item.skuName}`,
- qtyDesc:`托数:${item.ext1} 总数量:${item.ext2}`
+ qtyDesc: `托数:${item.ext1} 总数量:${item.ext2}`
}));
}
},
@@ -254,7 +277,7 @@
.map(item => ({
value: item.skuCode,
text: `${item.skuCode} - ${item.skuName}`,
- qtyDesc:`托数:${item.ext1} 总数量:${item.ext2}`
+ qtyDesc: `托数:${item.ext1} 总数量:${item.ext2}`
}));
this.showSkuDropdown = true;
},
@@ -300,10 +323,10 @@
this.skuTypeList = await getSkuTypes();
console.log("this.skutypeList", this.skuTypeList)
},
- changeSkuType(){
- this.skuInput='';
- this.skuInfo='';
- this.countQty='';
+ changeSkuType() {
+ this.skuInput = '';
+ this.skuInfo = '';
+ this.countQty = '';
},
//获取物料列表
// async getSkus() {
@@ -443,7 +466,7 @@
},
//去除空格
trimLocInput(event) {
- this.formData.locCode = event.target.value.trim();
+ this.formData.locCode = event.target.value.trim();
},
//呼叫AGV
callAgv: function() {
@@ -542,9 +565,81 @@
background-color: #ffffff;
}
+ .container {
+ background: rgb(242, 243, 245);
+ height: 100vh;
+ }
+
+ .uni-forms-item {
+ border-bottom: 1px solid #E5E6EB;
+ margin-bottom: 0;
+ padding: 24rpx 0;
+ }
+
+ ::v-deep .uni-forms-item__label {
+ color: #1D2129;
+ font-size: 28rpx;
+ font-weight: 400;
+ }
+
+ ::v-deep .uni-select {
+ border: 0px;
+ }
+
+ ::v-deep.uni-select__input-placeholder {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #86909C;
+ }
+
+ .textarea {
+ background-color: #F2F3F5;
+ width: 100%;
+ }
+
+ ::v-deep.full-width-textarea {
+ width: 100% !important;
+ border: unset !important;
+ }
+
+ ::v-deep .is-input-border {
+ border: unset;
+ }
+
+ ::v-deep .uni-easyinput__placeholder-class {
+ font-size: 28rpx;
+ color: #86909C;
+ }
+
+ ::v-deep .uni-input-input {
+ font-size: 28rpx;
+ }
+
+ ::v-deep .uni-select__input-placeholder {
+ font-size: 28rpx;
+ color: #86909C;
+ }
+
+ ::v-deep .uniui-bottom {
+ display: none;
+ }
+
+ ::v-deep .uniui-top {
+ display: none;
+ }
+
+ .fromItem {
+ display: flex;
+ align-items: center;
+ }
+
.example {
- padding: 15px;
+ padding: 12rpx 24rpx 0;
background-color: #fff;
+ width: 702rpx;
+ border-radius: 24rpx;
+ margin: 24rpx auto;
+
}
.segmented-control {
diff --git a/pages/work/wms/surplusReturn.vue b/pages/work/wms/surplusReturn.vue
index f9289ef..27f6a71 100644
--- a/pages/work/wms/surplusReturn.vue
+++ b/pages/work/wms/surplusReturn.vue
@@ -1,34 +1,48 @@
-
- 返回
+
+
余料回库
-
+
+
+
+
-
+
+
+
+
-
+
-
+
+
+
+
-
-
+
+
+
+
+
-
+
+
@@ -61,6 +75,9 @@
import {
formatDate
} from 'tough-cookie';
+ import {
+ bottomBtn
+ } from '@/components/bottomBtn/bottomBtn.vue'
export default {
data() {
return {
@@ -181,6 +198,9 @@
msg: null
};
},
+ component: {
+ bottomBtn
+ },
onLoad() {
//加载物料下拉值列表
this.getSkuTypes()
@@ -465,7 +485,83 @@
}
-