55

pages/pda/components/bottomOperate.vue

@@ -77,19 +77,20 @@
 						</u-form-item>
 
 
-						<u-form-item label="仓库直发:" borderBottom prop="isStraight">
-							<u-checkbox-group v-model="isStraight" size="14px">
+						<u-form-item label="直接入库:" borderBottom prop="isInWarehouse">
+							<u-checkbox-group v-model="isInWarehouse" size="14px" v-if="clientEnvironmentId != 2 ">
 								<u-checkbox labelSize="14px" iconSize="10px" activeColor="#157A2C" name="true" label="是"></u-checkbox>
 							</u-checkbox-group>
+							<view v-else>是</view>
 						</u-form-item>
                
-						<u-form-item label="发货仓库:" borderBottom prop="" v-if="isStraight && isStraight.length == 1">
+			<!-- 			<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> -->
 
 
-						<u-form-item label="工艺路线:" borderBottom prop="produceRoutingId" v-if=" isStraight && isStraight.length == 0">
+						<u-form-item label="工艺路线:" borderBottom prop="produceRoutingId" v-if="clientEnvironmentId != 2 &&isInWarehouse && isInWarehouse.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>
@@ -356,7 +357,7 @@
 				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
 					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
 					
-					isStraight: []
+					isInWarehouse: []
 
 
 
@@ -547,7 +548,12 @@
 					})
 					return false
 				}
-				this.isStraight.length > 0 ? this.outsourceForm.isStraight = 1 :   this.outsourceForm.isStraight = 0
+				if(this.clientEnvironmentId == 2) {
+					this.outsourceForm.isInWarehouse = 1
+				} else {
+				 this.isInWarehouse.length > 0 ? this.outsourceForm.isInWarehouse = 1 :   this.outsourceForm.isInWarehouse = 0
+				}
+			
 				let param = {
 					...this.outsourceForm,
 					taskId: this.newTaskObj.currentTaskId,

pages/pda/components/outsourceList.vue

@@ -6,14 +6,9 @@
 			<view class="card_box">
 
 				<view class="item_box rx-bc">
-					<view class="item_one  perce50 rx-sc">
+					<view class="item_one   rx-sc">
 						<view class="lable">委外名称：</view>
-						<view>{{ outObj.name }}</view>
-					</view>
-
-					<view class="item_one  perce50 rx-sc">
-						<view class="lable">委外类型：</view>
-						<view>{{ outObj.type == 4 ? '带料委外' : '无料委外' }}</view>
+						<view style="color: #157A2C">{{ outObj.name }}</view>
 					</view>
 
 
@@ -21,9 +16,15 @@
 				</view>
 
 				<view class="item_box rx-bc">
+					
+					<view class="item_one  perce50 rx-sc">
+						<view class="lable">委外类型：</view>
+						<view style="color: #157A2C">{{ outObj.type == 4 ? '带料委外' : '无料委外' }}</view>
+					</view>
+					
 					<view class="item_one  perce50 rx-sc">
-						<view class="lable">仓库直发：</view>
-						<view>{{ outObj.isStraight == 1 ? '是' : '否' }}</view>
+						<view class="lable">直接入库：</view>
+						<view style="color: #157A2C">{{ outObj.isStraight == 1 ? '是' : '否' }}</view>
 					</view>
 
 				</view>
@@ -47,7 +48,7 @@
 				<u-list @scrolltolower="scrolltolower" class="z_list">
 
 					<view v-if="actTab == '物品清单'">
-						<view class="rx-bc" v-if="outObj.isStraight != 1">
+						<view class="rx-bc" v-if="outObj.isStraight != 1 && clientEnvironmentId != 2">
 							<view style="margin-left: 24rpx">
 								<checkbox v-if="!seletedAll" color="#fff" :checked="seletedAll" @tap="_seletedAll">全选
 								</checkbox>
@@ -62,8 +63,8 @@
 
 
 						<checkbox-group v-for="(item, index) in pickOutInList" :key="index"
-							@change="e => selectVal(e, item, index)">
-							<label class="listBox rx-bs">
+							@change="e => selectVal(e, item, index)" v-if="clientEnvironmentId != 2">
+							<label class="listBox rx-bs" >
 
 								<view class="listBox-sel">
 									<checkbox
@@ -162,10 +163,18 @@
 											<text>{{ itm.label }}</text>{{ item[itm.prop] }}
 										</view>
 
-										<view class="items" v-if="item.isDemandQuantity">
+										<view class="items" v-if="item.isDemandQuantity && clientEnvironmentId != 2">
 											<text>数量</text>{{ item.count * ( checkListLen || 1 )    }}
 										</view>
-										<view class="items content_num" v-if="!item.isDemandQuantity">
+										<view class="items content_num" v-if="!item.isDemandQuantity && clientEnvironmentId != 2">
+											<text>数量</text> <input style="8rpx !important"
+												v-model="item.demandQuantity"></input>
+										</view>
+										
+										<view class="items" v-if="item.isDemandQuantity && clientEnvironmentId == 2">
+											<text>数量</text>{{ item.count * ( outObj.formedNumLast || 1 )    }}
+										</view>
+										<view class="items content_num" v-if="!item.isDemandQuantity && clientEnvironmentId == 2">
 											<text>数量</text> <input style="8rpx !important"
 												v-model="item.demandQuantity"></input>
 										</view>
@@ -320,6 +329,7 @@
 		methods: {
 			open(obj) {
 				this.outObj = obj
+				this.actTab = '物品清单',
 
 				this.outsourceMaterialFn()
 				this.show = true
@@ -441,6 +451,10 @@
 				}
 
 				applyoutsourceSave(param).then(res => {
+					uni.showToast({
+						title: "提交成功",
+						icon: "none"
+					})
 					this.$emit('close', true)
 					this.checkListLen = 0
 					this.close()