66

pages/pda/components/bottomOperate.vue

@@ -31,7 +31,7 @@
 
 
 			<view class="list rx-bc" v-if="newTaskObj.existOutsource == 1">
-				<view class="list_item_btn" @click="operate('jobBooking', {})">委外领料</view>
+				<view class="list_item_btn" @click="operate('outPicking', {})">委外领料</view>
 				<view class="list_item_btn" @click="operate('jobBooking', {})">委外报工</view>
 			</view>
 
@@ -84,7 +84,7 @@
 
 
 
-						<u-form-item label="工艺路线:" borderBottom prop="">
+						<u-form-item label="工艺路线:" borderBottom prop="" v-if="outsourceForm.type != 2">
 							<zxz-uni-data-select :localdata="produceList" v-model="outsourceForm.produceRoutingId"
 								dataValue='id' dataKey="name" filterable format='{name}'></zxz-uni-data-select>
 						</u-form-item>
@@ -98,7 +98,7 @@
 
 
 
-						<u-form-item label="完成时间:" borderBottom prop="requireDeliveryTime">
+						<u-form-item label="计划交期:" borderBottom prop="requireDeliveryTime">
 							<picker mode="date" :value="outsourceForm.requireDeliveryTime" @change="onDateChange">
 								<view class="uni-input">{{ outsourceForm.requireDeliveryTime ||  '选择日期'    }}</view>
 							</picker>

pages/pda/workOrder/extrusionMolding/index.vue

@@ -367,33 +367,36 @@
 						url
 					})
 				} else if (type == 'feeding') {
-					if (this.feedAllow || this.clientEnvironmentId == 3) {
-						url = '/pages/pda/feeding/details'
-						let _arr = JSON.stringify([this.info.id])
-						url += `?arr=${encodeURIComponent(_arr)}&taskId=${taskId }&taskName=${taskName}`
-						uni.navigateTo({
-							url
-						})
-					} else {
-						uni.showToast({
-							title: "已投料，请先报工",
-							icon: "none",
-						})
-					}
+					// 		if (this.feedAllow || this.clientEnvironmentId == 3) {
+      
+					// 		} else {
+					// 			uni.showToast({
+					// 				title: "已投料，请先报工",
+					// 				icon: "none",
+					// 			})
+					// 		}
+					url = '/pages/pda/feeding/details'
+					let _arr = JSON.stringify([this.info.id])
+					url += `?arr=${encodeURIComponent(_arr)}&taskId=${taskId }&taskName=${taskName}`
+					uni.navigateTo({
+						url
+					})
 
 				} else if (type == 'jobBooking') {
-					if (!this.feedAllow || this.clientEnvironmentId == 3) {
-						url = '/pages/pda/jobBooking/index/index'
-						url += `?id=${this.info.id}&taskId=${taskId }&taskName=${taskName}&taskType=${this.currentType}`
-						uni.navigateTo({
-							url
-						})
-					} else {
-						uni.showToast({
-							title: "请先投料",
-							icon: "none",
-						})
-					}
+					// if (!this.feedAllow || this.clientEnvironmentId == 3) {
+					
+					// } else {
+					// 	uni.showToast({
+					// 		title: "请先投料",
+					// 		icon: "none",
+					// 	})
+					// }
+					
+					url = '/pages/pda/jobBooking/index/index'
+					url += `?id=${this.info.id}&taskId=${taskId }&taskName=${taskName}&taskType=${this.currentType}`
+					uni.navigateTo({
+						url
+					})
 
 				} else if (type == 'turnover') {
 					url = '/pages/pda/turnover/index/index'
@@ -462,13 +465,13 @@
 						}
 					})
 				} else if (type == 'outPicking') {
-						url = '/pages/pda/picking/details'
-						let _arr = JSON.stringify([this.info.id])
-						url += `?arr=${encodeURIComponent(_arr)}&taskId=${taskId}&isOutsource=1`
-						uni.navigateTo({
-							url
-						})
-			
+					url = '/pages/pda/picking/details'
+					let _arr = JSON.stringify([this.info.id])
+					url += `?arr=${encodeURIComponent(_arr)}&taskId=${taskId}&isOutsource=1`
+					uni.navigateTo({
+						url
+					})
+
 				}