Skip to content

梁建民 / wmsMin

Go to a project
Commit d1556ccf by LJM
Options

供应链纸质单理货---作废后重新理货，支持选择之前的图片

parent 3def804f
Inline Side-by-side
Showing with 45 additions and 29 deletions
assets/css/tallyGoods/confirm.scss
...@@ -220,6 +220,11 @@ ...@@ -220,6 +220,11 @@
} }
} }
} }
.history-btn {
height: 70rpx;
font-size: 26rpx;
color: #197adb;
}
} }
} }
} }
......
pages.json
...@@ -268,6 +268,11 @@ ...@@ -268,6 +268,11 @@
"style": { "style": {
"navigationBarTitleText": "新增异常" "navigationBarTitleText": "新增异常"
} }
}, {
"path": "pages/tallyGoods/historicalTally",
"style": {
"navigationBarTitleText": "历史理货图片"
}
}], }],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
......
pages/tallyGoods/confirm.vue
...@@ -63,37 +63,40 @@ ...@@ -63,37 +63,40 @@
</view> </view>
</navigator> </navigator>
</view> </view>
<!-- 商检图片上传 -->
<view class="section" v-if="isInspOrg"> <view class="section" v-if="isInspOrg">
<!-- 商检图片上传 -->
<view class="upload-box"> <view class="upload-box">
<view class="title row bothSide verCenter" v-if="goods_check_pic_list.length > 0"> <view class="title row bothSide verCenter" v-if="goods_check_pic_list.length > 0">
<text class="tt-l">商检图片上传（仅商检必填）</text> <text class="tt-l">商检图片上传（仅商检必填）</text>
<text class="tt-r">{{ goods_check_pic_list.filter(subArray => subArray.length > 0).length }}/{{ goods_check_pic_list.length }}</text> <text class="tt-r">{{ goods_check_pic_list.filter(subArray => subArray.length > 0).length }}/{{ goods_check_pic_list.length }}</text>
</view> </view>
<view class="model-upload-list"> <view class="model-upload-list">
<view class="box row bothSide verCenter" v-for="(item, index) in list" :key="index" :class="{ curr: goods_check_pic_list[index].length > 0 }"> <view class="column" v-for="(item, index) in list" :key="index" :class="{ curr: goods_check_pic_list[index].length > 0 }">
<view class="file row verCenter"> <view class="box row bothSide verCenter">
<text class="t1">{{ item.model }}</text> <view class="file row verCenter">
<template v-if="goods_check_pic_list[index].length > 0"> <text class="t1">{{ item.model }}</text>
<text class="t2" @click="previewChange(goods_check_pic_list[index], 0)">已上传&nbsp;{{ goods_check_pic_list[index].length }}张</text> <template v-if="goods_check_pic_list[index].length > 0">
<text class="clear" @click="clearFn(index)">清空</text> <text class="t2" @click="previewChange(goods_check_pic_list[index], 0)">已上传&nbsp;{{ goods_check_pic_list[index].length }}张</text>
</template> <text class="clear" @click="clearFn(index)">清空</text>
</view> </template>
<view class="file-btn row verCenter" @click="uploadBusinessChange(index)"> </view>
<template v-if="goods_check_pic_list[index].length > 0"> <view class="file-btn row verCenter" @click="uploadBusinessChange(index)">
<text class="t1">继续上传</text> <template v-if="goods_check_pic_list[index].length > 0">
</template> <text class="t1">继续上传</text>
<template v-else> </template>
<text class="t1">上传图片</text> <template v-else>
</template> <text class="t1">上传图片</text>
<text class="iconfont icon-sanjiaoxing2"></text> </template>
<text class="iconfont icon-sanjiaoxing2"></text>
</view>
</view> </view>
<navigator class="history-btn row verCenter" :url="'/pages/tallyGoods/historicalTally?erp_order_sn=' + form.erp_order_sn+'&model='+item.model + '&index='+ index + '&srcEntryID='+(encodeURIComponent(item.srcEntryID))+'&entryID='+(encodeURIComponent(item.entryID))">历史理货图片</navigator>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 采购单上传 -->
<view class="section" style="margin-bottom: 48rpx;" :class="{ switchClass: !switchFlag }"> <view class="section" style="margin-bottom: 48rpx;" :class="{ switchClass: !switchFlag }">
<!-- 采购单上传 -->
<view class="upload-box"> <view class="upload-box">
<view class="title row bothSide verCenter"> <view class="title row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
...@@ -559,8 +562,7 @@ ...@@ -559,8 +562,7 @@
}); });
return false; return false;
} }
console.log(JSON.stringify(this.form))
this.request(API.submitTallyGoods, 'POST', this.form, true).then(res => { this.request(API.submitTallyGoods, 'POST', this.form, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
uni.showModal({ uni.showModal({
......
util/api.js
const API_BASE = 'https://api.ichunt.com'; // const API_BASE = 'https://api.ichunt.com';
const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统 // const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK // const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统 // const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE = 'http://api.liexin.com'; const API_BASE = 'http://api.liexin.com';
// const API_BASE_OSS = 'http://image.liexindev.net'; const API_BASE_OSS = 'http://image.liexindev.net';
// const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
// const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统 const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
const API = { const API = {
...@@ -397,7 +397,11 @@ const API = { ...@@ -397,7 +397,11 @@ const API = {
/** /**
* 验证入仓号 * 验证入仓号
*/ */
getBoxStatus: API_BASE + '/supplywechatwms/getBoxStatus' getBoxStatus: API_BASE + '/supplywechatwms/getBoxStatus',
/**
* 历史理货图片
*/
getHistoryPic: API_BASE + '/supplywechatwms/getHistoryPic'
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment