From d773b6d1be9d1691ceed14dae38b1b646cb23901 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 24 Sep 2024 10:30:28 +0800
Subject: [PATCH] uu

---
 common/api/order.js         |  5 +++++
 manifest.json               |  2 +-
 pages/print/courierNote.vue | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index 4968417..adf99fb 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -29,6 +29,11 @@ export const getRSDStaffList = (data = {})=> {
 	return coreRequest(url.getPickStaffList, { ...data, postCode: 'RSD' }, {}, "GET")
 }
 
+// 操作员、收派员列表
+export const getAllStaffList = (data = {})=> {
+	return coreRequest(url.getPickStaffList, { ...data }, {}, "GET")
+}
+
 // 回款人联系列表
 export const getPayeeList = (data = {})=> {
 	return coreRequest(url.getPayeeList, { ...data }, {}, "GET")
diff --git a/manifest.json b/manifest.json
index 16e7a64..2ef9928 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__BCB0FB5",
     "description" : "探路国际速运",
     "versionName" : "1.0.1",
-    "versionCode" : "1045",
+    "versionCode" : "1046",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/print/courierNote.vue b/pages/print/courierNote.vue
index e9a33d8..d0c129d 100644
--- a/pages/print/courierNote.vue
+++ b/pages/print/courierNote.vue
@@ -20,6 +20,15 @@
 									<tpx-date-input ref="dateRef" v-model:value="searchParam._date" placeholder="请选择时间"></tpx-date-input>
 								</view>
 							</u-row>
+							<u-row justify="between" custom-style="margin-top:20rpx;">
+								<view style="width: 140rpx;" class="font-weight">录入人</view>
+								<view style="flex:1;">
+									
+									<tpx-select v-model:resObject="postRes" :getListFun="getAllStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}"
+										v-model:value="searchParam.registerManCode" :isWhite="true" mode="drop" :minChecked="0" placeholder="请选择"
+									></tpx-select>
+								</view>
+							</u-row>
 							<u-row custom-style="margin-top:20rpx;" justify="end">
 								<u-row>
 									<text class="pr-30">是否已打印</text>
@@ -193,7 +202,7 @@
 					lang: 'zh',
 					printType: [],
 					billCode: [],
-					subBillCodeRange: []
+					subBillCodeRange: [],
 				},
 				submitValidConfig: {
 					printType: { required: true, requiredMsg: '请勾选打印配' },
@@ -206,10 +215,12 @@
 				searchParam: {
 					printFlag: '0',
 					billCode: '',
+					registerManCode: '',
 					_date: [],
 					params: {}
 				},
-				resData: { list: [] }
+				resData: { list: [] },
+				postRes: { list: [] },
 			}
 		},
 		onShareAppMessage() {
@@ -227,6 +238,7 @@
 
 		},
 		methods: {
+			getAllStaffList: apiService.getAllStaffList,
 			getAddressDetail,
 			async getListFun(param){
 				let cpParam = JSON.parse(JSON.stringify(param))