diff --git a/common/config.js b/common/config.js
index 001bf6e..f86d364 100644
--- a/common/config.js
+++ b/common/config.js
@@ -11,6 +11,7 @@ const config = {
// config.baseUrl = 'http://192.168.19.120:8030';
// config.baseUrl = 'http://120.77.94.227:8030'
config.baseUrl = 'http://127.0.0.1:8030';
+// config.baseUrl = 'http://192.168.7.29:8030';
// config.baseUrl = 'http://192.168.7.24:8030';
// config.baseUrl = 'http://192.168.229.120:8030';0
// config.baseUrl = 'http://120.77.94.227:8030';
diff --git a/pages/checkAccept/checkHomework.vue b/pages/checkAccept/checkHomework.vue
index 06f4f75..e77f2e7 100644
--- a/pages/checkAccept/checkHomework.vue
+++ b/pages/checkAccept/checkHomework.vue
@@ -11,61 +11,61 @@
{{ result.orderNo}}
-
+
商品编号：
{{result.businInReceivingDForPdaVo.bgGoodNo}}
-
+
商品名称：
{{result.businInReceivingDForPdaVo.bgGoodName}}
-
- 规 格：
+
+ 规 格：
{{result.businInReceivingDForPdaVo.bgSpecifications}}
-
+
件装量：
{{result.businInReceivingDForPdaVo.bpPackageQty}}
-
+
单 位：
{{result.businInReceivingDForPdaVo.unitName}}
-
+
未验数量：
{{result.businInReceivingDForPdaVo.ableQty}}
-
+
验收数量：
{{dataForm.actualQty}}
-
+
件 数：
-
+
库 别：
-
+
容 器：
-
+
抽检件数：
-
+
抽检零散数：
@@ -122,8 +122,6 @@
};
},
onLoad: function(options) {
-
- console.log(options)
this.sid = options.sid
this.detailId = options.did
this.getList(options)
@@ -174,7 +172,6 @@
//处理原因
getByDicAcceptanceReason() {
this.$u.api.getByDicAcceptanceReason().then(res => {
- // console.log(res)
if (res.code === 200) {
this.resustlist = res.data.map((item) => ({
label: item.dictLabel,
@@ -197,14 +194,12 @@
this.storageList.push(obj);
}
});
- // console.log(this.storageList)
},
// 提报异常
confirmError() {
this.$u.api.acceptance.confirmError({
id: this.sid
}).then((res) => {
- console.log(res)
if (res.code === 200) {
this.$u.toast('提报异常成功');
this.dataForm = {
@@ -276,8 +271,6 @@
// this.$u.toast('请选择有效期至');
// return
// }
- console.log('这里执行了吗')
- console.log(this.billingStatusValue)
this.$u.api.acceptance.confirmBilling({
id: this.sid,
businInReceivingDetailTransBo: {
@@ -285,7 +278,6 @@
id: this.detailId
}
}).then(res => {
- console.log(res)
if (res.code === 200) {
this.$u.toast('验收成功');
this.result = {}
@@ -312,7 +304,6 @@
},
getList(params) {
this.$u.api.acceptance.getReceiving(params).then(res => {
- console.log(res)
if (res.code === 200) {
this.result = res.data
if (!this.result.businInReceivingDForPdaVo) {
@@ -348,28 +339,24 @@
this.endtime = true
},
change(e) {
- console.log(e.result)
this.endTimeValue = e.result
this.endtime = false
this.dataForm.expiredDate = e.result
},
// 确定库别
confirmKube(e) {
- console.log(e)
this.kube = false
this.kubevalue = e[0].label
this.dataForm.storageId = e[0].value
},
// 验收结果
confirmClusion(e) {
- console.log(e)
this.receonclusion = false
this.billingStatusValue = e[0].label
this.dataForm.billingStatus = e[0].value
},
// 处理原因
confirmResult(e) {
- console.log(e)
this.resust = false
this.resustValue = e[0].label
this.dataForm.reason = e[0].value
@@ -379,7 +366,6 @@
var pages = getCurrentPages(); //当前页面栈
if (pages.length > 1) {
var beforePage = pages[pages.length - 1]; //获取上一个页面实例对象
- console.log(beforePage)
beforePage._data.refreshIfNeeded = true;
}
}
@@ -446,7 +432,7 @@
.titleValue {
display: flex;
align-items: center;
- font-size: 28rpx;
+ font-size: 32rpx;
padding: 0 50rpx;
margin-bottom: 20rpx;
diff --git a/pages/checkAccept/index.scss b/pages/checkAccept/index.scss
index fbf58e1..a34fe94 100644
--- a/pages/checkAccept/index.scss
+++ b/pages/checkAccept/index.scss
@@ -70,11 +70,11 @@
flex-direction: row;
.receipt-number-title {
color: #333333;
- font-size: 24rpx;
+ font-size: 32rpx;
}
.receipt-number-value {
color: #333333;
- font-size: 28rpx;
+ font-size: 32rpx;
font-weight: 600;
margin-left: 20rpx;
}
@@ -132,11 +132,11 @@
align-items: center;
width: 50%;
.goods-title {
- font-size: 28rpx;
+ font-size: 32rpx;
color: #555555;
}
.goods-value {
- font-size: 28rpx;
+ font-size: 32rpx;
color: #666666;
margin-left: 20rpx;
}
@@ -159,7 +159,7 @@
display: flex;
align-items: center;
.item-title {
- font-size: 24rpx;
+ font-size: 26rpx;
color: #555555;
}
.item-value {
diff --git a/pages/checkAccept/index.vue b/pages/checkAccept/index.vue
index fabea70..0a001f7 100644
--- a/pages/checkAccept/index.vue
+++ b/pages/checkAccept/index.vue
@@ -1,10 +1,10 @@
-
-
-
+
+
+
@@ -17,8 +17,7 @@
v-if="dataList.length > 0">
-
-
+
-
-
+
- 收货单号
+ 收货单号
{{item.orderNo}}
@@ -113,9 +111,11 @@
},
onLoad() {
- // uni.startPullDownRefresh()
+ // uni.startPullDownRefresh()\
+ this.dataList =[]
this.getDataList();
this.getDic()
+
},
//上拉刷新(当数据距离底部100时触发，距离在pages.json配置)
onReachBottom() {
@@ -134,7 +134,8 @@
if ( currentPage._data.refreshIfNeeded) {
currentPage._data.refreshIfNeeded = false;
this.query.pageNum = 1
- this.getDataList();; // 调用列表重置刷新页面
+ this.dataList =[]
+ this.getDataList(); // 调用列表重置刷新页面
// this.mescroll.scrollTo(0,0); // 滚动页面置顶
}
},
@@ -300,6 +301,7 @@
},
//初始化数据
getDataList() {
+
uni.stopPullDownRefresh();
this.loadStatus = "loadmore";
this.$u.api.acceptance.pageReceiving({
diff --git a/pages/payInto/index.vue b/pages/payInto/index.vue
index a27ec12..2988ece 100644
--- a/pages/payInto/index.vue
+++ b/pages/payInto/index.vue
@@ -73,7 +73,7 @@
-->
-
+