修改

pages/pda/components/bottomOperate.vue

@@ -4,7 +4,7 @@
 		<view class="nav_box rx-cc" @click="open">
 			<image class="open_icon" :class="{open_icon_reversal : isOperate}" src="~@/static/pda/open.svg"></image>
 		</view>
- 
+
 
 		<!-- // 弹出框 -->
 		<view class="operate_list" v-show="isOperate">
@@ -17,28 +17,29 @@
 			</view>
 
 
+			<!-- 
+
+
 			<view v-if='btnControlReportMethod == 2' class="list rx-bc">
 				<view class="round">{{btnList[btnState].length + 1}}</view>
 				<view class="name" @click="operate('skip', {})" >跳过(不报工)</view>
 				<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
 			</view>
+		 -->
 
+			<view v-if="newTaskObj.existOutsource == 1" class="list rx-bc" @click="operate('outPicking', {})">
+				<view class="round">{{btnList[btnState].length + 1}}</view>
+				<view class="name">委外领料</view>
+				<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
+			</view>
+
+			<view v-if="newTaskObj.existOutsource == 1" class="list rx-bc"
+				@click="operate('jobBooking', { isOutsource: 1})">
+				<view class="round">{{btnList[btnState].length + 2}}</view>
+				<view class="name">委外报工</view>
+				<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
+			</view>
 
-		
-		
-		
-		<view  v-if="newTaskObj.existOutsource == 1" class="list rx-bc"  @click="operate('outPicking', {})">
-			<view class="round">{{btnList[btnState].length + 1}}</view>
-			<view class="name" >委外领料</view>
-			<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
-		</view>
-		
-		<view  v-if="newTaskObj.existOutsource == 1" class="list rx-bc"  @click="operate('jobBooking', { isOutsource: 1})">
-			<view class="round">{{btnList[btnState].length + 2}}</view>
-			<view class="name" >委外报工</view>
-			<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
-		</view>
-		
 
 
 
@@ -51,8 +52,9 @@
 			<view class="btn" @click="handPause()">{{ GDStatus == 9 ?  '取消暂停' : '暂停' }}</view>
 			<view class="btn" @click="handTerminate()">终止</view>
 			<view class="btn">转派</view>
-			<view class="btn" :style="newTaskObj.existOutsource == 1 ? 'background: #FFA929' : ''" @click="handOutsource()">委外</view>
-			<view class="btn"  @click="handHandover">交接</view>
+			<view class="btn" :style="newTaskObj.existOutsource == 1 ? 'background: #FFA929' : ''"
+				@click="handOutsource()">委外</view>
+			<view class="btn" @click="handHandover">交接</view>
 		</view>
 		
 		<!-- //委外弹窗 -->
@@ -60,8 +62,8 @@
 			<template v-slot:list>
 				<view class="popup_list">
 					<view class="title">【{{taskObj.currentTaskName}}】是否委外</view>
-					
-			
+
+
 
 
 					<u-form labelPosition="left" :model="outsourceForm" labelWidth="180" labelAlign="left" class="">
@@ -76,44 +78,48 @@
 								dataKey="name" filterable format='{name}'></zxz-uni-data-select>
 						</u-form-item>
 
-						<u-form-item label="委外数量:" borderBottom prop="formedNumLast" >
-							<input class="uni-input content_num" 
-								v-model="outsourceForm.formedNumLast" type='number'></input>
+						<u-form-item label="委外数量:" borderBottom prop="formedNumLast">
+							<input class="uni-input content_num" v-model="outsourceForm.formedNumLast"
+								type='number'></input>
 						</u-form-item>
 
 
 						<u-form-item label="委外到:" borderBottom prop="taskIds">
-							<zxz-uni-data-select :localdata="newStepsList" style="font-size: 15px;" v-model="outsourceForm.taskIds"
-								dataValue='taskId' format='{taskTypeName}' dataKey="taskId" filterable  @change="changeTaskId"
-								:clear='true'></zxz-uni-data-select>
-						</u-form-item>
-						
-						<u-form-item label="委外场景:" borderBottom prop="taskIds">
-								{{sceneText}}
+							<zxz-uni-data-select :localdata="newStepsList" style="font-size: 15px;"
+								v-model="outsourceForm.taskIds" dataValue='taskId' format='{taskTypeName}'
+								dataKey="taskId" filterable :clear='true'></zxz-uni-data-select>
 						</u-form-item>
-                  
-						<u-form-item label="直接入库:" borderBottom prop="isInWarehouse"  v-if="outsourceForm.isFirstTask != 1">
-							<u-checkbox-group v-model="isInWarehouse" size="15px"  v-if="clientEnvironmentId != 2 " >
-								<u-checkbox labelSize="15px" iconSize="10px" activeColor="#157A2C" name="true" label="是"></u-checkbox>
+
+
+						<u-form-item label="直接入库:" borderBottom prop="isInWarehouse"
+							v-if="outsourceForm.isFirstTask != 1">
+							<u-checkbox-group v-model="isInWarehouse" size="15px" v-if="clientEnvironmentId != 2 ">
+								<u-checkbox labelSize="15px" iconSize="10px" activeColor="#157A2C" name="true"
+									label="是"></u-checkbox>
 							</u-checkbox-group>
