diff --git a/pages.json b/pages.json
index 6c12f1f..47aea9b 100644
--- a/pages.json
+++ b/pages.json
@@ -42,7 +42,17 @@
"navigationBarTitleText": "收货界面",
"navigationBarBackgroundColor": "#228B22",
"enablePullDownRefresh": true,
- "onReachBottomDistance": 300
+ "onReachBottomDistance": 300,
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "入库验收",
+ // "text": "+新增出库",
+ "fontSize": "15px",
+ "width": "70px"
+ }]
+ }
+ }
}
},
@@ -69,7 +79,7 @@
{
"path": "pages/inventory/index",
"style": {
- "navigationBarTitleText": "盘点计划",
+ "navigationBarTitleText": "盘点录入",
"navigationBarBackgroundColor": "#228B22"
}
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 299936c..aa2d770 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -33,7 +33,7 @@
- 盘点计划
+ 盘点录入
diff --git a/pages/inventory/index.vue b/pages/inventory/index.vue
index 2cf50c8..2f7fcca 100644
--- a/pages/inventory/index.vue
+++ b/pages/inventory/index.vue
@@ -15,7 +15,7 @@
- 待盘点物料信息
+ 待商品物料信息
@@ -26,8 +26,8 @@
- 物料编号:
- {{item.ptPart}}
+ 商品编号:
+ {{item.goodNo}}
@@ -40,47 +40,44 @@
- 物料名称:
- {{item.ptName}}
+ 商品名称:
+ {{item.goodName}}
- 物料数量:
- {{item.qty}}
+ 库存数量:
+ {{item.quantity}}
- 盘点数量:
+ 盘点数量:
{{item.invQty}}
- 物料修改
+ 商品修改
- 物料编码:
+ 商品编码:
-
+
-
-
-
+ -->
缴库数量:
-
-
+
+
@@ -124,13 +121,21 @@
containerId:'',
dtlAddBos:[]
},
- dataList: [],
+ dataList: [
+ {
+ goodNo:'123',
+ containerCode:'2250',
+ goodName:'物品',
+ quantity:25,
+ invQty:20
+ }
+ ],
query: {
current: 1,
size: 20
},
form:{
- ptPart:'',
+ goodNo:'',
batch:'',
invQty:''
},
@@ -210,12 +215,12 @@
},
qtyEnter(item){
this.show=true
- this.form.batch=item.batchNo
- this.form.ptPart=item.ptPart
- this.form.invQty=item.qty
- this.form.invOrderNo=item.invOrderNo
+ this.form.goodNo=item.goodNo
this.form.containerCode=item.containerCode
- this.invQty=item.qty
+ this.form.quantity=item.quantity
+ this.form.goodName=item.goodName
+ this.form.invQty=item.invQty
+ // this.invQty=item.qty
this.invid=item.id
},
noEnter(){
@@ -306,14 +311,14 @@
// this.$u.api.inv.entrySave(this.)
// item.qty=this.invQty
// console.log(item);
- if(this.form.ptPart === null
- || this.form.ptPart === ''
- || this.form.ptPart === 0
- || this.form.ptPart === undefined
- || this.form.ptPart ==='undefined'){
- this.$u.toast("请扫描物料编码");
- return;
- }
+ // if(this.form.ptPart === null
+ // || this.form.ptPart === ''
+ // || this.form.ptPart === 0
+ // || this.form.ptPart === undefined
+ // || this.form.ptPart ==='undefined'){
+ // this.$u.toast("请扫描物料编码");
+ // return;
+ // }
if(this.form.batch === null
|| this.form.batch === ''
|| this.form.batch === 0
diff --git a/pages/receive/index.vue b/pages/receive/index.vue
index 6178b9a..d7d862b 100644
--- a/pages/receive/index.vue
+++ b/pages/receive/index.vue
@@ -186,7 +186,7 @@ import { nextTick } from "vue";
},
//前往验货
onNavigationBarButtonTap(e){
- console.log(e);
+ // console.log(e);
this.$u.route({
url: 'pages/checkAccept/index',
type: 'navigateTo',
@@ -232,7 +232,6 @@ import { nextTick } from "vue";
})
}
})
-
}
},
diff --git a/uni_modules/select-lay/components/select-lay/select-lay.vue b/uni_modules/select-lay/components/select-lay/select-lay.vue
index 12b95e1..0379570 100644
--- a/uni_modules/select-lay/components/select-lay/select-lay.vue
+++ b/uni_modules/select-lay/components/select-lay/select-lay.vue
@@ -44,6 +44,10 @@
export default {
name: "select-lay",
props: {
+ pointNoChild: {
+ type: String, // 指定 prop 的类型
+ default: '' // 指定 prop 的默认值
+ },
disabled: {
type: Boolean,
default: false
@@ -101,6 +105,13 @@
this.itemcheck();
},
watch: {
+ //pointNoChild
+ pointNoChild(){
+ // console.log(this.pointNoChild);
+ if(this.pointNoChild === ''){
+ this.changevalue =this.pointNoChild
+ }
+ },
//value改变
value() {
this.itemcheck();