diff --git a/components/pda-scan-input/index.vue b/components/pda-scan-input/index.vue
index 2111305..32a8943 100644
--- a/components/pda-scan-input/index.vue
+++ b/components/pda-scan-input/index.vue
@@ -6,207 +6,126 @@
+ /* height: 0px; */
+ /* opacity: 0; */
+ /* visibility: hidden; */
+ /* display:none; */
+ }
+
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 7379acc..0c2d3bd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "干巷仓库APP",
- "appid" : "__UNI__A82C0EC",
+ "appid" : "__UNI__A67E78B",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/pages/consolidation/consolidation.vue b/pages/consolidation/consolidation.vue
index 7037888..24c8167 100644
--- a/pages/consolidation/consolidation.vue
+++ b/pages/consolidation/consolidation.vue
@@ -29,8 +29,8 @@
-
-
+ 清空
+ 拼箱
diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue
index 4ef1c35..eb6d30e 100644
--- a/pages/inWarehouse/inWarehouse.vue
+++ b/pages/inWarehouse/inWarehouse.vue
@@ -24,7 +24,7 @@
- 入库清单
+ {{this.isStrict?'':'无校验'}}入库清单
上次批次号:{{ newMaterialList[newMaterialList.length - 2].patchCode }}
上次批次号:
@@ -97,6 +97,14 @@ export default {
};
},
watch: {},
+ onLoad(e) {
+ if(e.isStrict === "true"){
+ this.isStrict = true;
+ }else{
+ this.isStrict = false;
+ }
+ console.log(e.isStrict === "true");
+ },
created() {
this.init();
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 723444d..d4ab10e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -80,7 +80,7 @@
buttonData: [{
index: 0,
text: '入库',
- icon: '/static/images/icon/入库.svg',
+ icon: '/static/images/icon/rk.svg',
style: {
width: '80px',
height: '180px',
@@ -93,7 +93,7 @@
{
index: 1,
text: '移库',
- icon: '/static/images/icon/移库.svg',
+ icon: '/static/images/icon/yk.svg',
style: {
width: '110px',
height: '90px',
@@ -106,7 +106,7 @@
{
index: 2,
text: '盘点',
- icon: '/static/images/icon/盘点.svg',
+ icon: '/static/images/icon/pd.svg',
style: {
width: '110px',
@@ -120,7 +120,7 @@
{
index: 3,
text: '出库',
- icon: '/static/images/icon/出库.svg',
+ icon: '/static/images/icon/ck.svg',
style: {
width: '100%',
height: '80px',
@@ -133,7 +133,7 @@
{
index: 4,
text: '仓库管理',
- icon: '/static/images/icon/仓库管理.svg',
+ icon: '/static/images/icon/ckgl.svg',
style: {
width: '100%',
height: '80px',
diff --git a/pages/menuChouse/menuChouse.vue b/pages/menuChouse/menuChouse.vue
index a35bbab..e7701c4 100644
--- a/pages/menuChouse/menuChouse.vue
+++ b/pages/menuChouse/menuChouse.vue
@@ -24,13 +24,15 @@
return {
// 菜单类型
type: -1,
- menuButtonList: [{
+ menuButtonList: [
+
+ {
//展示时机
isShowType: 0,
isShow: true,
name: '成品入库',
// 触发跳转
- url: '/pages/inWarehouse/inWarehouse',
+ url: '/pages/inWarehouse/inWarehouse?isStrict=true',
icon: '',
color: 'linear-gradient(to right, #ff5858 0%, #f09819 100%)'
},
@@ -38,6 +40,16 @@
//展示时机
isShowType: 0,
isShow: true,
+ name: '无校验入库',
+ // 触发跳转
+ url: '/pages/inWarehouse/inWarehouse?isStrict=false',
+ icon: '',
+ color: 'linear-gradient(to right, #55aa00 0%, #55aa7f 100%)'
+ },
+ {
+ //展示时机
+ isShowType: 0,
+ isShow: false,
name: '油漆入库',
// 触发跳转
url: '',
@@ -47,7 +59,7 @@
{
//展示时机
isShowType: 0,
- isShow: true,
+ isShow: false,
name: '毛坯入库',
// 触发跳转
url: '',
@@ -57,7 +69,7 @@
{
//展示时机
isShowType: 0,
- isShow: true,
+ isShow: false,
name: '备品备件',
// 触发跳转
url: '',
@@ -85,10 +97,10 @@
},
{
isShowType: 2,
- isShow: true,
+ isShow: false,
name: '盘点记录',
// 触发跳转
- url: '/pages/relocation/relocation',
+ url: '',
icon: '',
color: 'linear-gradient(to top, #0ba360 0%, #3cba92 100%)'
},
@@ -112,10 +124,10 @@
},
{
isShowType: 3,
- isShow: true,
+ isShow: false,
name: '出库单查看',
// 触发跳转
- url: '/pages/relocation/relocation',
+ url: '',
icon: '',
color: 'linear-gradient(to top, #0ba360 0%, #3cba92 100%)'
},
diff --git a/pages/stocktake/stocktake.vue b/pages/stocktake/stocktake.vue
index 3296b8d..affda4d 100644
--- a/pages/stocktake/stocktake.vue
+++ b/pages/stocktake/stocktake.vue
@@ -31,8 +31,8 @@
-
-
+
+
diff --git a/pages/unpacking/unpacking.vue b/pages/unpacking/unpacking.vue
index c54ae2c..f012133 100644
--- a/pages/unpacking/unpacking.vue
+++ b/pages/unpacking/unpacking.vue
@@ -27,17 +27,18 @@
+
+
+
+ 清空
+ 拆箱
+
-
-
-
-
-
@@ -144,17 +145,13 @@
if (type === 2) {
// 此时扫描的是箱号
if (this.newMaterialList.length > 0) {
- for (let item of this.newMaterialList) {
- if (data.patchCode === item.patchCode) {
- uni.showModal({
- title: '提示',
- content: '已扫过此箱!',
- showCancel: false,
- confirmText: '确定'
- });
- return;
- }
- }
+ uni.showModal({
+ title: '提示',
+ content: '只可拆一个货物!',
+ showCancel: false,
+ confirmText: '确定'
+ });
+ return;
}
const checkData = {
originalCode: data.originalCode
diff --git a/pages/user/user.css b/pages/user/user.css
index 4b448de..e98dcfc 100644
--- a/pages/user/user.css
+++ b/pages/user/user.css
@@ -565,13 +565,13 @@ text {
.section {
overflow: hidden;
- background-image: url('https://ide.code.fun/api/image?token=661f6554a17dbc0011549df2&name=ad157cc0204af4f71837e19bb893c054.png');
+ background-image: url('/static/images/ui/user.png');
background-size: 100% 100%;
background-repeat: no-repeat;
}
.section_2 {
- background-image: url('https://ide.code.fun/api/image?token=661f6554a17dbc0011549df2&name=ad157cc0204af4f71837e19bb893c054.png');
+ background-image: url('/static/images/ui/user.png');
background-size: 100% 100%;
background-repeat: no-repeat;
height: 216px;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 40b055e..7c7c557 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -4,7 +4,7 @@
{{name}}
diff --git a/pages/warehoseActionList/warehoseActionList.vue b/pages/warehoseActionList/warehoseActionList.vue
index 61b08ab..2c0d8c2 100644
--- a/pages/warehoseActionList/warehoseActionList.vue
+++ b/pages/warehoseActionList/warehoseActionList.vue
@@ -1,5 +1,5 @@
-
+
搜索
-
-
-
-
-
-
-
-
- {{quantityParse(item.jsonMsg,item.type)}}
-
-
-
-
- {{item.description}}
-
-
-
-
-
+
+
+ {{item.description}}
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,10 +61,11 @@
data() {
return {
loading: false,
+ modalShow: false,
queryForm: {
type: 0,
pageNum: 1,
- pageSize: 10,
+ pageSize: 20,
description: ''
},
typeOptions: [{
@@ -83,6 +90,7 @@
},
],
dataList: [],
+ dataModelType: 0,
dataJson: null,
total: 0
}
@@ -188,6 +196,14 @@
this.dataJson = null;
}, 300)
},
+
+ openModel(type) {
+ this.dataModelType = type;
+ this.modalShow = true;
+ },
+ closeModel() {
+ this.modalShow = false;
+ },
// 下拉事件
scrolltolower() {
let page = this.queryForm.pageNum;
diff --git a/static/images/icon/仓库管理.svg b/static/images/icon/仓库管理.svg
deleted file mode 100644
index 72a7696..0000000
--- a/static/images/icon/仓库管理.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-
\ No newline at end of file
diff --git a/static/images/icon/入库.svg b/static/images/icon/入库.svg
deleted file mode 100644
index 5a02958..0000000
--- a/static/images/icon/入库.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
\ No newline at end of file
diff --git a/static/images/icon/出库.svg b/static/images/icon/出库.svg
deleted file mode 100644
index 1f13725..0000000
--- a/static/images/icon/出库.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
\ No newline at end of file
diff --git a/static/images/icon/盘点.svg b/static/images/icon/盘点.svg
deleted file mode 100644
index cf1b51a..0000000
--- a/static/images/icon/盘点.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
\ No newline at end of file
diff --git a/static/images/icon/移库.svg b/static/images/icon/移库.svg
deleted file mode 100644
index aef8e4d..0000000
--- a/static/images/icon/移库.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-
\ No newline at end of file
diff --git a/static/images/ui/入库.jpg b/static/images/ui/入库.jpg
deleted file mode 100644
index d2402f5..0000000
Binary files a/static/images/ui/入库.jpg and /dev/null differ
diff --git a/static/images/ui/运货.jpg b/static/images/ui/运货.jpg
deleted file mode 100644
index 9cb0131..0000000
Binary files a/static/images/ui/运货.jpg and /dev/null differ