chencc il y a 1 an
Parent
commit
549d979479

+ 48 - 16
pages/pda/components/bottomOperate.vue

@@ -87,9 +87,15 @@
 						<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 :clear='true'></zxz-uni-data-select>
+								dataKey="taskId" filterable :clear='true' @change="changeTaskId"></zxz-uni-data-select>
 						</u-form-item>
 
+						<u-form-item label="委外场景:" borderBottom prop="taskIds">
+								{{sceneText}}
+						</u-form-item>
+
+
+
 
 						<u-form-item label="直接入库:" borderBottom prop="isInWarehouse"
 							v-if="outsourceForm.isFirstTask != 1">
@@ -107,26 +113,17 @@
 
 						</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">
 							<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="date" v-model="outsourceForm.requireDeliveryTime" />
+							<uni-datetime-picker type="datetime" v-model="outsourceForm.requireDeliveryTime" />
 						</u-form-item>
 
 
-
-
-
-
 					</u-form>
 
 				</view>
@@ -264,7 +261,8 @@
 		data() {
 			return {
 				isOperate: false,
-				
+				sceneText:'',
+				outsourceScene:null,
 				btnsList: [],
 				btnState: 1,
 
@@ -403,6 +401,40 @@
 		},
 
 		methods: {
+				//委外到 类型选择
+				changeTaskId(e){
+				console.log(this.newStepsList);
+				if(this.newStepsList.length){
+					const id =this.newStepsList[0].sourceTaskId;
+					//isFirstTask 1是首工序 0不是
+					if(this.outsourceForm.isFirstTask){
+						this.sceneText = "首工序";
+						this.outsourceForm.outsourceScene = 1;
+						if(e.sourceTaskId!==id){
+							this.sceneText = "首工序及多工序";
+							this.outsourceForm.outsourceScene = 4;
+						}
+					}else{
+						if(e.sourceTaskId===id){
+							// 单工序
+							this.sceneText = "单工序"
+							this.outsourceForm.outsourceScene = 2;
+						}else{
+							//多工序
+							this.sceneText = "多工序"
+							this.outsourceForm.outsourceScene =3;
+						}
+					}
+					
+				}else{
+					uni.showToast({
+						title: '委外到工序为空',
+						icon: 'none'
+					})
+				}
+			},
+
+			// 委外时间选择
 			
 			//委外到 类型选择
 			changeTaskId(e){
@@ -621,9 +653,8 @@
 					this.isInWarehouse.length > 0 ? this.outsourceForm.isInWarehouse = 1 : this.outsourceForm
 						.isInWarehouse = 0
 				}
-
-	
-
+				this.outsourceForm.requireDeliveryTime = this.outsourceForm.requireDeliveryTime+'00:00:00';
+				console.log(this.outsourceForm,'this.outsourceForm.');
 				let param = {
 					...this.outsourceForm,
 					taskId: this.newTaskObj.currentTaskId,
@@ -632,7 +663,8 @@
 				}
 
 				console.log(param)
-
+				this.sceneText="";//委外场景
+				this.outsourceForm.outsourceScene =null;
 				this.$refs.outsourceListRef.open(param)
 
 

+ 1 - 1
pages/pda/workOrder/extrusionMolding/index.vue

@@ -179,7 +179,7 @@
 
 
 		</view>
-
+		<!-- // 按钮组件 -->
 		<view class="bottom-wrapper">
 			<bottomOperate @operate='operate' @refresh='refresh'
 				:taskObj="{'currentTaskName': currentTaskName || info.taskName, 'currentTaskId': currentTaskId || info.taskId, 'workOrderId' : id , 'existOutsource': existOutsource }"