55

pages/pda/components/bottomOperate.vue

@@ -76,18 +76,20 @@
 								:clear='true'></zxz-uni-data-select>
 						</u-form-item>
 
-
-						<u-form-item label="直接入库:" borderBottom prop="isInWarehouse">
-							<u-checkbox-group v-model="isInWarehouse" size="14px" v-if="clientEnvironmentId != 2 ">
+                  
+						<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>
+							<view v-if="clientEnvironmentId == 2 " >是</view>
+
+
+							<zxz-uni-data-select  style="margin-left: 10px;" v-if="clientEnvironmentId == 2 || isInWarehouse.length" :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">
@@ -540,7 +542,7 @@
 
 
 
-				this.outsourceForm.requireDeliveryTime = '2025-03-18'
+				// this.outsourceForm.requireDeliveryTime = '2025-03-18'
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',

pages/pda/components/outsourceList.vue

@@ -24,7 +24,7 @@
 					
 					<view class="item_one  perce50 rx-sc">
 						<view class="lable">直接入库：</view>
-						<view style="color: #157A2C">{{ outObj.isStraight == 1 ? '是' : '否' }}</view>
+						<view style="color: #157A2C">{{ outObj.isInWarehouse == 1 ? '是' : '否' }}</view>
 					</view>
 
 				</view>
@@ -167,7 +167,7 @@
 											<text>数量</text>{{ item.count * ( checkListLen || 1 )    }}
 										</view>
 										<view class="items content_num" v-if="!item.isDemandQuantity && clientEnvironmentId != 2">
-											<text>数量</text> <input style="8rpx !important"
+											<text>数量</text> <input style="8px !important"
 												v-model="item.demandQuantity"></input>
 										</view>