uu

common/untool.js

@@ -128,6 +128,7 @@ const downloadFile = (url, ext = {})=> {
 const saveNetFile = ({ url, header } = {}) => {
 	return new Promise(async (resolve, reject) => {
 		showLoading('正在保存文件')
+		console.log("下载文件====", url)
 		try {
 			let dRes = await downloadFile(url, { header })
 			console.log("saveNetFile:downloadFile==", dRes)
@@ -136,7 +137,6 @@ const saveNetFile = ({ url, header } = {}) => {
 				path
 			} = dRes
 			path = path || tempFilePath
-			debugger
 			// #ifdef H5
 			saveAs(path)
 			// #endif
@@ -148,12 +148,12 @@ const saveNetFile = ({ url, header } = {}) => {
 			// #endif
 
 			// #ifdef MP-WEIXIN
-			debugger
 			await uniPromiseApi('openDocument', { filePath: path, showMenu: true, })
 			// #endif
 
 			hideLoading()
 			showToast('保存成功')
+			setClipboardData(url)
 			resolve(tempFilePath)
 		} catch (e) {
 			hideLoading()

pages.json

@@ -93,12 +93,6 @@
 				"navigationBarTitleText": "进仓单详情"
 			}
 		},
-		{
-			"path": "pages/warehousing/pdfPreview",
-			"style": {
-				"navigationBarTitleText": "进仓单预览"
-			}
-		},
 		{
 			"path": "pages/address/list",
 			"style": {

pages/service/list.vue

@@ -5,8 +5,9 @@
 				<view class="pgb-header">
 					<view class="com-jianju">
 						<view class="pos-rlt">
-							<tpx-search placeholder="选择地址" :value="getAddressDetail(searchParam, false)"></tpx-search>
+							<tpx-search placeholder="请输入关键字" v-model:value="searchParam.searchValue"></tpx-search>
-							<view @click="showAddress" class="pos-abt-all"></view>
+							<!-- <tpx-search placeholder="选择地址" :value="getAddressDetail(searchParam, false)"></tpx-search>
+							<view @click="showAddress" class="pos-abt-all"></view> -->
 						</view>
 					</view>
 				</view>
@@ -56,6 +57,7 @@
 		data() {
 			return {
 				searchParam: {
+					searchValue: '',
 				},
 				resData: { list: [] },
 				queryOption: {},

pages/tabBar/sending/sending.vue

@@ -85,10 +85,10 @@
 					{  title: '运单列表', subTitle: "寄件，收件运单", icon: getCdnUrl(`sdg/t-dingdan.png`), url: 'tabBar/search/search' },
 					{  title: '网点查询', subTitle: "查看收寄件网点", icon: getCdnUrl(`sdg/t-wangdain.png`), url: 'service/list' },
 					{  title: '地址簿', subTitle: "收件 寄件地址管理", icon: getCdnUrl(`sdg/t-dizhi.png`), url: 'address/list' },
-					{  title: '信息速递', subTitle: "快递信息列表", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: 'service/articlelist' },
+					// {  title: '信息速递', subTitle: "快递信息列表", icon: getCdnUrl(`sdg/t-xuzhi.png`), url: 'service/articlelist' },
 					// {  title: 'HSCODE', subTitle: "海关归类信息", icon: getCdnUrl(`sdg/t-HS.png`), url: '' },
 					// {  title: 'RECP', subTitle: "优惠税率安排查询", icon: getCdnUrl(`sdg/t-RE.png`), url: '' },
-					{  title: '扫码寄件', subTitle: "扫描条码发货", icon: getCdnUrl(`sdg/t-saoma.png`), url: 'action:scan' },
+					// {  title: '扫码寄件', subTitle: "扫描条码发货", icon: getCdnUrl(`sdg/t-saoma.png`), url: 'action:scan' },
 					{  title: '快递查询', subTitle: "快递单跟踪查询", icon: getCdnUrl(`sdg/t-yundan.png`), url: 'post/query' },
 				],
 				showFollow: false

pages/user/monthCardList.vue

@@ -140,7 +140,9 @@
 			},
 			handleEditItem(item={}) {
 				this.bindModal.show = true
-				this.bindModal.data = {}
+				this.bindModal.data = {
+					code: '888888'
+				}
 			},
 			
 			async handleSendCode(){

pages/warehousing/detail.vue

@@ -40,10 +40,7 @@
 					<view class="dt-tle">
 						<view class="t1">进仓货物总览</view>
 						<view class="t2">
-							<tetx v-if="billInfo.status == 0">未入仓</tetx>
+							<tpx-text-dic :value="billInfo.confirmStatus" :list="dicData.emis_wsin_tab"></tpx-text-dic>
-							<tetx v-if="billInfo.status == 1">已入仓</tetx>
-							<tetx v-if="billInfo.status == 2">部分入仓</tetx>
-							<tetx v-if="billInfo.status == 3">全部入仓</tetx>
 						</view>
 					</view>
 					<u-line margin="20rpx 0 20rpx"></u-line>
@@ -162,13 +159,14 @@
 					<u-row justify="end">
 						<view style="display: inline-block;white-space: nowrap;" class="mt-10 pb-30">
 							<u-row>
-								<u-button v-if="item.status!=3" @click="handleDialogClick(feedModal)" shape="circle" :plain="true"
+								<u-button v-if="item.confirmStatus!=1" @click="handleDialogClick(feedModal)" shape="circle" :plain="true"
 									custom-style="height: 54rpx;margin-left: 20rpx;">反馈异常</u-button>
 								
-								<u-button :disabled="item.status==3" @click="confirmJinCang(item.inNo)" shape="circle" type="primary" 
+								<u-button v-if="billInfo.stockInFlag == 1" :disabled="item.confirmStatus==1" @click="confirmJinCang(item.inNo)" shape="circle" type="primary" 
 									custom-style="height: 54rpx;margin-left: 20rpx;">
-									{{item.status==3?'已确认进仓':'进仓确认'}}
+									{{item.confirmStatus==1?'已确认进仓':'进仓确认'}}
 								</u-button>
+								
 							</u-row>					
 						</view>
 					</u-row>
@@ -181,8 +179,8 @@
 						<u-button @click="handleDownloadPdf()" :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
 						>下载PDF
 						</u-button>
-						<u-button :disabled="billInfo.status==3" @click="confirmJinCang()" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						<u-button v-if="billInfo.stockInFlag == 1" :disabled="billInfo.confirmStatus==1" @click="confirmJinCang()" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
-						>{{billInfo.status==3?'已确认进仓':'确认可发货'}}
+						>{{billInfo.confirmStatus==1?'已确认进仓':'确认可发货'}}
 						</u-button>
 					</u-row>
 				</view>

pages/warehousing/list.vue

@@ -66,10 +66,7 @@
 								<u-row justify="between">
 									<text @click="setClipboardData(item.inNo)">进仓单号:{{item.inNo}}</text>
 									<view class="com-tag-grey font-26" style="min-width: 120rpx;text-align: center;white-space: nowrap;">
-										<tetx v-if="item.status == 0">未入仓</tetx>
+										<tpx-text-dic :value="item.confirmStatus" :list="dicData.emis_wsin_tab"></tpx-text-dic>
-										<tetx v-if="item.status == 1">已入仓</tetx>
-										<tetx v-if="item.status == 2">部分入仓</tetx>
-										<tetx v-if="item.status == 3">全部入仓</tetx>
 									</view>
 								</u-row>
 								<u-text margin="5rpx 0" :text="item.waybillDetail.goodsInfo"
@@ -113,7 +110,8 @@
 										<u-button shape="circle" type="primary" :plain="true"
 											@click="handleDealItem(item, { type: 2 })"
 											custom-style="width: 180rpx;box-sizing: content-box;height: 54rpx;margin-left: 12rpx;">下载打印PDF</u-button>
-										<u-button v-if="item.status!=3" shape="circle" type="primary" @click="handleDealItem(item)"
+										<!-- 已进仓，未确认 显示确认 -->
+										<u-button v-if="item.stockInFlag == 1 &&item.confirmStatus!=1" shape="circle" type="primary" @click="handleDealItem(item)"
 											custom-style="width: 100rpx;box-sizing: content-box;height: 54rpx;margin-left: 12rpx;">去确认</u-button>
 									</u-row>
 								</u-row>
@@ -129,9 +127,9 @@
 <script>
 	import * as apiService from "@/common/api"
 	import BpdSendRecieverTmp from "@/components/buns-post-detail-templates/bpd-send-reciever-tmp"
-	import {
+	import { deepAssign } from "@/common/util"
-		deepAssign
+	import { saveNetFile } from "@/common/untool"
-	} from "@/common/util"
+	
 	export default {
 		props: {
 
@@ -205,7 +203,8 @@
 						this.goto(`warehousing/detail${itemQuery}`)
 						break;
 					case 2: // 下载PDF
-						// this.goto(`post/detail${itemQuery}`)
+						let dRes = await apiService.exportWarehouseInTpl({ orderSn: item.orderSn })
+						await saveNetFile(dRes)
 						break;	
 					default:
 						break;

pages/warehousing/pdfPreview.vue

@@ -1,71 +0,0 @@
-<template>
-	<tpx-page>
-		<tpx-layout>
-			<template v-slot:header></template>
-			<template v-slot:body>
-				<view class="dt-block">
-					
-				</view>
-			</template>
-			<template v-slot:footer>
-				<view class="blcok-white-noradius">
-					<u-row justify="space-around">
-						<u-button  @click="downloadFile(``)" :plain="true" size="large" shape="circle" type="primary" custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
-						>下载PDF到本地
-						</u-button>
-						<u-button @click="setClipboardData(`dasdasd`)" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
-						>复制分享链接
-						</u-button>
-					</u-row>
-				</view>
-			</template>
-		</tpx-layout>
-	</tpx-page>
-</template>
-
-<script>
-	export default {
-		props: {
-			// hasLeftWin: {
-			// 	type: Boolean
-			// }
-		},
-		computed: {
-		},
-		data() {
-			return {
-				
-			}
-		},
-		onShareAppMessage() {
-			return {
-				// title: '',
-				// path: 'TODO'
-			}
-		},
-		onLoad(queryOption) {
-			this.queryOption = queryOption
-			this.initData();
-		},
-		onUnload() {
-		},
-		methods: {
-			initData(){
-				// showLoading()
-			},
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import '@/common/uni-nvue.scss';
-	page {
-		background-color: #F6F6F6;
-		height: 100% !important;
-	}
-	
-</style>
-<style scoped lang="scss">
-	
-</style>