优化

pages/pda/components/bottomOperate.vue

@@ -48,6 +48,21 @@
 							<input class="uni-input" v-model="outsourceForm.formedNumLast" type='number'></input>
 						</u-form-item>
 
+						<u-form-item label="委外类型:" borderBottom prop="">
+							<zxz-uni-data-select :localdata="typeList" v-model="outsourceForm.type" dataValue='id'
+								dataKey="name" filterable format='{name}'></zxz-uni-data-select>
+						</u-form-item>
+
+
+						<u-form-item label="发货仓库:" borderBottom prop="" v-if="outsourceForm.type == 2">
+							<zxz-uni-data-select :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 prop="">
 							<zxz-uni-data-select :localdata="produceList" v-model="outsourceForm.produceRoutingId"
@@ -56,7 +71,6 @@
 
 
 						<u-form-item label="完成时间:" borderBottom prop="requireDeliveryTime">
-
 							<picker mode="date" :value="outsourceForm.requireDeliveryTime" @change="onDateChange">
 								<view class="uni-input">{{ outsourceForm.requireDeliveryTime ||  '选择日期'    }}</view>
 							</picker>
@@ -101,7 +115,8 @@
 		getTwoTreeByPid,
 		checkOutsource,
 		applyoutsourceSave,
-		producerouting
+		producerouting,
+		getWarehouseList
 	} from '@/api/pda/workOrder.js'
 
 	import SearchPopup from './searchPopup.vue'
@@ -240,6 +255,22 @@
 				outsourceForm: {},
 
 				produceList: [],
+				warehouseList: [],
+
+				typeList: [{
+						id: 1,
+						name: '生产中需要采购参与的委外'
+					},
+					{
+						id: 2,
+						name: '仓库直接发货的委外'
+					},
+					{
+						id: 3,
+						name: '生产中不需要采购参与的委外'
+					},
+
+				]
 
 
 
@@ -309,6 +340,7 @@
 					if (res.outsource) {
 						this.outsourceShow = true
 						this.produceFn()
+						this.getWarehouseFn()
 					} else {
 						uni.showToast({
 							title: '此工序不能委外',
@@ -342,6 +374,13 @@
 				})
 			},
 
+			// 仓库 
+			getWarehouseFn() {
+				getWarehouseList().then(res => {
+					this.warehouseList = res
+				})
+			},
+
 
 			outsourceOk(isRelease) {
 				if (!this.outsourceForm.name) {
@@ -351,7 +390,17 @@
 					})
 					return false
 				}
-				
+
+
+				if (!this.outsourceForm.type) {
+					uni.showToast({
+						title: '请选择委外类型',
+						icon: 'none'
+					})
+					return false
+				}
+
+
 				if (!this.outsourceForm.produceRoutingId) {
 					uni.showToast({
 						title: '请选择工艺路线',
@@ -359,7 +408,7 @@
 					})
 					return false
 				}
-				
+
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',
@@ -367,8 +416,8 @@
 					})
 					return false
 				}
-				
-				
+
+
 
 				let param = {
 					...this.outsourceForm,
@@ -376,7 +425,7 @@
 					workOrderId: this.newTaskObj.workOrderId,
 					isRelease: isRelease
 				}
-		
+
 				applyoutsourceSave(param).then(res => {
 					console.log(res)
 					this.outCancel()

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -47,7 +47,7 @@
 				<view class="item rx-sc">
 					<view class="rx ww50 ">
 						<view class="lable lable150 rx-cc ">物料代号</view>
-						<view class="content content_num">
+						<view class="content content_num">-
 							<view v-if='isDetails'>{{it.extInfo.materielCode }}</view>
 							<input class="uni-input" v-else v-model="it.extInfo.materielCode"></input>
 
@@ -124,7 +124,6 @@
 							<zxz-uni-data-select :localdata="stepsList" v-model="it.extInfo.taskId" dataValue='taskId'
 								format='{taskTypeName}' dataKey="taskId" filterable   @change=" e => it.extInfo.taskName = e.taskTypeName" 
 								:clear='false'></zxz-uni-data-select>
-
 						</view>