uu

common/api/order.js

@@ -90,3 +90,10 @@ export const scanRecord = (data = {})=> {
 export const getNextStationList = (data = {})=> {
 	return coreRequest(url.getNextStationList, data, {}, "GET")
 }
+
+// 扫描-获取下一网点
+export const getRealGetWaybillPrintData = (data = {})=> {
+	return coreRequest(url.getRealGetWaybillPrintData, data, {}, "GET")
+}
+
+

common/api/url.js

@@ -40,6 +40,7 @@ export default {
   getOrderDetail: `/emis/emisWaybill/getWaybillDetail`, // 订单详情
   
   scanRecord: `/emis/emisTmsScanRecord/scan`, // 扫描-  揽收
+  getRealGetWaybillPrintData: `/emis/emisWaybill/realGetWaybillPrintData`, // 运单 打印数据
   
   getNextStationList: `/emis/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点
   

pages/print/courierNote.vue

@@ -1,12 +1,13 @@
 <template>
+	<tpx-page>
 		<tpx-layout>
 			<template v-slot:body>
 				<view class="blcok-white-noradius" style="margin-top: 0;">
 					<u-row justify="between">
 						<view style="width: 140rpx;" class="font-weight">运单号</view>
 						<view style="flex:1;">
-						<tpx-scan-input v-model:value="submitParam.yundanhao" placeholder="请输入或扫码"
+							<tpx-scan-input v-model:value="submitParam.billCode" placeholder="请输入或扫码"
-							iconPos="right"></tpx-scan-input>
+								@change="handleScanValChange" iconPos="right"></tpx-scan-input>
 						</view>
 					</u-row>
 					<u-row justify="between" custom-style="margin-top:20rpx;">
@@ -17,14 +18,14 @@
 					</u-row>
 					<u-row custom-style="margin-top:20rpx;" justify="end">
 						<u-row>
-						<text class="pr-30">是否已打印</text>
+							<text class="pr-30">是否需要PDF</text>
-						<u-switch v-model="submitParam.morenTODO" @change="handleDefaultSwitch(item)"
+							<u-switch v-model="submitParam.isNeedPdf"
 								active-color="#B12D29" size="34"></u-switch>
 						</u-row>
 					</u-row>
 		
 					<view class="mt-30">
-					<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
+						<u-button type="primary" size="large" shape="square" plain="true" 
 							custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;">查询</u-button>
 					</view>
 					<view class="clr-prm mt-20">注意：当打印出来寄件分拨或未端分拨返回为空时，请等待5分钟后再补 打印</view>
@@ -32,7 +33,7 @@
 					<u-row justify="between" custom-style="margin-top:30rpx;">
 						<view style="width: 140rpx;" class="font-weight">打印联选择</view>
 						<view style="flex:1;" class="ml-20">
-						<u-radio-group v-model="submitParam.radiovalue1" placement="row">
+							<u-radio-group v-model="submitParam.lang" placement="row">
 								<u-radio size="26" labelSize="26" label-color=":#999" activeColor="#B12D29" 
 									customStyle="margin: 0 20rpx 0 0" v-for="(item, index) in yinlTypeList"
 									:label="item.title" :name="item.val" 
@@ -41,9 +42,9 @@
 						</view>
 					</u-row>
 					<view class="mt-20">
-					<u-checkbox-group v-model="submitParam.checkVal" placement="column">
+						<u-checkbox-group v-model="submitParam.printType" placement="column">
 							<u-row custom-style="flex-wrap: wrap;">
-							<u-col span="6" v-for="(item, index) in yinlList">
+								<u-col span="6" v-for="(item, index) in dicData.emis_print_type">
 									<u-checkbox size="26" labelSize="26" label-color=":#999" activeColor="#B12D29"
 										:customStyle="{marginBottom: '8rpx'}" 
 										:label="item.title" :name="item.val" 
@@ -60,13 +61,13 @@
 						<view >
 							<u-checkbox-group @change="handleSelAll">
 								<u-checkbox size="26" labelSize="26" label-color=":#999" activeColor="#B12D29"
-								label="全选"  :checked="submitParam.sltDanValues.length == yundanList.length" 
+									label="全选"  :checked="submitParam.subBillCodeRange.length == yundanList.length" 
 								></u-checkbox>
 							</u-checkbox-group>
 						</view>
 					</u-row>
 					
-				<tpx-checkitems :list="yundanList" v-model:value="submitParam.sltDanValues" v-slot="dlCurrent" type="multiple" 
+					<tpx-checkitems :list="yundanList" v-model:value="submitParam.subBillCodeRange" v-slot="dlCurrent" type="multiple" 
 					>
 						<view slot class="yditem mt-20">
 							<u-row>
@@ -90,32 +91,20 @@
 			<template v-slot:footer>
 				<view class="blcok-white-noradius">
 					<u-row>
-					<u-button @click="handleSubmit()" type="primary" plain="true" size="large" shape="square"
+						<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
-						custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;margin: 0 10rpx;">搜索蓝牙</u-button>
-
-					<u-button @click="handleSubmit(2)" type="primary" size="large" shape="square"
 							custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;margin: 0 10rpx;">打印</u-button>
 					</u-row>
 				</view>
 			</template>
 		</tpx-layout>
+	</tpx-page>
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
+	import { debounce } from "@/common/util"
-	import {
+	import dayjs from "dayjs"
-		ordStaEnum,
+	import * as apiService from "@/common/api"
-		ordStatusList,
+	
-		payTypeEnum,
-		payTypeList,
-		dlvTypeEnum,
-		dlvTypeList,
-		dateTypeEnum,
-		dateTypeList
-	} from "@/common/enum"
-	import {
-		goto
-	} from "@/common/untool"
 	export default {
 		props: {
 			// hasLeftWin: {
@@ -123,29 +112,25 @@
 			// }
 		},
 		computed: {
-			
+			dicData() {
+			  return this.$store.getters.dicData
+			},
 		},
 		data() {
+			let { dicData } = this.$store.getters
 			return {
 				submitParam: {
+					lang: 'zh',
+					printType: [],
+					isNeedPdf: false,
 					date: [],
-					type: 1,
+					subBillCodeRange: []
-					sltDanValues: []
 				},
 				yinlTypeList: [
-					{ title: '中文', val: 1 },
+					{ title: '中文', val: 'zh' },
-					{ title: '英文', val: 2 },
+					{ title: '英文', val: 'en' },
-				],
-				yinlList: [
-					{ title: '寄件网点存根联', val: 1 },
-					{ title: '收件客户联', val: 2 },
-					{ title: '寄件客户联', val: 3 },
-					{ title: '派件网点存根联', val: 4 },
-					{ title: '派件网点存根联(DOORA)', val: 5 },
-					{ title: '英文子单模版 (BFS)', val: 6 },
-					{ title: '英文子单模版 (TAN)', val: 7 },
-					{ title: '子单打印区间___到___', val: 8 }
 				],
+				
 				yundanList: [
 					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
 				]
@@ -164,22 +149,31 @@
 
 		},
 		methods: {
-			getCdnUrl,
-
 			initData() {
 				// uni.showLoading({
 				// 	title: '加载中'
 				// });
 			},
-			handleSubmit(type) {
+			handleScanValChange: debounce(function(val){
-				goto("print/bluetooth-mini-printer")
+				// val && ()
+			}),
+			handleSubmit() {
+				this.getRealGetWaybillPrintData()
+				// this.goto("print/bluetooth-mini-printer")
 			},
 			handleSelAll() {
-				if(this.submitParam.sltDanValues.length == this.yundanList.length) {
+				if(this.submitParam.subBillCodeRange.length == this.yundanList.length) {
-					this.submitParam.sltDanValues = []
+					this.submitParam.subBillCodeRange = []
 				} else {
-					this.submitParam.sltDanValues = this.yundanList.map(item=> item.val)
+					this.submitParam.subBillCodeRange = this.yundanList.map(item=> item.val)
 				}
+			},
+			async getRealGetWaybillPrintData() {
+				let param = JSON.parse(JSON.stringify(this.submitParam))
+				param.printType = param.printType.join(',')
+				param.subBillCodeRange = param.subBillCodeRange.join(',')
+				param.isNeedPdf = param.isNeedPdf ? 'T' : ''
+				let res = await apiService.getRealGetWaybillPrintData(param)
 			}
 		}
 	}