2

pages/pda/jobBooking/components/jobBom.vue

@@ -9,7 +9,7 @@
 
 
 			<view class="content_table">
-
+             
 
 				<view class="item rx-sc" v-if="Object.prototype.hasOwnProperty.call(item, 'product')">
 					<view class="rx ">

pages/pda/jobBooking/components/packingBom.vue

@@ -9,7 +9,7 @@
 
 			<view class="content_table">
 				<view class="item">
-					<view class="lable rx-cc">包装总数</view>
+					<view class="lable rx-cc">包装总数 </view>
 					<view class="content content_num">
 						<input class="uni-input" v-model="formedNumLast" type='digit'></input>
 						<view class="unit">{{objData.unit}}</view>
@@ -50,7 +50,7 @@
 					<view class="item ww30">数量</view>
 					<view class="item ww50">条码</view>
 					<view class="item ww10 jsColor" @click="calculation()" v-if="clientEnvironmentId != 3">计算</view>
-					<view class="item ww10"  v-if="clientEnvironmentId == 3"></view>
+					<view class="item ww10" v-if="clientEnvironmentId == 3"></view>
 				</view>
 
 				<view class="table">
@@ -190,7 +190,8 @@
 					<u-form labelPosition="left" :model="formData" labelWidth="180" labelAlign="left" class="baseForm">
 
 						<u-form-item label="外包装数:" class="required-form" borderBottom prop="assetType">
-							<input class="uni-input" v-model="formData.wPackNum" style="width: 280rpx;" placeholder="外包装数"></input> /  {{splitList[0].unit}}
+							<input class="uni-input" v-model="formData.wPackNum" style="width: 280rpx;"
+								placeholder="外包装数"></input> / {{splitList[0].unit}}
 						</u-form-item>
 
 					</u-form>
@@ -228,7 +229,6 @@
 	import {
 		packingReport,
 		getPackingReport,
-
 		packingReportRepeat,
 		getPackingReportRepeat
 	} from '@/api/pda/workOrder.js'
@@ -277,7 +277,7 @@
 				formData: {
 					wPackNum: null,
 				},
-					clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
+				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
 
 
 
@@ -289,9 +289,10 @@
 
 		created() {
 			this.formedNumLast = this.objData.formedNumLast
+		
 			this.byCode(),
 
-				this.getPackingDetails()
+			this.getPackingDetails()
 			this.getPackingDetailsTwo()
 		},
 
@@ -327,13 +328,11 @@
 				}
 
 				getPackingReport(param).then(res => {
-
 					this.splitList = res.detailList
 					this.formedNumLast = res.totalQuantity
 					this.quantity = res.quantity
 					this.unit = res.unit
 
-
 				})
 			},
 
@@ -349,7 +348,7 @@
 					return false
 				}
 
