From 95ebe667ddde1f5e668997e8aaef22fd8dc1a90d Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 7 Apr 2025 09:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B7=A5=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/request/assembleIssueRequest.vue | 63 +-----------------
 fe/PDA/pages/request/coatingIssueRequest.vue  | 63 +-----------------
 .../pages/request/injectionIssueRequest.vue   | 66 +------------------
 fe/PDA/pages/request/injectionPlanRequest.vue | 64 +-----------------
 fe/PDA/pages/request/kittingIssueRequest.vue  | 63 +-----------------
 5 files changed, 10 insertions(+), 309 deletions(-)

diff --git a/fe/PDA/pages/request/assembleIssueRequest.vue b/fe/PDA/pages/request/assembleIssueRequest.vue
index 4f116eb60..e77194f37 100644
--- a/fe/PDA/pages/request/assembleIssueRequest.vue
+++ b/fe/PDA/pages/request/assembleIssueRequest.vue
@@ -19,25 +19,6 @@
 			</view>
 		</view>
 		
-		<view class="uni-list" v-if="itemList.length>0">
-			<view class=""
-				style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center;  margin-bottom: 20rpx; ">
-				工位关系
-			</view>
-			<view class="uni-flex" style="flex-wrap: wrap; margin: 10rpx;" >
-				<view   style="width: 30%; display: flex; flex-direction: row;"  v-for="(item, index) in workStationList" :key="index">
-					<view class="uni-flex" style="flex-direction: row; margin: 12rpx;"  @click="checkeClick(item.value)">
-						<view class="">
-							<checkbox :value="item.value" :checked="item.checked" />
-						</view>
-						<view class="">
-							{{item.name}}
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
 
 		<scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail">
 
@@ -115,7 +96,6 @@
 <script>
 	import {
 		assembleIssueRequest,
-		getWorkStationByLocation
 	} from '@/api/index.js';
 
 	import {
@@ -146,7 +126,6 @@
 			return {
 				itemList: [],
 				dataContent: {},
-				workStationList: [],
 			};
 		},
 		props: {
@@ -169,23 +148,6 @@
 		},
 
 		methods: {
-			checkeClick(value) {
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					this.workStationList[i].checked = false
-				}
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					if (this.workStationList[i].value === value) {
-						if (this.workStationList[i].checked == true) {
-							this.workStationList[i].checked = false
-						} else {
-							this.workStationList[i].checked = true
-						}
-					}
-				}
-				this.$forceUpdate()
-			},
 			openScanPopup() {
 				this.$refs.scanPopup.openScanPopup()
 			},
@@ -197,26 +159,6 @@
 				this.itemList.push(result)
 				this.$forceUpdate()
 				
-				getWorkStationByLocation(result.locationCode).then(res => {
-					if (res && res.length > 0) {
-						this.workStationList = []
-						res.forEach(item => {
-							this.workStationList.push({
-								value: item.code,
-								name: item.name,
-								checked: false
-							})
-						})
-						scanSuccessAudio()
-					} else {
-						scanFailedAudio()
-						this.showMessage("获取工位失败")
-					}
-				
-				}).catch(error => {
-					scanFailedAudio()
-					this.showMessage("获取工位失败")
-				})
 
 			},
 
