优化

api/pda/workOrder.js

@@ -359,7 +359,7 @@ export async function sampleTurnoverReview(params) {
 }
 
 
-// PDA 入库查询
+// PDA  入库查询
 export async function listPDAToWarehouse(params) {
 	const data = await postJ(
 		Vue.prototype.apiUrl + `/pda/mes/workreport/listPDAToWarehouse`, params, true,
@@ -371,6 +371,19 @@ export async function listPDAToWarehouse(params) {
 	return Promise.reject(data.message);
 }
 
+// PDA  碳谷 入库查询
+export async function listPDAToWarehouseTG(params) {
+	const data = await postJ(
+		Vue.prototype.apiUrl + `/pda/mes/workreport/listPDAToWarehouseTG`, params, true,
+	);
+
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}
+
+
 // 根据工单工序查委外信息
 export async function checkOutsource(param) {
 	const data = await get(
@@ -390,3 +403,4 @@ export async function checkOutsource(param) {
 
 
 
+

pages/pda/jobBooking/components/packingTgBom.vue

@@ -1,11 +1,11 @@
 <template>
 	<view>
 		<view class="title_box rx-bc">
-			<view class="name">打包信息： ({{item.packInfo.pickOutInList.length || 0}})个</view>
+			<view class="name">打包信息： ({{ isWarehousing ? list.length : item.packInfo.pickOutInList.length || 0}})个</view>
 		</view>
 
 
-		<view class="material " v-for="(it, idx) in item.packInfo.pickOutInList" :key="idx">
+		<view class="material " v-for="(it, idx) in isWarehousing ? list :  item.packInfo.pickOutInList" :key="idx">
 
 
 			<view class="content_table">
@@ -76,8 +76,8 @@
 					<view class="rx ww50">
 						<view class="lable lable150 rx-cc ">位置</view>
 						<view class="content content_num">
-							<view >{{it.extInfo.position }}</view>
-						
+							<view>{{it.extInfo.position }}</view>
+
 						</view>
 					</view>
 
@@ -103,7 +103,7 @@
 				<view class="table">
 
 					<view class="tr row rx-sc">
-						<view class="item ww25">{{it.extInfo.newWeight    }}
+						<view class="item ww25">{{it.extInfo.newWeight }}
 						</view>
 						<view class="item ww25 content_num">
 							入库
@@ -111,7 +111,7 @@
 
 
 						<view class="item  ww50">
-							<input class="uni-input content_num"  v-model="it.sendCode"></input>
+							<input class="uni-input content_num" v-model="it.sendCode"></input>
 						</view>
 
 
@@ -158,7 +158,10 @@
 			isDetails: {
 				type: Boolean,
 				default: false
-
+			},
+			isWarehousing: {
+				type: Boolean,
+				default: false
 			}
 
 
@@ -167,38 +170,39 @@
 		},
 
 		watch: {
-            list: {
-			immediate: true,
-			deep: true,
-			handler(newVal) {
-				this.item['packInfo'] = {}
-				this.item['packInfo'].pickOutInList = newVal
-				
-			}	
+			list: {
+				immediate: true,
+				deep: true,
+				handler(newVal) {
+					if (this.isWarehousing == false) {
+						this.item['packInfo'] = {}
+						this.item['packInfo'].pickOutInList = newVal
+					}
+
+
+
+				}
 			}
 		},
 
 
 		data() {
 			return {
-				taskTypeName: null,
-				isFirstTask: null,
+
+
 
 
 
 			}
 		},
 		created() {
-			this.taskTypeName = this.item.currentTaskDiagram.taskTypeName
-			this.isFirstTask = this.item.currentTaskDiagram.isFirstTask
-			
-			
 
-		},
-		methods: {
 
 
 
+		},
+		methods: {
+
 
 
 

pages/pda/warehousing/index.vue

@@ -15,11 +15,19 @@
 							dataValue='id' dataKey="name" filterable format='{name}'></zxz-uni-data-select>
 					</view>
 
-					<view class="list_box" v-for="(item, index) in List" :key="index">
+					<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>
 					</view>
 
+
+					<view class="list_box" v-for="(it, index) in tgList" :key="index" v-if="clientEnvironmentId == 3">
+						<view class="time">打包时间： {{it.createTime}}</view>
+						<packingTgBom  :list='it.extInfo.pickOutInList' :isWarehousing='true'></packingTgBom>
+					</view>
+
+
+
 				</view>
 			</u-list>
 		</view>
@@ -43,14 +51,17 @@
 	import {
 		getWarehouseList,
 		listPDAToWarehouse,
+		listPDAToWarehouseTG
 	} from '@/api/pda/workOrder.js'
 
 	import packingBom from './components/packingBom.vue'
 	import workOrderBom from '../feeding/components/workOrderBom.vue'
+	import packingTgBom from '../jobBooking/components/packingTgBom.vue'
 	export default {
 		components: {
 			workOrderBom,
-			packingBom
+			packingBom,
+			packingTgBom
 		},
 		data() {
 			return {
@@ -61,7 +72,13 @@
 				warehouseList: [],
 				warehouseId: null,
 
-				List: []
+				List: [],
+
+				tgList: [],
+
+
+				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
+					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
 			}
 		},
 
@@ -73,21 +90,27 @@
 			this.getList()
 
 			this.getWarehouseListFn()
-			this.getWarehouse()
+
+			if (this.clientEnvironmentId == 3) {
+				this.getTgWarehouse()
+			} else {
+				this.getWarehouse()
+			}
+
 		},
 
 		methods: {
 			getList() {
 				getByIdReport(this.id, this.taskId).then(res => {
 					this.objData = res
-					
+
 					this.objData.workReportInfo = {
 						formingNum: null,
 						formingWeight: null,
 						formedNum: null,
 						formedWeight: null,
 						taskId: this.taskId
-					
+
 					}
 
 				})
@@ -107,12 +130,24 @@
 
 				}
 				listPDAToWarehouse(param).then(res => {
-					console.log(res)
 					this.List = res
+				})
+			},
 
+
+			getTgWarehouse() {
+				let param = {
+					workOrderId: this.id,
+					taskId: this.taskId,
+					workReportId: this.workReportId
+
+				}
+				listPDAToWarehouseTG(param).then(res => {
+					this.tgList = res
 				})
 			},
 
+
 			handleScan() {
 
 			},
@@ -126,12 +161,17 @@
 					})
 					return false
 				}
-				let storageInfo = {
-					warehouseId: this.warehouseId,
-					toWarehouseList: this.List,
+				
+	
 
-				}
-				this.objData['storageInfo'] = storageInfo
+					let storageInfo = {
+						warehouseId: this.warehouseId,
+						toWarehouseList: this.clientEnvironmentId == 3 ? this.tgList : this.List,
+					}
+					this.objData['storageInfo'] = storageInfo
+
+			
+				
 
 
 				jobSave(this.objData).then(res => {