66

pages/pda/components/bottomOperate.vue

@@ -4,6 +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">
@@ -56,6 +57,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="">
@@ -83,7 +86,7 @@
 						</u-form-item>
 
                   
-						<u-form-item label="直接入库:" borderBottom prop="isInWarehouse" >
+						<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>
@@ -98,7 +101,7 @@
 					
 
 
-						<u-form-item label="工艺路线:" borderBottom style="font-size: 15px;"  prop="produceRoutingId" v-if="clientEnvironmentId != 2 &&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>
@@ -565,7 +568,7 @@
 
 
 
-				// this.outsourceForm.requireDeliveryTime = '2025-03-18'
+				this.outsourceForm.requireDeliveryTime = '2025-03-18'
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',

pages/pda/components/outsourceList.vue

@@ -352,21 +352,16 @@
 
 				}
 				checkOutsourceMaterial(param).then(res => {
-					if (this.clientEnvironmentId == 3 && res.isFirstTask == 1) {
-						this.pickOutInList = [...res.pickOutInList, ...res.materialList]
-					} else {
-						this.pickOutInList =  [...res.pickOutInList, ...res.materialList]
-						
-						
-						this.pickOutInList = this.pickOutInList.reduce((acc, item) => {
+					let _arr = []
+						_arr=  [...res.pickOutInList, ...res.materialList]
+						this.pickOutInList = _arr.reduce((acc, item) => {
 						    const existingItem = acc.find(existing => existing.id === item.id);
 						    if (!existingItem) {
 						        acc.push(item);
 						    }
 						    return acc;
 						}, []);
-					}
-
+				
 
 					this.bomMaterialList = res.bomMaterialList.map((m) => {
 						return {