@@ -250,10 +192,9 @@
 
 			},
 			setParams() {
-				var workStation = this.workStationList.find(r => r.checked == true)
 				var param = {
 					worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
-					remark: workStation ? workStation.value : "",
+					remark: "",
 					extraProperties: {},
 					activeDate: getISODateTime(),
 					autoSubmit: true,
@@ -268,7 +209,7 @@
 
 				this.itemList.forEach(res => {
 					var data = {
-						remark: workStation ? workStation.value : "",
+						remark: "",
 						qty:res.qty,
 						itemCode: res.partCode,
 						itemName: res.partName,
diff --git a/fe/PDA/pages/request/coatingIssueRequest.vue b/fe/PDA/pages/request/coatingIssueRequest.vue
index 97ba0c93d..7d0943a5f 100644
--- a/fe/PDA/pages/request/coatingIssueRequest.vue
+++ b/fe/PDA/pages/request/coatingIssueRequest.vue
@@ -19,25 +19,6 @@
 			</view>
 		</view>
 		
-		<view class="uni-list" v-if="itemList.length>0">
-			<view class=""
-				style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center;  margin-bottom: 20rpx; ">
-				工位关系
-			</view>
-			<view class="uni-flex" style="flex-wrap: wrap; margin: 10rpx;" >
-				<view   style="width: 30%; display: flex; flex-direction: row;"  v-for="(item, index) in workStationList" :key="index">
-					<view class="uni-flex" style="flex-direction: row; margin: 12rpx;"  @click="checkeClick(item.value)">
-						<view class="">
-							<checkbox :value="item.value" :checked="item.checked" />
-						</view>
-						<view class="">
-							{{item.name}}
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
 
 		<scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail">
 
@@ -115,7 +96,6 @@
 <script>
 	import {
 		coatingIssueRequest,
-		getWorkStationByLocation
 	} from '@/api/index.js';
 
 	import {
@@ -146,7 +126,6 @@
 			return {
 				itemList: [],
 				dataContent: {},
-				workStationList: [],
 			};
 		},
 		props: {
@@ -169,23 +148,6 @@
 		},
 
 		methods: {
-			checkeClick(value) {
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					this.workStationList[i].checked = false
-				}
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					if (this.workStationList[i].value === value) {
-						if (this.workStationList[i].checked == true) {
-							this.workStationList[i].checked = false
-						} else {
-							this.workStationList[i].checked = true
-						}
-					}
-				}
-				this.$forceUpdate()
-			},
 			openScanPopup() {
 				this.$refs.scanPopup.openScanPopup()
 			},
@@ -196,26 +158,6 @@
 				result.defaultHandleQty=result.qty
 				this.itemList.push(result)
 				this.$forceUpdate()
-				getWorkStationByLocation(result.locationCode).then(res => {
-					if (res && res.length > 0) {
-						this.workStationList = []
-						res.forEach(item => {
-							this.workStationList.push({
-								value: item.code,
-								name: item.name,
-								checked: false
-							})
-						})
-						scanSuccessAudio()
-					} else {
-						scanFailedAudio()
-						this.showMessage("获取工位失败")
-					}
-				
-				}).catch(error => {
-					scanFailedAudio()
-					this.showMessage("获取工位失败")
-				})
 
 			},
 
@@ -249,11 +191,10 @@
 
 			},
 			setParams() {
-				var workStation = this.workStationList.find(r => r.checked == true)
 				
 				var param = {
 					worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
-					remark: workStation ? workStation.value : "",
+					remark: "",
 					extraProperties: {},
 					activeDate: getISODateTime(),
 					autoSubmit: true,
@@ -268,7 +209,7 @@
 
 				this.itemList.forEach(res => {
 					var data = {
-						remark: workStation ? workStation.value : "",
+						remark:  "",
 						qty:res.qty,
 						itemCode: res.partCode,
 						itemName: res.partName,
diff --git a/fe/PDA/pages/request/injectionIssueRequest.vue b/fe/PDA/pages/request/injectionIssueRequest.vue
index 0fa7c9414..b2b3234a6 100644
--- a/fe/PDA/pages/request/injectionIssueRequest.vue
+++ b/fe/PDA/pages/request/injectionIssueRequest.vue
@@ -19,25 +19,6 @@
 			</view>
 		</view>
 		
-		<view class="uni-list" v-if="itemList.length>0">
-			<view class=""
-				style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center;  margin-bottom: 20rpx; ">
-				工位关系
-			</view>
-			<view class="uni-flex" style="flex-wrap: wrap;justify-content: space-between; margin: 10rpx;" >
-				<view   style="width: 30%; display: flex; flex-direction: row;"  v-for="(item, index) in workStationList" :key="index">
-					<view class="uni-flex" style="flex-direction: row; margin: 12rpx;"  @click="checkeClick(item.value)">
-						<view class="">
-							<checkbox :value="item.value" :checked="item.checked" />
-						</view>
-						<view class="">
-							{{item.name}}
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
 
 		<scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail">
 
@@ -115,7 +96,6 @@
 <script>
 	import {
 		injectionIssueRequest,
-		getWorkStationByLocation
 	} from '@/api/index.js';
 
 	import {
@@ -146,7 +126,6 @@
 			return {
 				itemList: [],
 				dataContent: {},
-				workStationList: [],
 			};
 		},
 		props: {
@@ -170,25 +149,6 @@
 
 		methods: {
 
-			checkeClick(value) {
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					this.workStationList[i].checked = false
-				}
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					if (this.workStationList[i].value === value) {
-						if (this.workStationList[i].checked == true) {
-							this.workStationList[i].checked = false
-						} else {
-							this.workStationList[i].checked = true
-						}
-					}
-				}
-				this.$forceUpdate()
-			},
-
-
 			openScanPopup() {
 				this.$refs.scanPopup.openScanPopup()
 			},
@@ -199,27 +159,6 @@
 				result.defaultHandleQty = result.qty
 				this.itemList.push(result)
 				this.$forceUpdate()
-				// result.locationCode APA
-				getWorkStationByLocation(result.locationCode).then(res => {
-					if (res && res.length > 0) {
-						this.workStationList = []
-						res.forEach(item => {
-							this.workStationList.push({
-								value: item.code,
-								name: item.name,
-								checked: false
-							})
-						})
-						scanSuccessAudio()
-					} else {
-						scanFailedAudio()
-						this.showMessage("获取工位失败")
-					}
-
-				}).catch(error => {
-					scanFailedAudio()
-					this.showMessage("获取工位失败")
-				})
 			},
 
 			clear() {
@@ -252,10 +191,9 @@
 
 			},
 			setParams() {
-				var workStation = this.workStationList.find(r => r.checked == true)
 				var param = {
 					worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
-					remark: workStation ? workStation.value : "",
+					remark: "",
 					extraProperties: {},
 					activeDate: getISODateTime(),
 					autoSubmit: true,
@@ -270,7 +208,7 @@
 
 				this.itemList.forEach(res => {
 					var data = {
-						remark: workStation ? workStation.value : "",
+						remark: "",
 						qty: res.qty,
 						itemCode: res.partCode,
 						itemName: res.partName,
diff --git a/fe/PDA/pages/request/injectionPlanRequest.vue b/fe/PDA/pages/request/injectionPlanRequest.vue
index 290bd3a1a..b2a4bd111 100644
--- a/fe/PDA/pages/request/injectionPlanRequest.vue
+++ b/fe/PDA/pages/request/injectionPlanRequest.vue
@@ -16,25 +16,6 @@
 			</view>
 
 		</view>
-		<view class="uni-list" v-if="showList.length>0">
-			<view class=""
-				style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center;  margin-bottom: 20rpx; ">
-				工位关系
-			</view>
-			<view class="uni-flex" style="flex-wrap: wrap;justify-content: space-between; margin: 10rpx;" >
-				<view   style="width: 50%; display: flex; flex-direction: row;"  v-for="(item, index) in workStationList" :key="item.value">
-					<view class="uni-flex" style="flex-direction: row; margin: 12rpx;"  @click="checkeClick(item.value)">
-						<view class="">
-							<checkbox :value="item.value" :checked="item.checked" />
-						</view>
-						<view class="">
-							{{item.name}}
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
 
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
@@ -86,7 +67,6 @@
 		injectionIssuePlanRequestItemCategoryName,
 		injectionIssuePlanRequestItemCategory,
 		locations,
-		getWorkStationByLocation,
 	} from '@/api/index.js';
 
 	import {
@@ -123,7 +103,6 @@
 				toLocationInfo: null,
 				tabIndex: 0,
 				customStyle: "white-space: normal;word-break:break-all",
-				workStationList: [],
 
 
 			};
@@ -157,23 +136,6 @@
 			}
 		},
 		methods: {
-			checkeClick(value) {
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					this.workStationList[i].checked = false
-				}
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					if (this.workStationList[i].value === value) {
-						if (this.workStationList[i].checked == true) {
-							this.workStationList[i].checked = false
-						} else {
-							this.workStationList[i].checked = true
-						}
-					}
-				}
-				this.$forceUpdate()
-			},
 			getCategoryListName() {
 				uni.showLoading({
 					title: "加载中",
@@ -226,26 +188,6 @@
 					uni.hideLoading();
 					if (res) {
 						this.toLocationInfo = res
-						getWorkStationByLocation(res.code).then(res => {
-							if (res && res.length > 0) {
-								this.workStationList = []
-								res.forEach(item => {
-									this.workStationList.push({
-										value: item.code,
-										name: item.name,
-										checked: false
-									})
-								})
-								scanSuccessAudio()
-							} else {
-								scanFailedAudio()
-								this.showMessage("获取工位失败")
-							}
-						
-						}).catch(error => {
-							scanFailedAudio()
-							this.showMessage("获取工位失败")
-						})
 					} else {
 						scanFailedAudio()
 						this.showMessage('目标库位【' + locationCode + '】不存在');
@@ -284,7 +226,6 @@
 				this.toLocationInfo = null,
 				this.tabIndex = 0;
 				this.$refs.comCollapseLocation.clearLocation();
-				this.workStationList=[]
 
 			},
 			submit(item) {
@@ -304,9 +245,8 @@
 					title: "提交中...",
 					mask: true
 				});
-				var workStation = this.workStationList.find(r => r.checked == true)
 				var params = {
-					remark: workStation ? workStation.value : "",
+					remark:  "",
 					worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
 					activeDate: getISODateTime(),
 					useOnTheWayLocation: false,
@@ -316,7 +256,7 @@
 					]
 				}
 				var item = {
-					remark: workStation ? workStation.value : "",
+					remark:  "",
 					itemCode: checked[0].code,
 					itemName: checked[0].name,
 					itemDesc1: checked[0].desc1,
diff --git a/fe/PDA/pages/request/kittingIssueRequest.vue b/fe/PDA/pages/request/kittingIssueRequest.vue
index a2703bae8..7ea887a77 100644
--- a/fe/PDA/pages/request/kittingIssueRequest.vue
+++ b/fe/PDA/pages/request/kittingIssueRequest.vue
@@ -19,25 +19,6 @@
 			</view>
 		</view>
 		
-		<view class="uni-list" v-if="itemList.length>0">
-			<view class=""
-				style="font-size: 40rpx; font-weight: bold; align-items: center; display: flex; justify-content: center;  margin-bottom: 20rpx; ">
-				工位关系
-			</view>
-			<view class="uni-flex" style="flex-wrap: wrap; margin: 10rpx;" >
-				<view   style="width: 30%; display: flex; flex-direction: row;"  v-for="(item, index) in workStationList" :key="index">
-					<view class="uni-flex" style="flex-direction: row; margin: 12rpx;"  @click="checkeClick(item.value)">
-						<view class="">
-							<checkbox :value="item.value" :checked="item.checked" />
-						</view>
-						<view class="">
-							{{item.name}}
-						</view>
-					</view>
-					
-				</view>
-			</view>
-		</view>
 
 		<scroll-view scroll-y="true" @scroll="scroll" class="scroll-detail">
 
@@ -116,7 +97,6 @@
 <script>
 	import {
 		kittingIssueRequest,
-		getWorkStationByLocation
 	} from '@/api/index.js';
 
 	import {
@@ -147,7 +127,6 @@
 			return {
 				itemList: [],
 				dataContent: {},
-				workStationList: [],
 			};
 		},
 		props: {
@@ -173,23 +152,6 @@
 			openScanPopup() {
 				this.$refs.scanPopup.openScanPopup()
 			},
-			checkeClick(value) {
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					this.workStationList[i].checked = false
-				}
-			
-				for (let i = 0; i < this.workStationList.length; i++) {
-					if (this.workStationList[i].value === value) {
-						if (this.workStationList[i].checked == true) {
-							this.workStationList[i].checked = false
-						} else {
-							this.workStationList[i].checked = true
-						}
-					}
-				}
-				this.$forceUpdate()
-			},
 
 			getScanResult(result) {
 				this.dataContent = result;
@@ -197,26 +159,6 @@
 				result.defaultHandleQty = result.qty
 				this.itemList.push(result)
 				this.$forceUpdate()
-				getWorkStationByLocation(result.locationCode).then(res => {
-					if (res && res.length > 0) {
-						this.workStationList = []
-						res.forEach(item => {
-							this.workStationList.push({
-								value: item.code,
-								name: item.name,
-								checked: false
-							})
-						})
-						scanSuccessAudio()
-					} else {
-						scanFailedAudio()
-						this.showMessage("获取工位失败")
-					}
-				
-				}).catch(error => {
-					scanFailedAudio()
-					this.showMessage("获取工位失败")
-				})
 
 			},
 
@@ -250,10 +192,9 @@
 
 			},
 			setParams() {
-				var workStation = this.workStationList.find(r => r.checked == true)
 				var param = {
 					worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
-					remark: workStation ? workStation.value : "",
+					remark:  "",
 					extraProperties: {},
 					activeDate: getISODateTime(),
 					autoSubmit: true,
@@ -268,7 +209,7 @@
 
 				this.itemList.forEach(res => {
 					var data = {
-						remark: workStation ? workStation.value : "",
+						remark: "",
 						qty: res.qty,
 						itemCode: res.partCode,
 						itemName: res.partName,