优化

pages/pda/common.js

@@ -23,21 +23,17 @@ export const tableHeader = selectEquiType => {
 				},
 				{
 					label: '模孔数量',
-					prop: ''
+					prop: 'dieHoleNum'
 				},
 
 				{
 					label: '芯棒直径',
-					prop: ''
+					prop: 'mandrelDiameter'
 				},
 				{
 					label: '收缩系数',
-					prop: '',
-					formatter(row) {
-						if (!row?.extendField) return ''
-						const extendField = JSON.parse(row.extendField)
-						return extendField.shrinkageCoefficient
-					}
+					prop: 'shrinkEffictive',
+
 				},
 			]
 
@@ -45,26 +41,23 @@ export const tableHeader = selectEquiType => {
 		case 7:
 			return [{
 					label: '规格',
-					prop: 'specification'
+					prop: 'modelType'
 				},
 				{
 					label: '材质',
-					prop: 'texture',
-					formatter(row) {
-						if (!row?.extendField) return ''
-						const extendField = JSON.parse(row.extendField)
-						return extendField.texture
-					}
+					prop: 'materialQuality',
+
 				},
 				{
 					label: '长宽高',
 					prop: '',
 					formatter(row) {
-						if (!row?.extendField) return ''
-						const extendField = JSON.parse(row.extendField)
-						return `${extendField.length || '-'}*${extendField.width || '-'}*${
-											  extendField.high || '-'
+						if (!row?.extInfo) return ''
+						const extendField = row.extInfo
+						return `${extendField.vehicleLen || '-'}*${extendField.wilde || '-'}*${
+											  extendField.hight || '-'
 											}`
+
 					}
 				}
 			]
@@ -81,7 +74,7 @@ export const tableHeader = selectEquiType => {
 				},
 				{
 					label: '槽数',
-					prop: ''
+					prop: 'slotNum'
 				},
 
 
@@ -89,23 +82,23 @@ export const tableHeader = selectEquiType => {
 					label: '长宽高',
 					prop: '',
 					formatter(row) {
-						if (!row?.extendField) return ''
-						const extendField = JSON.parse(row.extendField)
-						return `${extendField.length || '-'}*${extendField.width || '-'}*${
-              extendField.high || '-'
+						if (!row?.extInfo) return ''
+						const extendField = row.extInfo
+						return `${extendField.palletLen || '-'}*${extendField.wilde || '-'}*${
+              extendField.hight || '-'
             }`
 					}
 				}
 			]
 		case 10:
 			return []
-			
-	    case 11:
+
+		case 11:
 			return [
-			
-			
+
+
 			]
-				
+
 		case 14:
 			return []
 

pages/pda/components/bottomOperate.vue

@@ -5,17 +5,17 @@
 			<image class="open_icon" :class="{open_icon_reversal : isOperate}" src="~@/static/pda/open.svg"></image>
 		</view>
 
-         
+
 		<view class="operate_list" v-show="isOperate">
 			<view v-for="(item, index) in btnList[state]" :key="index" class="list rx-bc" @click="operate(item.type)">
 				<view class="round">{{index + 1}}</view>
 				<view class="name">{{item.name}}</view>
 				<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
 			</view>
-			
-			
 
-			
+
+
+
 		</view>
 
 
@@ -33,25 +33,25 @@
 		props: {
 			state: String,
 
-			
+
 		},
 
-	  watch: {
-		btns: {
-			immediate: true,
-			deep: true,
-			handler(newVal) {
-				this.btnsList = []
-			  this.btnsList = newVal
-			}
-		},  
-	  },
+		watch: {
+			btns: {
+				immediate: true,
+				deep: true,
+				handler(newVal) {
+					this.btnsList = []
+					this.btnsList = newVal
+				}
+			},
+		},
 
 		data() {
 			return {
 				isOperate: false,
 
-                btnsList: [],
+				btnsList: [],
 				btnList: {
 					'1': [{
 							name: '领料',
@@ -65,7 +65,10 @@
 							name: '报工',
 							type: 'jobBooking'
 						},
-						{ name: '更换周转车', type: 'turnover'}
+						{
+							name: '更换周转车',
+							type: 'turnover'
+						}
 
 
 					]

pages/pda/jobBooking/index/index.vue

@@ -444,13 +444,13 @@
 					})
 					return false
 				}
-				if (!this.objData.workReportInfo['formedWeight'] && this.objData.workReportInfo['formedWeight'] != 0) {
-					uni.showToast({
-						title: '请输入合格品重量',
-						icon: 'none'
-					})
-					return false
-				}
+				// if (!this.objData.workReportInfo['formedWeight'] && this.objData.workReportInfo['formedWeight'] != 0) {
+				// 	uni.showToast({
+				// 		title: '请输入合格品重量',
+				// 		icon: 'none'
+				// 	})
+				// 	return false
+				// }
 
 
 				if (!this.objData.workReportInfo['formedWeight'] && this.objData.workReportInfo['formedWeight'] != 0) {

pages/pda/picking/bill/components/common.js

@@ -26,21 +26,17 @@ export const tableHeader = selectEquiType => {
 				},
 				{
 					label: '模孔数量',
-					prop: ''
+					prop: 'dieHoleNum'
 				},
 
 				{
 					label: '芯棒直径',
-					prop: ''
+					prop: 'mandrelDiameter'
 				},
 				{
 					label: '收缩系数',
-					prop: '',
-					formatter(row) {
-						if (!row?.extendField) return ''
-						const extendField = JSON.parse(row.extendField)
-						return extendField.shrinkageCoefficient
-					}
+					prop: 'shrinkEffictive',
+
 				},
 			]
 
@@ -50,26 +46,23 @@ export const tableHeader = selectEquiType => {
 					label: '规格',
 					prop: 'specifications'
 				},
-				{
-					label: '材质',
-					prop: 'texture',
-					formatter(row) {
-						if (!row?.extendField) return ''
-						const extendField = JSON.parse(row.extendField)
-						return extendField.texture
-					}
-				},
-				{
-					label: '长宽高',
-					prop: '',
-					formatter(row) {
-						if (!row?.extendField) return ''
-						const extendField = JSON.parse(row.extendField)
-						return `${extendField.length || '-'}*${extendField.width || '-'}*${
-											  extendField.high || '-'
-											}`
-					}
+			{
+				label: '材质',
+				prop: 'materialQuality',
+			
+			},
+			{
+				label: '长宽高',
+				prop: '',
+				formatter(row) {
+					if (!row?.extInfo) return ''
+					const extendField = row.extInfo
+					return `${extendField.vehicleLen || '-'}*${extendField.wilde || '-'}*${
+										  extendField.hight || '-'
+										}`
+			
 				}
+			}
 			]
 
 
@@ -80,23 +73,23 @@ export const tableHeader = selectEquiType => {
 				},
 				{
 					label: '型号',
-					prop: 'model'
+					prop: 'modelType'
 				},
 				{
 					label: '槽数',
-					prop: ''
+					prop: 'slotNum'
 				},
 
 
-				{
+			{
 					label: '长宽高',
 					prop: '',
 					formatter(row) {
-						if (!row?.extendField) return ''
-						const extendField = JSON.parse(row.extendField)
-						return `${extendField.length || '-'}*${extendField.width || '-'}*${
-              extendField.high || '-'
-            }`
+						if (!row?.extInfo) return ''
+						const extendField = row.extInfo
+						return `${extendField.palletLen || '-'}*${extendField.wilde || '-'}*${
+			  extendField.hight || '-'
+			}`
 					}
 				}
 			]

pages/pda/picking/bill/components/instanceBom.vue

@@ -3,7 +3,7 @@
 
 
 		<view class="material rx-ss" v-for="(mate, idx) in list">
-		
+
 			<view class="content_table">
 				<view class="item">
 					<view class="lable rx-cc">编码</view>
@@ -18,20 +18,26 @@
 				</view>
 
 
-				<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" :key="index">
+				<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" :key="index"
+					v-if="!itm.formatter">
 					<view class="lable rx-cc">{{ itm.label }}</view>
 					<view class="content">{{ mate[itm.prop] }}</view>
 
 				</view>
 
+				<view v-for="(itm, index) in tableH(item.rootCategoryLevelId)" :key="index" class="items"
+					v-if="itm.formatter">
+					{{ itm.label }}：{{ itm.formatter(item) }}
+				</view>
+
+
 
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="mate.demandQuantity"
-							type="digit"></input>
+						<input class="uni-input" v-model="mate.demandQuantity" type="digit"></input>
 						<view class="unit" v-if='mate.unit'>/{{mate.unit}}</view>
-					
+
 					</view>
 				</view>
 
@@ -66,7 +72,7 @@
 				return tableHeader(type)
 			},
 
-		
+
 		}
 	}
 </script>
