优化

pages/pda/components/bottomOperate.vue

@@ -13,9 +13,9 @@
 				<view class="name">{{item.name}}</view>
 				<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
 			</view>
-			
-		
-			<view  v-if='btnControlReportMethod == 2' class="list rx-bc">
+
+
+			<view v-if='btnControlReportMethod == 2' class="list rx-bc">
 				<view class="round">{{btnList[btnState].length + 1}}</view>
 				<view class="name" @click="operate('skip', {})" skip>跳过(不报工)</view>
 				<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
@@ -48,6 +48,13 @@
 							<input class="uni-input" v-model="outsourceForm.formedNumLast" type='number'></input>
 						</u-form-item>
 
+
+						<u-form-item label="工艺路线:" borderBottom prop="">
+							<zxz-uni-data-select :localdata="produceList" v-model="outsourceForm.produceRoutingId"
+								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">
@@ -94,7 +101,7 @@
 		getTwoTreeByPid,
 		checkOutsource,
 		applyoutsourceSave,
-
+		producerouting
 	} from '@/api/pda/workOrder.js'
 
 	import SearchPopup from './searchPopup.vue'
@@ -109,7 +116,7 @@
 		props: {
 			state: String | Number,
 			taskObj: Object,
-			
+
 			controlReportMethod: String | Number,
 
 		},
@@ -131,7 +138,7 @@
 					this.btnState = newVal
 				}
 			},
-			
+
 			controlReportMethod: {
 				immediate: true,
 				deep: true,
@@ -219,7 +226,7 @@
 							name: '报工',
 							type: 'jobBooking'
 						},
-						
+
 
 
 					],
@@ -230,10 +237,9 @@
 				newTaskObj: {},
 				outsourceShow: false,
 
-				outsourceForm: {
-
+				outsourceForm: {},
 
-				},
+				produceList: [],
 
 
 
@@ -255,8 +261,7 @@
 					this.btnList[3] = []
 
 
