diff --git a/apis/request.js b/apis/request.js
index 2c4da53..213895b 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -64,6 +64,7 @@ class Http{
}
},
fail(err) {
+ // console.log(err);
reject(err)
}
})
diff --git a/manifest.json b/manifest.json
index 5fcaa06..7f545ef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "智慧仓储",
"appid" : "__UNI__9D122E1",
"description" : "",
- "versionName" : "1.0.4",
- "versionCode" : 104,
+ "versionName" : "1.0.5",
+ "versionCode" : 105,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/backMaterialReceive/backMaterialReceive.vue b/pages/backMaterialReceive/backMaterialReceive.vue
index 2c00aab..737c6ae 100644
--- a/pages/backMaterialReceive/backMaterialReceive.vue
+++ b/pages/backMaterialReceive/backMaterialReceive.vue
@@ -21,7 +21,7 @@
-->
- {{ fetch.backPerson.slice(0, 1) }}
+ {{ fetch.backPerson == null ? '' : fetch.backPerson.slice(0, 1) }}
{{ fetch.backPerson }}
@@ -239,10 +239,10 @@ import { basePath } from '../../public'
onShow() {
let that = this
// console.log(uni.getStorageSync('userInfo').sysUser.companyId);
- // 获取领料出库数据
-
+ // 获取退料接收列表
that.$api.backMaterialReceive.backMaterialReceiveList({
- companyId: uni.getStorageSync('userInfo').sysUser.companyId
+ companyId: uni.getStorageSync('userInfo').sysUser.companyId,
+ flag: 0
// companyId:'101'
}).then(res => {
console.log(res);
diff --git a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
index 71194b2..b83a8c9 100644
--- a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
+++ b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
@@ -300,6 +300,7 @@
taskId: that.taskId,
parentId: that.detailsId
}).then(res => {
+ console.log(res)
if (res.data.code == 200) {
uni.showToast({
icon: 'none',