@@ -75,9 +81,9 @@
 	.material {
 		margin-top: 10rpx;
 
-	
 
-	
+
+
 
 		.content_table {
 			width: 702rpx;

pages/pda/picking/components/instanceBom.vue

@@ -31,10 +31,10 @@
 					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
 						<input class="uni-input" v-model="mate.demandQuantity"
-							@blur='mate.demandQuantity > mate.availableCountBase ?  mate.demandQuantity = mate.availableCountBase : mate.demandQuantity'
+							@blur='mate.demandQuantity > mate.packingCountBase ?  mate.demandQuantity = mate.packingCountBase : mate.demandQuantity'
 							type="digit"></input>
 						<view class="unit">/{{mate.unit}}</view>
-						<view>&nbsp;&nbsp; (库存:{{ mate.availableCountBase }})</view>
+						<view>&nbsp;&nbsp; (库存:{{ mate.packingCountBase }})</view>
 					</view>
 				</view>
 

pages/pda/workOrder/extrusionMolding/index.vue

@@ -134,7 +134,7 @@
 		</view>
 
 		<view class="bottom-wrapper">
-			<bottomOperate state='1' @operate='operate' :btns='btns'></bottomOperate>
+			<bottomOperate state='1' @operate='operate' ></bottomOperate>
 		</view>
 
 	</view>
@@ -175,7 +175,7 @@
 				currentTaskId: null,
 				currentTaskName: null,
 				
-				btns: []
+			
 			}
 		},
 
@@ -248,8 +248,7 @@
 			selectStep(item) {
 				this.currentTaskId = item.taskId
 				this.currentTaskName  = item.taskTypeName
-				this.btns = item?.btns || []
-				console.log(this.btns)
+				
 				this.feedStatus()
 			},
 

pages/pda/workOrder/search/index.vue

@@ -42,12 +42,21 @@
 
 							<view class="listBox-bottom rx">
 								<view v-for="(itm, index) in tableH(item.rootCategoryLevelId)" :key="index"
-									class="items">
+									class="items" v-if="!itm.formatter">
 									{{ itm.label }}：{{ item[itm.prop] }}
 								</view>
+								
+								<view v-for="(itm, index) in tableH(item.rootCategoryLevelId)" :key="index"
+									class="items" v-if="itm.formatter">
+									{{ itm.label }}：{{  itm.formatter(item) }}
+								</view>
+								
+								
+								
+								
 
 								<view class="items" v-if='item.rootCategoryLevelId != 11'>
-									可用库存：{{ item.availableCountBase }} {{item.unit}}
+									可用库存：{{ item.packingCountBase }} {{item.unit}}
 								</view>
 								
 								<view class="items" v-if='item.rootCategoryLevelId == 11'>