优化

api/pda/workOrder.js

@@ -212,7 +212,6 @@ export async function listOutsourceInWarehouse(params) {
 
 
 // pda委外完成的  领料保存到工序（半成品）
-
 export async function outsourceEndPick(params) {
 	const data = await postJ(
 		Vue.prototype.apiUrl + `/pda/mes/pickorder/outsourceEndPick`, params, true,

pages/pda/components/bottomOperate.vue

@@ -283,16 +283,20 @@
 
 
 			handOutsource() {
+			
 				let param = {
 					taskId: this.newTaskObj.currentTaskId,
-					workOrderId: this.newTaskObj.workOrderId
+					workOrderId: this.newTaskObj.workOrderId,
+					
+					
 				}
 				checkOutsource(param).then(res => {
 
 					this.outsourceForm = {
 						...res,
-						requireDeliveryTime: '2024-05-20'
+						requireDeliveryTime: '2024-05-30'
 					}
+					this.outsourceForm.name = this.taskObj.currentTaskName + '委外'
 
 					console.log(this.outsourceForm)
 

pages/pda/workOrder/search/index.vue

@@ -83,10 +83,9 @@
 								</view>
 
 
-								<!-- 		<view class="items"
-									v-if='item.rootCategoryLevelId == 1 '>
+								<view class="items" v-if='item.rootCategoryLevelId == 1 '>
 									<text>包装库存</text>{{ item.packingCountBase }} {{item.minUnit}}
-								</view> -->
+								</view>
 
 								<view class="items" v-if='item.rootCategoryLevelId == 11'>
 									<text
@@ -126,32 +125,29 @@
 		</view>
 
 
-		<view class="bottom-wrapper rx-bc" v-if='rootCategoryLevelId != 23'>
+		<view class="bottom-wrapper rx-bc">
 			<view>
 				<checkbox v-if="!seletedAll" color="#fff" :checked="seletedAll" @tap="_seletedAll">全选</checkbox>
 				<checkbox class="select-all" color="#fff" v-else :checked="seletedAll" @tap="_seletedAll">取消全选
 				</checkbox>
 			</view>
 			<view>
-				<u-button type="success" size="small" class="u-reset-button" :disabled="!checkListLen" @click="jumpAdd">
+				<u-button v-if='rootCategoryLevelId != 23' type="success" size="small" class="u-reset-button"
+					:disabled="!checkListLen" @click="jumpAdd(1)">
 					<view> 选择( {{ checkListLen }} ) </view>
 				</u-button>
-			</view>
-		</view>
 
-		<view class="bottom-wrapper rx-bc" v-if='rootCategoryLevelId == 23'>
-			<view>
-
-			</view>
-			<view>
-				<u-button type="success" size="small" class="u-reset-button" @click="jumpBCPAdd">
+				<u-button v-if='rootCategoryLevelId == 23' type="success" size="small" class="u-reset-button"
+					@click="jumpAdd(2)">
 					<view> 确认 </view>
 				</u-button>
+
 			</view>
 		</view>
 
 
 
+
 		<ba-tree-picker ref="treePicker" key="verify" :multiple="false" @select-change="confirm" title="选择分类"
 			:localdata="classificationList" valueKey="id" textKey="name" childrenKey="children" />
 
@@ -460,7 +456,7 @@
 				let URL = null
 				if (this.isType == 'pick') { // 领料
 					if (this.rootCategoryLevelId == 23) {
-						 this.list = []
+						this.list = []
 						param = {}
 						param.workOrderId = this.pid
 						URL = listOutsourceInWarehouse
@@ -583,40 +579,45 @@
 
 
 			//跳转回添加页面
-			jumpAdd() {
+			jumpAdd(type) {
+				if (type == 1) {
+					if (this.isType == 'pick' || this.isType == 'feed' || this.isType == 'job' || this.isType == 'zdy') {
+						uni.$emit('setSelectList', this.memoList, this.pid)
+						uni.navigateBack()
+					}
 
-				if (this.isType == 'pick' || this.isType == 'feed' || this.isType == 'job' || this.isType == 'zdy') {
-					uni.$emit('setSelectList', this.memoList, this.pid)
-					uni.navigateBack()
-				}
+				} else if (type == 2) {
+
+					uni.showModal({
+						title: '提示',
+						content: '是否领取该工单半成品到此工序！',
+						confirmText: '确认', //这块是确定按钮的文字
+						success: rr => {
+							if (rr.confirm) {
+								let param = {
+									taskId: this.taskId,
+									workOrderId: this.pid,
+									pickOutInList: this.list
+								}
 
-			},
 
-			jumpBCPAdd() {
-				uni.showModal({
-					title: '提示',
-					content: '是否领取该工单半成品到此工序！',
-					confirmText: '确认', //这块是确定按钮的文字
-					success: rr => {
-						if (rr.confirm) {
-							let param = {
-								taskId: this.taskId,
-								workOrderId: this.pid,
-								pickOutInList: this.list
+								outsourceEndPick(param).then(res => {
+									// uni.$emit('setSelectList', this.list, this.pid)
+									uni.navigateBack()
+								})
 							}
 
-
-							outsourceEndPick(param).then(res => {
-								console.log(11, res)
-								uni.$emit('setSelectList', this.list, this.pid)
-								uni.navigateBack()
-							})
 						}
+					})
+
+				}
+
+
 
-					}
-				})
 			},
 
+
+
 			getWarehouseFn() {
 				getWarehouseList().then(res => {
 					this.warehouseList = res