优化

pages/pda/components/bottomOperate.vue

@@ -43,10 +43,10 @@
 							<input class="uni-input" v-model="outsourceForm.formedNumLast" type='number'></input>
 						</u-form-item>
 
-						<u-form-item label="完成时间:" borderBottom prop="expectReceiveDate">
+						<u-form-item label="完成时间:" borderBottom prop="requireDeliveryTime">
 
-							<picker mode="date" :value="outsourceForm.expectReceiveDate" @change="onDateChange">
-								<view class="uni-input">{{ outsourceForm.expectReceiveDate ||  '选择日期'    }}</view>
+							<picker mode="date" :value="outsourceForm.requireDeliveryTime" @change="onDateChange">
+								<view class="uni-input">{{ outsourceForm.requireDeliveryTime ||  '选择日期'    }}</view>
 							</picker>
 
 						</u-form-item>
@@ -68,12 +68,12 @@
 					</u-button>
 
 
-					<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk">
+					<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk(0)">
 						提交
 					</u-button>
 
 
-					<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk">
+					<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk(1)">
 						提交并发布
 					</u-button>
 
@@ -215,7 +215,7 @@
 
 
 		created() {
-             this.getTwoTree()
+			this.getTwoTree()
 		},
 
 		methods: {
@@ -260,8 +260,7 @@
 
 					this.outsourceForm = {
 						...res,
-
-						expectReceiveDate: '2024-05-20'
+						requireDeliveryTime: '2024-05-20'
 					}
 
 					console.log(this.outsourceForm)
@@ -285,13 +284,13 @@
 			},
 
 			onDateChange(e) {
-				this.$set(this.outsourceForm, 'expectReceiveDate', e.detail.value)
+				this.$set(this.outsourceForm, 'requireDeliveryTime', e.detail.value)
 
 				this.$forceUpdate()
 			},
 
 
-			outsourceOk() {
+			outsourceOk(isRelease) {
 				if (!this.outsourceForm.name) {
 					uni.showToast({
 						title: '请输入委外名称',
@@ -299,7 +298,7 @@
 					})
 					return false
 				}
-				if (!this.outsourceForm.expectReceiveDate) {
+				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',
 						icon: 'none'
@@ -310,10 +309,12 @@
 				let param = {
 					...this.outsourceForm,
 					taskId: this.newTaskObj.currentTaskId,
-					workOrderId: this.newTaskObj.workOrderId
+					workOrderId: this.newTaskObj.workOrderId,
+					isRelease: isRelease
 				}
 				applyoutsourceSave(param).then(res => {
 					console.log(res)
+					this.outCancel()
 				})
 			},
 

pages/pda/jobBooking/components/jobBom.vue

@@ -201,8 +201,7 @@
 				let weight = Number(this.item.workReportInfo.formedNum) * Number(this.item.singleWeight) * Number(this
 					.item.weightMultiple)
 
-				if (this.item.singleWeightUnit == 'G' || this.item.singleWeightUnit == 'g' || this.item
-					.singleWeightUnit == '克') {
+				if (['G', 'g',  '克' ].includes(this.item.singleWeightUnit)) {
 					weight = parseFloat((weight / 1000).toFixed(2))
 				} else {
 					weight = parseFloat(weight.toFixed(2))
@@ -219,8 +218,7 @@
 
 				let weight = Number(this.notFormedList[0].notFormedNum) * Number(this.item.singleWeight) * Number(this
 					.item.weightMultiple)
-				if (this.item.singleWeightUnit == 'G' || this.item.singleWeightUnit == 'g' || this.item
-					.singleWeightUnit == '克') {
+				if (this.item.singleWeightUnit == 'G' || this.item.singleWeightUnit == 'g' || this.item.singleWeightUnit == '克') {
 					weight = parseFloat((weight / 1000).toFixed(2))
 				} else {
 					weight = parseFloat(weight.toFixed(2))

pages/pda/jobBooking/components/packingBom.vue

@@ -53,7 +53,7 @@
 				</view>
 
 				<view class="table">
-					<u-list @scrolltolower="scrolltolower" class="z_list">
+					<u-list @scrolltolower="scrolltolower" class="z_list" style="height: 100% !important;">
 						<view class="tr row rx-sc" v-for="(it, idx) in splitList" :key='idx'>
 							<view class="item ww10 rx-cc ">{{ it.computeSize }}</view>
 							<view class="item ww30 content_num rx-sc">

pages/pda/jobBooking/index/index.vue

@@ -40,7 +40,6 @@
 					</turnoverBom>
 
 
-
 					<aridRegion v-if='objData.aridRegionList.length != 0' :list='objData.aridRegionList'
 						:remainingTime='remainingTime' @handleScan='handleScan' :isType='true'></aridRegion>
 
@@ -569,7 +568,7 @@
 					bol = this.objData.instanceList.every((e, i) => {
 						_i = i + 1
 
-						return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId
+						return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId && e.extInfo.reportWeight
 					})
 
 					if (!bol) {

pages/pda/outsourcing/index/index.vue

@@ -70,6 +70,7 @@
 				let params = {
 					pageNum: this.page,
 					size: this.size,
+					 workOrderType: 2,
 					status: [4, 5, 6, 7],
 					...this.searchFrom
 				}

pages/pda/sample/components/inspectionBom.vue

@@ -127,7 +127,7 @@
 				this.inspectionList.map(L => {
 					if(Number(L.quantity) > 0 && Number(L.quantity) != NaN && L.id != -1) {
 							this.count = Number(this.count) + Number(L.quantity)
-							this.inspectionList[this.inspectionList.length - 1]['quantity'] = 	this.count
+							this.inspectionList[this.inspectionList.length - 1]['quantity'] = this.count
 					       
 							this.normalQuality['quantity'] = this.count
 					}

pages/pda/sample/inspection/index.vue

@@ -21,7 +21,7 @@
 
 
 
-					<diagramLast :item='item.lastObj' v-if='item'></diagramLast>
+					<diagramLast :item='item.lastObj' v-if='item && item.workOrderType != 2'></diagramLast>
 
 
 					<inspectionBom v-if='inspectionList.length' :inspectionList='inspectionList'
@@ -29,8 +29,6 @@
 
 
 
-
-
 				</view>
 			</u-list>
 		</view>
@@ -139,8 +137,11 @@
 						m.equipmentList = [] // 设备
 						m.modelList = [] // 模具
 						m.aridRegionList = [] // 干燥区
+						
+			
 
-						if (m.normalQuality != null) {
+						if (m.normalQuality != null || m.workOrderType == 2 ) {
+							this.$set(m, 'normalQuality', {})
 							m.normalQuality.quantity = 0
 							m.normalQuality.inspectionId = this.inspectionId
 							m.normalQuality.inspectionName = this.inspectionName
@@ -174,14 +175,14 @@
 
 
 				getLastTreeByPid(this.inspectionId).then(res => {
-
+		
 					this.inspectionList = res
 
 					this.inspectionList.push({
 						id: -1,
 						name: '废品总数量'
 					})
-					
+
 					this.getGualityReview()
 				})
 			},

pages/pda/warehousing/components/packingBom.vue

@@ -23,7 +23,7 @@
 						@click="handleCheck(idx, it)">
 						<view class="item ww10 rx-cc ">{{ idx + 1 }}</view>
 						<view class="item ww30 content_num rx-sc">
-							{{it.packingNum}} / {{ it.unit }} {{it.quantity}}/ {{ it.childList[0].unit }}
+							{{it.packingNum}} {{ it.childList[0].unit }} / {{ it.unit }},{{it.quantity}} {{ measuringUnit}}
 						</view>
 
 						<view class="item ww50">
@@ -71,7 +71,7 @@
 							@click="handleCheckTwo(idx, it)">
 							<view class="item ww10 rx-cc ">{{ it.computeSize }}</view>
 							<view class="item ww30 content_num rx-sc">
-								<view>{{ it.quantity }}/ {{it.unit}} </view>
+								<view>{{ it.quantity }} / {{it.unit}} </view>
 							</view>
 							<view class="item ww50">
 								{{ it.code }}
@@ -110,6 +110,11 @@
 				type: Object,
 				default: () => {}
 			},
+			
+			measuringUnit: {
+				type: String,
+				default: ''
+			}
 
 		},
 		data() {

pages/pda/warehousing/components/workOrderBom.vue

@@ -33,7 +33,6 @@
 
 				<view class="item rx-sc">
 					
-					
 					<view class="rx ww45">
 						<view class="lable rx-cc ww80">牌号</view>
 						<view class="content content_num">

pages/pda/warehousing/index.vue

@@ -17,7 +17,7 @@
 
 					<view class="list_box" v-for="(item, index) in List" :key="index" v-if="clientEnvironmentId != 3">
 						<view class="time">打包时间： {{item.createTime}}</view>
-						<packingBom :objData="item.extInfo"></packingBom>
+						<packingBom :objData="item.extInfo" :measuringUnit='item.measuringUnit'></packingBom>
 					</view>
 
 

pages/pda/workOrder/extrusionMolding/index.vue

@@ -29,8 +29,8 @@
 				</view>
 
 				<view class="item_list rx-bc">
-					<text class="lable">工艺路线版本</text>
-					<text>{{ info.routingVersion }}</text>
+					<text class="lable">工艺路线</text>
+					<text>{{ info.produceRoutingName }}</text>
 				</view>
 
 				<view class="item_list rx-bc">

pages/pda/workOrder/index/index.vue

@@ -70,6 +70,7 @@
 				let params = {
 					pageNum: this.page,
 					size: this.size,
+					workOrderType: 1,
 					status: [4, 5, 6, 7],
 					...this.searchFrom
 				}