-					this.btnList[3] = [
-						{
+					this.btnList[3] = [{
 							name: '更换周转车',
 							type: 'qualityTurnover'
 						},
@@ -283,12 +288,12 @@
 
 
 			handOutsource() {
-			
+
 				let param = {
 					taskId: this.newTaskObj.currentTaskId,
 					workOrderId: this.newTaskObj.workOrderId,
-					
-					
+
+
 				}
 				checkOutsource(param).then(res => {
 
@@ -304,6 +309,7 @@
 
 					if (res.outsource) {
 						this.outsourceShow = true
+						this.produceFn()
 					} else {
 						uni.showToast({
 							title: '此工序不能委外',
@@ -324,6 +330,19 @@
 				this.$forceUpdate()
 			},
 
+			// 工艺路线
+			produceFn() {
+				let param = {
+					pageNum: 1,
+					size: -1,
+					routeType: 2
+				}
+				producerouting(param).then(res => {
+					this.produceList = res.list
+
+				})
+			},
+
 
 			outsourceOk(isRelease) {
 				if (!this.outsourceForm.name) {

pages/pda/feeding/components/feedBom.js

@@ -129,14 +129,29 @@ export const tableHeader = selectEquiType => {
 
 		case 14:
 			return []
+			
+			
+			case 2:
+				return [
+				
+			
+					{
+						label: '型号',
+						prop: 'modelType'
+					},
+					{
+						label: '规格',
+						prop: 'specification'
+					},
+					{
+						label: '牌号',
+						prop: 'brandNum'
+					}
+				]
 
 		case 23:
 			return [
-
-				{
-					label: '名称',
-					prop: 'name'
-				},
+			
 
 				{
 					label: '型号',

pages/pda/feeding/components/semiProductBom.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="title_box rx-bc">
-			<view class="name">半成品</view>
+			<view class="name">物料明细 ({{list.length || 0}})个</view>
 			<view class="btn_box rx-cc" v-if="deviceList.length > 1" @click="bindDevice">绑定设备</view>
 		</view>
 
@@ -14,14 +14,16 @@
 				<view class="content_table">
 
 
-					<view class="item rx-sc" v-if='mate.rootCategoryLevelId == 23 && mate.isConsumable == 1'>
+					<view class="item rx-sc"
+						v-if='(mate.rootCategoryLevelId == 23 ||  mate.rootCategoryLevelId == 2) && mate.isConsumable == 1'>
 						<view class="rx ">
 							<view class="lable rx-cc">编码</view>
 							<view class="content">{{ mate.code }}</view>
 						</view>
 					</view>
 
-					<view class="item rx-bc" v-if='mate.rootCategoryLevelId == 23  && mate.isConsumable == 0'
+					<view class="item rx-bc"
+						v-if='(mate.rootCategoryLevelId == 23 ||  mate.rootCategoryLevelId == 2)   && mate.isConsumable == 0'
 						@click="handleCheck(idx, mate)">
 						<view class="rx ">
 							<view class="lable rx-cc">编码</view>
@@ -35,6 +37,11 @@
 					</view>
 
 
+					<view class="item" >
+						<view class="lable rx-cc">名称</view>
+						<view class="content">{{mate.name}}  <text v-if="[2, 23].includes(Number(mate.rootCategoryLevelId))">  ({{mate.rootCategoryLevelId == 2 ? '在制品' :  mate.rootCategoryLevelId == 23 ? '半成品' : '' }}) </text></view>
+					</view>
+
 
 
 
@@ -49,15 +56,17 @@
 						<view class="content">{{ mate.packingCountBase }}/ {{ mate.minUnit}}</view>
 					</view>
 
-                   
+
 					<view class="item rx-sc" v-if='mate.isConsumable == 0'>
 						<view class="rx ww50">
 							<view class="lable  rx-cc">{{ currentTaskDiagram.isFirstTask == 1 ? '物料重量': '上道重量' }}</view>
-							<view class="content" v-if="currentTaskDiagram.isFirstTask == 1" >{{mate.extInfo.weight || 0}} {{ mate.extInfo.weightUnit}} </view>
-							<view class="content" v-if="currentTaskDiagram.isFirstTask == 0" >{{mate.extInfo.newWeight || 0}} {{ mate.extInfo.weightUnit}} </view>
+							<view class="content" v-if="currentTaskDiagram.isFirstTask == 1">
+								{{mate.extInfo.weight || 0}} {{ mate.extInfo.weightUnit}} </view>
+							<view class="content" v-if="currentTaskDiagram.isFirstTask == 0">
+								{{mate.extInfo.newWeight || 0}} {{ mate.extInfo.weightUnit}} </view>
 						</view>
 
- 
+
 						<view class="rx ww50">
 							<view class="lable ww80 rx-cc">刻码</view>
 							<view class="content">{{mate.extInfo.engrave}}</view>
@@ -85,8 +94,8 @@
 						<view class="lable rx-cc">设备</view>
 						<view class="content content_num">
 							<zxz-uni-data-select :localdata="deviceList" v-model="mate.deviceId" dataValue='id'
-								format='{name}-{codeNumber}' @change=" e => mate.deviceName = e.name + e.codeNumber" dataKey="id"
-								filterable :clear='false'></zxz-uni-data-select>
+								format='{name}-{codeNumber}' @change=" e => mate.deviceName = e.name + e.codeNumber"
+								dataKey="id" filterable :clear='false'></zxz-uni-data-select>
 						</view>
 					</view>
 
@@ -141,8 +150,8 @@
 						<u-form-item label="绑定设备:" class="required-form" borderBottom prop="assetType">
 
 							<zxz-uni-data-select :localdata="deviceList" v-model="formData.deviceId" dataValue='id'
-								format='{name}-{codeNumber}' @change="e => formData.deviceName = e.name + e.codeNumber" dataKey="id"
-								filterable :clear='false'></zxz-uni-data-select>
+								format='{name}-{codeNumber}' @change="e => formData.deviceName = e.name + e.codeNumber"
+								dataKey="id" filterable :clear='false'></zxz-uni-data-select>
 
 						</u-form-item>
 
@@ -193,7 +202,7 @@
 				type: Array,
 				default: () => []
 			},
-			
+
 			currentTaskDiagram: {
 				type: Object,
 				default: () => {}
@@ -206,8 +215,8 @@
 				deep: true,
 				handler(newVal) {
 					this.deviceList = newVal
-					
-				
+
+
 				}
 			},
 		},
@@ -236,8 +245,8 @@
 			},
 
 			scrolltolower() {},
-			
-		
+
+
 
 			handleCheck(idx, it) {
 				this.$set(this.list[idx], 'check', !it.check)

pages/pda/feeding/details.vue

@@ -50,16 +50,17 @@
 
 
 
-
 					<view class='flex_btn' @click="openDetails(item.workOrderId)">出库单</view>
 
-
-
-					<view class="operate_box rx-sc">
-						<u-button size="small" class="u-reset-button" type="success"
-							@click="handAdd(item.workOrderId)">手动添加</u-button>
-						<u-button size="small" class="u-reset-button" type="success"
-							@click="scanIt(item.workOrderId)">扫一扫</u-button>
+					<view class="operate_box ">
+					
+							<u-button size="small" class="u-reset-button" type="success"
+								@click="handAdd(item.workOrderId)">手动添加</u-button>
+						
+					
+						   <u-button size="small" class="u-reset-button" type="success"
+						   	@click="scanIt(item.workOrderId)">扫一扫</u-button>
+					 
 					</view>
 				</view>
 			</u-list>
@@ -67,7 +68,7 @@
 		</view>
 
 		<view class="bottom-wrapper">
-			<view class="btn_box" @click="save">一键报工</view>
+			<view class="btn_box" @click="save">一键投料</view>
 		</view>
 
 
@@ -162,7 +163,7 @@
 						let palletList = [] // 舟皿
 						let revolvingDiskList = [] // 周转盘
 						let semiProductList = [] // 半成品
-                        let productionList = [] // 在制品
+           
 
 						selectList.forEach(f => {
 							if (f.rootCategoryLevelId == 4) {
@@ -175,9 +176,7 @@
 							} else if (f.rootCategoryLevelId == 1) {
 								instanceList = instanceList.concat(f)
 
-							}  else if (f.rootCategoryLevelId == 2) {
-								productionList = productionList.concat(f)
-							} 
+							}  
 							
 							else if (f.rootCategoryLevelId == 11) {
 								aridRegionList = aridRegionList.concat(f)
@@ -185,7 +184,7 @@
 								palletList = palletList.concat(f)
 							} else if (f.rootCategoryLevelId == 26) {
 								revolvingDiskList = revolvingDiskList.concat(f)
-							} else if (f.rootCategoryLevelId == 23) {
+							} else if (f.rootCategoryLevelId == 23 || f.rootCategoryLevelId == 2) {
 								semiProductList = semiProductList.concat(f)
 							}
 
@@ -252,7 +251,7 @@
 
 				batchSave(this.List).then(res => {
 
-					uni.navigateTo({
+					uni.redirectTo({
 						url: `/pages/pda/feeding/index/index?feedStatus=1`,
 					});
 
@@ -276,7 +275,7 @@
 						m.palletList = [] // 舟皿
 						m.revolvingDiskList = [] // 周转盘
 						m.semiProductList = [] //半成品
-						m.productionList = [] // 在制品
+					
 
 						if (m.pickOutInList.length > 0) {
 							m.pickOutInList.forEach(f => {
@@ -294,7 +293,7 @@
 									m.palletList.push(f)
 								} else if (f.rootCategoryLevelId == 26) {
 									m.revolvingDiskList.push(f)
-								} else if (f.rootCategoryLevelId == 23) {
+								} else if (f.rootCategoryLevelId == 23 || f.rootCategoryLevelId == 2) {
 									m.semiProductList.push(f)
 								}
 
@@ -594,10 +593,16 @@
 	}
 
 	.operate_box {
-		padding: 10rpx 80rpx;
+	  
+		position: fixed;
+		right: 0;
+		top: 400rpx;
 
 		/deep/ .u-button {
-			width: 160rpx;
+		    margin-top: 20rpx;
+			width: 150rpx;
+			border-radius: 22rpx 0 0 22rpx;
+			opacity: 0.6;
 		}
 	}
 
@@ -619,5 +624,6 @@
 		font-style: normal;
 		font-weight: 400;
 		color: #fff;
+		opacity: 0.6;
 	}
 </style>

pages/pda/jobBooking/components/oneJobQualityBom.vue

@@ -602,7 +602,7 @@
 
 
 	.material {
-		margin-top: 10rpx;
+		margin-top: 16rpx;
 
 
 
@@ -704,7 +704,7 @@
 
 	.content_table2 {
 		width: 100%;
-		margin-top: 16rpx;
+		// margin-top: 16rpx;
 
 
 		.row {

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="title_box rx-bc">
-			<view class="name">半成品 - 报工信息： ({{list.length || 0}})个</view>
+			<view class="name"> 报工信息： ({{list.length || 0}})个</view>
 		</view>
 
 
@@ -26,7 +26,7 @@
 					<view class="rx">
 						<view class="lable lable150 rx-cc ">名称</view>
 						<view class="content rx-sc">
-							<view>{{it.name}}</view>
+							<view>{{it.name}} <text v-if="[2, 23].includes(Number(it.rootCategoryLevelId))">  ({{it.rootCategoryLevelId == 2 ? '在制品' :  it.rootCategoryLevelId == 23 ? '半成品' : '' }}) </text> </view>
 						</view>
 					</view>
 				</view>
@@ -91,19 +91,17 @@
 
 			<view class="content_table2">
 				<view class="head row rx-sc">
-					<view class="item ww25">{{isFirstTask == 1 ? '物料重量' : '工序重量'}} {{it.extInfo.weightUnit}}</view>
+					<view class="item ww25">{{it.extInfo.newWeight ? '工序重量' : '物料重量'  }} {{it.extInfo.weightUnit}}</view>
 					<view class="item ww25">报工重量{{it.extInfo.weightUnit}}</view>
 					<view class="item ww25" v-if="isFirstTask == 1">质检结果
 					</view>
 					<view class="item ww25" :class="[  isFirstTask == 1 ? 'ww25' : 'ww50' ]">处置
 					</view>
-
 				</view>
 
 				<view class="table">
-
 					<view class="tr row rx-sc">
-						<view class="item ww25">{{isFirstTask == 1 ? it.extInfo.weight :   it.extInfo.newWeight }}
+						<view class="item ww25">{{it.extInfo.newWeight ? it.extInfo.newWeight :  it.extInfo.weight  }}
 						</view>
 						<view class="item ww25 content_num">
 							<view v-if='isDetails'>{{it.extInfo.reportWeight }}</view>
@@ -667,7 +665,7 @@
 
 	.content_table2 {
 		width: 100%;
-		margin-top: 16rpx;
+
 
 
 		.row {

pages/pda/workOrder/extrusionMolding/index.vue

@@ -127,7 +127,7 @@
 					<view class="list rx-bc">
 						<view class="title rx-sc">
 							<image class="icon" src="~@/static/pda/target.svg"></image>
-							待投料数量
+							已报工数量
 						</view>
 
 						<view class="rx-ec">

pages/pda/workOrder/index/details.vue

@@ -43,8 +43,8 @@
 
 
 
-					<oneJobQualityBom v-if='objData.instanceList &&  objData.instanceList.length != 0 & taskType == 6'
-						:list='objData.instanceList' :item='objData' :isDetails='true'></oneJobQualityBom>
+					<oneJobQualityBom v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType == 6'
+						:list='objData.semiProductList' :item='objData' :isDetails='true'></oneJobQualityBom>
 
 
 					<byProductBom v-if='objData.productRecycleList.length != 0 ' :list='objData.productRecycleList'
@@ -56,12 +56,9 @@
 					</turnoverBom>
 
 
-
 					<aridRegion v-if='objData.aridRegionList.length != 0' :list='objData.aridRegionList'
 						:remainingTime='0' :isType='true'></aridRegion>
 
-
-
 					<packingTgBom
 						v-if='objData.packInfo && objData.packInfo.pickOutInList &&   objData.packInfo.pickOutInList != 0 && taskType == 4 && clientEnvironmentId == 3 '
 						:list='objData.packInfo.pickOutInList' :isWarehousing='true' :isDetails="true"></packingTgBom>