-							<view style="font-size: 15px;" v-if="clientEnvironmentId == 2 " >是</view>
+							<view style="font-size: 15px;" v-if="clientEnvironmentId == 2 ">是</view>
 
-							<zxz-uni-data-select  style="margin-left: 10px; font-size: 15px;" v-if="clientEnvironmentId == 2 || isInWarehouse.length" :localdata="warehouseList" v-model="outsourceForm.warehouseId"
-								dataValue='id' dataKey="name" filterable format='{name}'></zxz-uni-data-select>
+
+							<zxz-uni-data-select style="margin-left: 10px; font-size: 15px;"
+								v-if="clientEnvironmentId == 2 || isInWarehouse.length" :localdata="warehouseList"
+								v-model="outsourceForm.warehouseId" dataValue='id' dataKey="name" filterable
+								format='{name}'></zxz-uni-data-select>
 
 						</u-form-item>
-               
-					
 
-						<u-form-item label="工艺路线:"   borderBottom style="font-size: 15px;"  prop="produceRoutingId" v-if="clientEnvironmentId != 2 && outsourceForm.isFirstTask != 1 && isInWarehouse && isInWarehouse.length == 0">
+
+
+
+						<u-form-item label="工艺路线:" borderBottom style="font-size: 15px;" prop="produceRoutingId"
+							v-if="clientEnvironmentId != 2 && outsourceForm.isFirstTask != 1 && isInWarehouse && isInWarehouse.length == 0">
 							<zxz-uni-data-select :localdata="produceList" v-model="outsourceForm.produceRoutingId"
 								dataValue='id' dataKey="name" filterable format='{name}'></zxz-uni-data-select>
 						</u-form-item>
 
-             
+
 
 						<u-form-item label="计划交期:" borderBottom prop="requireDeliveryTime">
-							<uni-datetime-picker type="datetime" v-model="outsourceForm.requireDeliveryTime" />
+							<uni-datetime-picker type="date" v-model="outsourceForm.requireDeliveryTime" />
 						</u-form-item>
 
 
@@ -134,19 +140,19 @@
 
 
 					<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk()">
-                       确定
+						确定
 					</u-button>
 
 
-			<!-- 		<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk(1)">
+					<!-- 		<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk(1)">
 						提交并发布
 					</u-button> -->
 
 				</view>
 			</template>
 		</SearchPopup>
-		<!-- //委外下一步 -->
-		<outsourceList  ref="outsourceListRef" @close="outCancel()"></outsourceList>
+
+		<outsourceList ref="outsourceListRef" @close="outCancel()"></outsourceList>
 		<handover ref="handoverRef"></handover>
 
 	</view>
@@ -165,10 +171,10 @@
 	} from '@/api/pda/workOrder.js'
 
 	import SearchPopup from './searchPopup.vue'
-	
+
 	import outsourceList from './outsourceList.vue'
 	import handover from './handover.vue'
-		
+
 	import {
 		EventBus
 	} from '@/utils/eventBus.js'
@@ -287,7 +293,7 @@
 						// 	name: '多工单报工',
 						// 	type: ''
 						// }
-						
+
 
 
 					],
@@ -383,8 +389,8 @@
 
 				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
 					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
-					
-					isInWarehouse: []
+
+				isInWarehouse: []
 
 
 
@@ -441,7 +447,7 @@
 
 
 			handOutsource() {
-			
+
 
 				let param = {
 					taskId: this.newTaskObj.currentTaskId,
@@ -452,7 +458,8 @@
 
 					this.outsourceForm = {
 						...res,
-				
+
+
 					}
 					this.outsourceForm.name = this.taskObj.currentTaskName + '委外'
 
@@ -503,7 +510,7 @@
 				}
 
 			},
-			
+
 			handHandover() {
 				this.$refs.handoverRef.open()
 			},
@@ -556,7 +563,7 @@
 
 
 
-	
+
 
 			// 工艺路线
 			produceFn() {
@@ -600,7 +607,7 @@
 
 
 
-			
+
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',
@@ -608,28 +615,28 @@
 					})
 					return false
 				}
-				
-				
-				if(this.clientEnvironmentId == 2) {
+				if (this.clientEnvironmentId == 2) {
 					this.outsourceForm.isInWarehouse = 1
 				} else {
-				 this.isInWarehouse.length > 0 ? this.outsourceForm.isInWarehouse = 1 :   this.outsourceForm.isInWarehouse = 0
+					this.isInWarehouse.length > 0 ? this.outsourceForm.isInWarehouse = 1 : this.outsourceForm
+						.isInWarehouse = 0
 				}
-			
+
+	
+
 				let param = {
 					...this.outsourceForm,
 					taskId: this.newTaskObj.currentTaskId,
 					workOrderId: this.newTaskObj.workOrderId,
-					
+
 				}
-				
+
 				console.log(param)
-				this.sceneText="";//委外场景
-				this.outsourceForm.outsourceScene =null;
+
 				this.$refs.outsourceListRef.open(param)
-        
 
-				
+
+
 				// let param = {
 				// 	...this.outsourceForm,
 				// 	taskId: this.newTaskObj.currentTaskId,