55

pages/pda/components/bottomOperate.vue

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

pages/pda/feeding/bill/index.vue

@@ -21,7 +21,7 @@
 					<view v-for="(it,idx) in item.orderInfoList" :key="idx">
 						<workOrderBom :item='it' :isDetails='true'></workOrderBom>
 
-						<deviceBom v-if='it.equipmentList.length != 0' :list='it.equipmentList'></deviceBom>
+						<deviceBom v-if='it.equipmentList.length != 0' :list='it.equipmentList' :ishuoWei="false"></deviceBom>
 						
 						
 						<productsBom  v-if="Object.prototype.hasOwnProperty.call(it, 'inProductList') && it.inProductList[0]" :productsObj="it.inProductList[0]"></productsBom>

pages/pda/feeding/components/deviceBom.vue

@@ -60,7 +60,7 @@
 					</view>
 
 					<view v-if="clientEnvironmentId == 2" class="lable rx-cc"
-						:style="Object.prototype.hasOwnProperty.call(item.extInfo, 'positionList') && item.extInfo.positionList.length > 0 ? 'color:S #E6A23C' : 'color: #157A2C'"
+						:style="Object.prototype.hasOwnProperty.call(item.extInfo, 'positionList') && item.extInfo.positionList.length > 0 ? 'color: #E6A23C' : 'color: #157A2C'"
 						@click="handleStorage(index)">货位</view>
 
 				</view>
@@ -76,16 +76,16 @@
 					<u-form labelPosition="left" :model="formData" labelWidth="90" labelAlign="left" class="baseForm">
 
 						<u-form-item label="层数:" class="required-form" borderBottom prop="levelNum">
-							<u-input v-model="formData.levelNum" placeholder="请输入">
+							<u-input v-model="formData.levelNum" :disabled="!ishuoWei" placeholder="请输入">
 							</u-input>
 						</u-form-item>
 
 						<u-form-item label="列数:" class="required-form" borderBottom prop="lineNum">
-							<u-input v-model="formData.lineNum" placeholder="请输入">
+							<u-input v-model="formData.lineNum" :disabled="!ishuoWei" placeholder="请输入">
 							</u-input>
 						</u-form-item>
 
-						<view class="rx-bs" style="margin-top: 6rpx;">
+						<view class="rx-bs" style="margin-top: 6rpx;" v-if="ishuoWei">
 							<u-button size="small" style="width: 260rpx" type="success" @click="handleHjCode()">
 								自动生成
 							</u-button>
@@ -101,7 +101,8 @@
 
 				<view class="content_table2">
 					<view class="head row rx-sc">
-						<view class="item ww70">货位</view>
+						<view class="item ww30">货位</view>
+						<view class="item ww40">数量</view>
 						<view class="item ww30">操作</view>
 
 					</view>
@@ -109,15 +110,20 @@
 						<u-list @scrolltolower="scrolltolower" class="z_list">
 							<view class="tr row rx-sc" v-for="(it, idx) in list[listIndex].extInfo.positionList"
 								:key='idx'>
-								<view class="item ww70 content content_num">
+								<view class="item ww30 content content_num">
 
-									<input class="uni-input" v-model="it.code"></input>
+									<input class="uni-input" :disabled="!ishuoWei" v-model="it.code"></input>
 
 								</view>
 
+								<view class="item ww40 content content_num">
+									<input class="uni-input" :disabled="!ishuoWei" v-model="it.num"></input>
 
-								<view class="ww30 rx-cc" @click="removeGoods(idx)">
-									<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="20"
+								</view>
+
+
+								<view class="ww30 rx-cc" @click="removeGoods(idx)" >
+									<uni-icons custom-prefix="iconfont"  v-if="ishuoWei" type="icon-shanchu" size="20"
 										color="#fa3534"></uni-icons>
 								</view>
 							</view>
@@ -133,7 +139,7 @@
 
 			<template v-slot:operate>
 				<view class="operate_box rx-bc">
-					<u-button size="small" class="u-reset-button" @click="handleClose">
+					<u-button size="small" class="u-reset-button" @click="handleClose" v-if="ishuoWei">
 						清空/取消
 					</u-button>
 
@@ -166,6 +172,11 @@
 				type: Array,
 				default: () => []
 			},
+			
+			ishuoWei: {
+				type: Boolean,
+				default: true
+			}
 
 
 		},
@@ -543,8 +554,8 @@
 				color: $theme-color;
 			}
 
-			.ww70 {
-				width: 70%;
+			.ww40 {
+				width: 40%;
 			}
 
 			.ww30 {

pages/pda/jobBooking/index/index.vue

@@ -9,13 +9,11 @@
 
 				<view class="card_box">
 
-
 					<workOrderBom :item='objData' v-if='objData' @handleScan='handleScan'></workOrderBom>
 
-
 					<paramBom v-if='paramDetailList.length != 0' :list='paramDetailList'></paramBom>
 
-					<deviceBom v-if='objData.equipmentList.length != 0' :list='objData.equipmentList'></deviceBom>
+					<deviceBom v-if='objData.equipmentList.length != 0' :list='objData.equipmentList' :ishuoWei="false"></deviceBom>
 
 					<modelBom v-if='objData.modelList.length != 0' :list='objData.modelList' pattern='job'
 						ref='modelRef'>