44

pages/pda/components/bottomOperate.vue

@@ -73,18 +73,18 @@
 
 
 						<u-form-item label="仓库直发:" borderBottom prop="isStraight">
-							<u-checkbox-group v-model="outsourceForm.isStraight" size="14px">
+							<u-checkbox-group v-model="isStraight" size="14px">
 								<u-checkbox labelSize="14px" iconSize="10px" activeColor="#157A2C" name="true" label="是"></u-checkbox>
 							</u-checkbox-group>
 						</u-form-item>
                
-						<u-form-item label="发货仓库:" borderBottom prop="" v-if="outsourceForm.isStraight && outsourceForm.isStraight.length == 1">
+						<u-form-item label="发货仓库:" borderBottom prop="" v-if="isStraight && isStraight.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="produceRoutingId" v-if=" outsourceForm.isStraight && outsourceForm.isStraight.length == 0">
+						<u-form-item label="工艺路线:" borderBottom prop="produceRoutingId" v-if=" isStraight && isStraight.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>
@@ -128,7 +128,7 @@
 			</template>
 		</SearchPopup>
 		
-		<outsourceList  ref="outsourceListRef"></outsourceList>
+		<outsourceList  ref="outsourceListRef" @close="outCancel()"></outsourceList>
 
 	</view>
 </template>
@@ -149,7 +149,9 @@
 	
 	import outsourceList from './outsourceList.vue'
 		
-
+	import {
+		EventBus
+	} from '@/utils/eventBus.js'
 
 
 	export default {
@@ -348,6 +350,8 @@
 
 				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
 					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
+					
+					isStraight: []
 
 
 
@@ -383,7 +387,7 @@
 
 					this.outsourceForm = {
 						...res,
-				    isStraight: []
+				    
 
 					}
 					this.outsourceForm.name = this.taskObj.currentTaskName + '委外'
@@ -453,6 +457,7 @@
 			},
 			outCancel() {
 				this.outsourceShow = false
+				EventBus.$off('outEvent');
 			},
 
 			getNewSteps() {
@@ -537,7 +542,7 @@
 					})
 					return false
 				}
-				
+				this.isStraight.length > 0 ? this.outsourceForm.isStraight = 1 :   this.outsourceForm.isStraight = 0
 				let param = {
 					...this.outsourceForm,
 					taskId: this.newTaskObj.currentTaskId,
@@ -545,6 +550,8 @@
 					isRelease: isRelease
 				}
 				
+				console.log(param)
+				
 				this.$refs.outsourceListRef.open(param)
         
 

pages/pda/components/outsourceList.vue

@@ -16,8 +16,22 @@
 						<view>{{ outObj.type == 4 ? '带料委外' : '无料委外' }}</view>
 					</view>
 
+
+
 				</view>
 
+				<view class="item_box rx-bc">
+					<view class="item_one  perce50 rx-sc">
+						<view class="lable">仓库直发：</view>
+						<view>{{ outObj.isStraight == 1 ? '是' : '否' }}</view>
+					</view>
+
+				</view>
+				
+				
+
+
+
 			</view>
 
 			<u-tabs :list="tabList" @click="handTab" lineWidth="30" lineColor="#157A2C" :activeStyle="{
@@ -33,7 +47,7 @@
 				<u-list @scrolltolower="scrolltolower" class="z_list">
 
 					<view v-if="actTab == '物品清单'">
-						<view class="rx-bc">
+						<view class="rx-bc" v-if="outObj.isStraight != 1">
 							<view style="margin-left: 24rpx">
 								<checkbox v-if="!seletedAll" color="#fff" :checked="seletedAll" @tap="_seletedAll">全选
 								</checkbox>
@@ -54,7 +68,7 @@
 								<view class="listBox-sel">
 									<checkbox
 										v-if=' (item.rootCategoryLevelId != 11 || (item.rootCategoryLevelId == 11 && item.status != 1))'
-										:value="item.code" color="#fff" :disabled="item.disabled"
+										:value="item.code" color="#fff" :disabled="outObj.isStraight == 1"
 										:checked="item.checked" />
 								</view>
 
@@ -149,7 +163,7 @@
 										</view>
 
 										<view class="items" v-if="item.isDemandQuantity">
-											<text>数量</text>{{ item.demandQuantity  }}
+											<text>数量</text>{{ item.count * ( checkListLen || 1 )    }}
 										</view>
 										<view class="items content_num" v-if="!item.isDemandQuantity">
 											<text>数量</text> <input style="8rpx !important"
@@ -343,7 +357,7 @@
 			},
 
 			close() {
-				EventBus.$off('outEvent');
+
 				this.show = false
 			},
 
@@ -421,15 +435,16 @@
 					...this.outObj,
 					isRelease: 0,
 					bomMaterialList: this.bomMaterialList,
-					pickOutInList: this.pickOutInList.filter(f => f.checked == true) ,
+					pickOutInList: this.pickOutInList.filter(f => f.checked == true),
 					materialList: this.materialList,
 					standardOutputList: this.standardOutputList,
 				}
-          
+
 				applyoutsourceSave(param).then(res => {
-				 this.$emit('close', true)
-				   this.close()
-				 
+					this.$emit('close', true)
+					this.checkListLen = 0
+					this.close()
+
 				})
 			},
 		}