ysy 1 سال پیش
والد
کامیت
a661c104cd
2فایلهای تغییر یافته به همراه33 افزوده شده و 4 حذف شده
  1. 1 1
      pages/pda/components/bottomOperate.vue
  2. 32 3
      pages/pda/components/outsourceList.vue

+ 1 - 1
pages/pda/components/bottomOperate.vue

@@ -568,7 +568,7 @@
 
 
 
-				// this.outsourceForm.requireDeliveryTime = '2025-03-18'
+				this.outsourceForm.requireDeliveryTime = '2025-03-28'
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',

+ 32 - 3
pages/pda/components/outsourceList.vue

@@ -61,6 +61,12 @@
 							<view>勾选:<text style="color: #157A2C">{{ checkListLen ||  0 }}个</text> </view>
 						</view>
 
+						<u-form labelPosition="left" :model="outObj" labelWidth="180" labelAlign="left" class=""  v-if="checkListLen > 0">
+				     	 <u-form-item label="收货仓库:" borderBottom prop="warehouseId" >
+								<zxz-uni-data-select :localdata="warehouseList" v-model="outObj.warehouseId"
+									dataValue='id' dataKey="name" filterable format='{name}'></zxz-uni-data-select>
+						</u-form-item>  
+					</u-form>
 
 						<checkbox-group v-for="(item, index) in pickOutInList" :key="index"
 							@change="e => selectVal(e, item, index)" v-if="clientEnvironmentId != 2">
@@ -279,8 +285,12 @@
 <script>
 	import {
 		checkOutsourceMaterial,
-		applyoutsourceSave
+		applyoutsourceSave,
+		getWarehouseList
 	} from '@/api/pda/workOrder.js'
+
+
+
 	import {
 		tableHeader
 	} from '../common.js'
@@ -321,7 +331,9 @@
 
 
 				seletedAll: false, //全选状态
-				checkListLen: 0
+				checkListLen: 0,
+
+				warehouseList: []
 			}
 		},
 
@@ -341,6 +353,7 @@
 				this.actTab = '物品清单',
 
 				this.outsourceMaterialFn()
+				this.getWarehouseFn()
 				this.show = true
 			},
 
@@ -375,6 +388,15 @@
 				})
 			},
 
+			
+			// 仓库 
+			getWarehouseFn() {
+				getWarehouseList().then(res => {
+					this.warehouseList = res
+				})
+			},
+
+
 			handTab(item) {
 				this.actTab = item.name
 			},
@@ -454,6 +476,14 @@
 			},
 
 			handOK(isRelease) {
+
+				if(this.checkListLen > 0 && !this.outObj.warehouseId) {
+					 uni.showToast({
+						title: "请选择仓库",
+						icon: "none"
+					})
+					return
+				}
 				let param = {
 					...this.outObj,
 					isRelease: isRelease,
@@ -462,7 +492,6 @@
 					materialList: this.materialList,
 					standardOutputList: this.standardOutputList,
 				}
-
 				applyoutsourceSave(param).then(res => {
 					uni.showToast({
 						title: "提交成功",