55

pages/pda/components/bottomOperate.vue

@@ -84,10 +84,10 @@
 							<view v-else>是</view>
 						</u-form-item>
                
-			<!-- 			<u-form-item label="发货仓库:" borderBottom prop="" v-if="isInWarehouse && isInWarehouse.length == 1">
-							<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="warehouseId" >
+								<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="produceRoutingId" v-if="clientEnvironmentId != 2 &&isInWarehouse && isInWarehouse.length == 0">

pages/pda/sample/inspection/index.vue

@@ -27,6 +27,7 @@
 					</view>
 
 
+
 					<diagramLast v-if="item && Object.prototype.hasOwnProperty.call(item, 'lastObj') &&
 						item.workOrderType !=2" :item="item.lastObj"></diagramLast>
 
@@ -116,7 +117,7 @@
 
 				List: [],
 				qualityShow: false,
-				
+
 				qualityForm: {
 					num: null,
 				}
@@ -294,15 +295,25 @@
 			},
 
 			handQuality() {
+				if (Object.prototype.hasOwnProperty.call(this.List[0], 'lastObj') && this.List[0].lastObj.formedNum >
+					0) {} else {
+					uni.showToast({
+						icon: "none",
+						title: "暂无质检合格数",
+					});
+					return false
+				}
 				this.qualityShow = true
 			},
 
 			cancel() {
 				this.qualityShow = false
 			},
-			
+
 			qualityOk() {
-				if(!this.qualityForm.num && this.qualityForm.num < 1) {
+		
+
+				if (!this.qualityForm.num && this.qualityForm.num < 1) {
 					uni.showToast({
 						icon: "none",
 						title: "请先输入质检取样数",
@@ -314,7 +325,7 @@
 					workOrderId: this.id,
 					quantity: this.qualityForm.num
 				}
-				
+
 				qualityQy(param).then(res => {
 					this.$set(this.List[0], 'semiProductList', res)
 					this.qualityShow = false