-
+        
 
 				if (!this.formedNumLast) {
 					uni.showToast({
@@ -376,7 +375,7 @@
 				}
 
 				let param = {
-					totalQuantity: this.objData.formedNumLast,
+					totalQuantity: this.formedNumLast,
 					quantity: this.quantity,
 					unit: this.unit,
 					workOrderId: this.workOrderId,
@@ -449,7 +448,7 @@
 
 			getPackingDetailsTwo() {
 				let param = {
-					totalQuantity: this.objData.formedNumLast,
+					totalQuantity: this.formedNumLast,
 					quantity: this.quantity,
 					unit: this.unit,
 					workOrderId: this.workOrderId,
@@ -463,8 +462,16 @@
 			},
 
 			handlePack() {
+				let _arr = []
+				_arr = this.temporaryList.map(m => {
+					return {
+						...m,
+						isChecked: 1
+					}
+				})
+
 				let param = {
-					detailList: this.temporaryList,
+					detailList: _arr,
 					quantity: this.temporaryCount,
 					totalQuantity: this.formedNumLast,
 					unit: this.packUnit,
@@ -505,7 +512,7 @@
 			},
 
 			calculationSave() {
-				let count = this.splitList.filter(item => item.check != 1).length;
+				let count = this.splitList.filter(item => item.isChecked != 1).length;
 
 				if (this.formData.wPackNum <= count) {
 					for (let i = 0; i < this.formData.wPackNum; i++) {

pages/pda/sample/index/index.vue

@@ -22,9 +22,9 @@
 					<sampleBom :item='item.quality' v-if='item.quality' :isDetails='false' :turnoverList='item.turnover'
 						:paramList='paramList' @showReuseTurnover='showReuseTurnover = true'></sampleBom>
 
-              
-					<reuseTurnoverBom v-if='showReuseTurnover' :list='item.turnover' :wordItem='item' :sampleList='item.quality && item.quality.sampleList'
-						:reuseNum='item.quality.reuseNum'>
+
+					<reuseTurnoverBom v-if='showReuseTurnover' :list='item.turnover' :wordItem='item'
+						:sampleList='item.quality && item.quality.sampleList' :reuseNum='item.quality.reuseNum'>
 					</reuseTurnoverBom>
 
 
@@ -120,14 +120,14 @@ export default {
 				ids: [this.id],
 				taskId: this.taskId
 			}).then(res => {
-				
+
 
 				this.List = res.map(m => {
 					m.workOrderId = m.id
 					if (m.quality) {
 						m.quality['sampleList'] = []
 						m['reuseTurnover'] = [],
-						m.quality['reuseNum'] = 0
+							m.quality['reuseNum'] = 0
 					} else {
 						this.isLastJob = false
 					}
@@ -213,7 +213,7 @@ export default {
 
 
 
-			
+
 			if (!this.isLastJob) {
 				uni.showToast({
 					icon: 'none',

pages/pda/turnover/components/turnoverBom.vue

@@ -163,7 +163,6 @@
 			handleCheck(index, idx, it) {
 
 
-
 				if (it.quantity <= 0) {
 					uni.showToast({
 						icon: 'none',

pages/pda/warehousing/components/packingBom.vue

@@ -30,9 +30,9 @@
 							{{ it.code }}
 						</view>
 						<view class="item ww10 rx-cc">
-							<image class="check" v-if='it.check' src='@/static/check.png'>
+							<image class="check" v-if='it.isChecked' src='@/static/check.png'>
 							</image>
-							<image class="check" v-if=' !it.check' src='@/static/check_no.png'>
+							<image class="check" v-if=' !it.isChecked' src='@/static/check_no.png'>
 							</image>
 						</view>
 
@@ -76,9 +76,9 @@
 								{{ it.code }}
 							</view>
 							<view class="item ww10 rx-cc">
-								<image class="check" v-if='it.check' src='@/static/check.png'>
+								<image class="check" v-if='it.isChecked' src='@/static/check.png'>
 								</image>
-								<image class="check" v-if=' !it.check' src='@/static/check_no.png'>
+								<image class="check" v-if=' !it.isChecked' src='@/static/check_no.png'>
 								</image>
 							</view>
 
@@ -140,19 +140,19 @@
 				if (this.oneCheck) {
 					this.oneCheck = false
 					this.objData.packingReportList.forEach(e => {
-						e.check = false
+						e.isChecked = false
 					})
 				} else {
 					this.oneCheck = true
 					this.objData.packingReportList.forEach(e => {
-						e.check = true
+						e.isChecked = true
 					})
 				}
 				this.$forceUpdate()
 			},
 
 			handleCheck(idx, it) {
-				this.$set(this.objData.packingReportList[idx], 'check', !it.check)
+				this.$set(this.objData.packingReportList[idx], 'isChecked', !it.isChecked)
 				this.$forceUpdate()
 			},
 
@@ -161,18 +161,18 @@
 				if (this.twoCheck) {
 					this.twoCheck = false
 					this.objData.packingReportMarginList.forEach(e => {
-						e.check = false
+						e.isChecked = false
 					})
 				} else {
 					this.twoCheck = true
 					this.objData.packingReportMarginList.forEach(e => {
-						e.check = true
+						e.isChecked = true
 					})
 				}
 				this.$forceUpdate()
 			},
 			handleCheckTwo(idx, it) {
-				this.$set(this.objData.packingReportMarginList[idx], 'check', !it.check)
+				this.$set(this.objData.packingReportMarginList[idx], 'isChecked', !it.isChecked)
 				this.$forceUpdate()
 			},