ysy hai 1 ano
pai
achega
ba5a02b510

+ 4 - 10
pages/pda/components/bottomOperate.vue

@@ -106,13 +106,10 @@
 								dataValue='id' dataKey="name" filterable format='{name}'></zxz-uni-data-select>
 						</u-form-item>
 
-
+             
 
 						<u-form-item label="计划交期:" borderBottom prop="requireDeliveryTime">
-							<picker mode="date" :value="outsourceForm.requireDeliveryTime" @change="onDateChange">
-								<view class="uni-input">{{ outsourceForm.requireDeliveryTime ||  '选择日期'    }}</view>
-							</picker>
-
+							<uni-datetime-picker type="datetime" v-model="outsourceForm.requireDeliveryTime" />
 						</u-form-item>
 
 
@@ -521,10 +518,7 @@
 
 
 
-			onDateChange(e) {
-				this.$set(this.outsourceForm, 'requireDeliveryTime', e.detail.value)
-				this.$forceUpdate()
-			},
+	
 
 			// 工艺路线
 			produceFn() {
@@ -568,7 +562,7 @@
 
 
 
-				this.outsourceForm.requireDeliveryTime = '2025-03-28'
+			
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',

+ 11 - 7
pages/pda/feeding/components/deviceBom.vue

@@ -55,18 +55,19 @@
 
 
 				<view class="item">
+		
 					<view class="lable rx-cc">炉次号</view>
 					<view class="content content_num">
 						<input class="uni-input" v-model="item.extInfo.heatNumber"></input>
 					</view>
-
+                
 					<view v-if="clientEnvironmentId == 2" class="lable rx-cc"
 						:style="Object.prototype.hasOwnProperty.call(item.extInfo, 'turnoverList') && item.extInfo.turnoverList.length > 0 ? 'color: #E6A23C' : 'color: #157A2C'"
 						@click="handleStorage(index)">货位</view>
 
 				</view>
  
-				<view class="item"  v-if="Object.prototype.hasOwnProperty.call(item, 'equipmentLabelJson') && item.equipmentLabelJson.length != 0 && item.equipmentLabelJson[0].SBFL == 1">
+				<view class="item"  v-if="clientEnvironmentId == 2 && Object.prototype.hasOwnProperty.call(item, 'equipmentLabelJson') && item.equipmentLabelJson.length != 0 && item.equipmentLabelJson[0].SBFL == 1">
 					<view class="lable rx-cc">是否封炉</view>
 					<view class="content"> 
 					<u-checkbox-group v-model="item.isSBFL" size="15px" >
@@ -164,6 +165,11 @@
 
 					</view>
 
+		
+		         <u-line color="#2979ff" style="margin: 16rpx 0;"></u-line>
+				   卸货功能
+				 <!--  -->
+		
 				</view>
 
 
@@ -266,9 +272,7 @@
 			handleStorage(idx) {
 				this.listIndex = idx || 0
 
-				if (this.isDetails) {
-					this.turnoverList = JSON.parse(JSON.stringify(this.list[0].extInfo.turnoverList))
-				}
+				this.turnoverList = JSON.parse(JSON.stringify(this.list[0].extInfo.turnoverList)) || this.turnoverList
 				this.popupShow = true
 
 
@@ -279,7 +283,7 @@
 
 
 			handleClose() {
-				this.list[this.listIndex].extInfo.turnoverList = []
+				// this.list[this.listIndex].extInfo.turnoverList = []
 				this.popupShow = false
 				this.listIndex = 0
 
@@ -631,7 +635,7 @@
 			padding: 0 6rpx;
 			height: 48rpx;
 			line-height: 48rpx;
-			width: 128rpx;
+			width: 138rpx;
 			text-align: center;
 			background: #157A2C;
 			font-style: normal;