xiugai

pages/pda/feeding/components/deviceBom.vue

@@ -8,7 +8,7 @@
 				更换设备
 			</view>
 		</view>
-		<u-list @scrolltolower="scrolltolower" class="z_list2">
+		<u-list @scrolltolower="scrolltolower" height="auto" class="z_list2">
 			<view class="material rx-ss" v-for="(item, index) in list" :key='index'>
 
 				<view class="left rx-ss" @click="getDelete(index)" v-if='workOrderId'>
@@ -576,9 +576,10 @@ export default {
 
 
 	.content_table {
-		width: 674rpx;
+		width: 100%;
 		border: 2rpx solid $border-color;
 		margin-bottom: 10rpx;
+		box-sizing: border-box;
 
 		.item {
 			display: flex;
@@ -764,7 +765,8 @@ export default {
 }
 
 .z_list2 {
-	max-height: 700rpx;
+	width: 100%;
+	max-height: 600rpx !important;
 }
 
 .content_num {

pages/pda/jobBooking/components/packingBom.vue

@@ -233,7 +233,7 @@ export default {
 	},
 	created() {
 		// this.formedNumLast = this.objData.product[0].feedQuantity;
-
+		console.log(this.objData,'我是阿打啥啊电话');
 		this.byCode();
 
 		
@@ -282,6 +282,7 @@ export default {
 				res.shift();
 				let data = JSON.parse(JSON.stringify(res));
 				let list = this.groupBy(data, 'code');
+				this.localdataList = [];
 				Object.entries(list).forEach(([key, value]) => {
 					let obj = {
 						text: value[0].name,
@@ -343,6 +344,10 @@ export default {
 				}
 			})
 			this.$nextTick(() => {
+
+
+				console.log(this.DispositionList, '我是啥来着');
+
 				this.$set(this, 'DispositionList', this.newDispositionList);
 			})
 		},

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -461,6 +461,9 @@
 			getSteps() {
 
 				getTaskInstanceList(this.item.workOrderId).then(res => {
+
+					res.pop();
+
 					this.stepsList = res
 				})
 			},

pages/pda/jobBooking/index/index.vue

@@ -48,7 +48,6 @@
 						:item='objData' :list='objData.semiProductList' :equipmentList="objData.equipmentList">
 					</semiProductJobBomPL>
 
-
 					<oneJobQualityBom
 						v-if='objData.semiProductList && objData.semiProductList.length != 0 && taskType == 6 && clientEnvironmentId == 3 && objData.singleReport == 1'
 						:item='objData' :list='objData.semiProductList'></oneJobQualityBom>
@@ -433,6 +432,9 @@ export default {
 		scanData(result, type, id) {
 			if (type == 'wordOrder') {
 				getByCodeReport(result, this.taskId).then(res => {
+
+					
+
 					this.objData = res
 
 					if (!this.objData.hasOwnProperty('turnover')) {
@@ -690,6 +692,9 @@ export default {
 
 		async save(type) {
 
+
+			console.log(type,'type');
+
 			// 验证判断条件
 			this.$isJobExls(1,this.objData);