From 9ff20598c088b31edc1bb46a60fc7c84144691d9 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 26 Jun 2023 18:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=BA=BF=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/management/hcxcheck.vue                 | 42 ++++++++++---------
 .../uni-data-select/uni-data-select.vue       | 14 +++++--
 utils/getData2.js                             |  3 +-
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue
index 5ed6756..8491677 100644
--- a/pages/management/hcxcheck.vue
+++ b/pages/management/hcxcheck.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<nav-bar title="缓存线盘点"></nav-bar>
 		<view class="search-confirm-wrap">
-			<view class="search-wrap">
+			<view class="search-wrap search-wrap_1">
 				<view class="search-item">
 					<label class="search-label">生产区域</label>
 					<view class="filter_input_wraper">
@@ -60,12 +60,6 @@
 							/>
 						</view>
 					</view>
-					<!-- <view class="search-item">
-						<label class="search-label">工序</label>
-						<view class="filter_input_wraper">
-							<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
-						</view>
-					</view> -->
 					<view class="search-item">
 						<label class="search-label">物料</label>
 						<view class="filter_input_wraper" @tap="searchMater">
@@ -108,6 +102,12 @@
 							<input type="text" class="search-input-l" v-model="obj.seat_order_num" disabled>
 						</view>
 					</view>
+					<view class="search-item">
+						<label class="search-label">工序</label>
+						<view class="filter_input_wraper">
+							<uni-data-select v-model="index3" :localdata="options3" :selectUp="true" @change="selectChange3"></uni-data-select>
+						</view>
+					</view>
 				</view>
 				<view class="confirm-button-wrap">
 					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !val6 || !val7}" :disabled="disabled1" @tap="_setfullBox">设为满框</button>
@@ -157,7 +157,7 @@
 		},
 		created () {
 			this._getCacheLine('A1')
-			// this._workprocedureQuery()
+			this._workprocedureQuery()
 		},
 		destroyed () {
 			this.$store.dispatch('setPublicObj', '')
@@ -203,6 +203,10 @@
 			async _workprocedureQuery () {
 				let res = await workprocedureQuery()
 				this.options3 = [...res]
+				this.options3.map(el => {
+					this.$set(el, 'text', el.workprocedure_name)
+					this.$set(el, 'value', el.workprocedure_code)
+				})
 			},
 			toSearch () {
 				this.val1 = ''
@@ -222,11 +226,11 @@
 				this.active = true
 				this.obj = e
 				this.val1 = this.obj.vehicle_code
-				// this.options3.map(el => {
-				// 	if (Number(el.workprocedure_code) === Number(e.workprocedure_code)) {
-				// 		this.index3 = el.value
-				// 	}
-				// })
+				this.options3.map(el => {
+					if (el.workprocedure_code === e.workprocedure_code) {
+						this.index3 = el.value
+					}
+				})
 				this.val2 = this.obj.material_code
 				this.val3 = this.obj.material_name
 				this.val4 = this.obj.material_spec
@@ -353,7 +357,6 @@
 	z-index 100
 	background-color #fff
 	_fj()
-	overflow hidden
 .overlay
 	position fixed
 	bottom 0
@@ -367,9 +370,10 @@
 .delHeight
 	transition height .2s linear
 	height 0
-.search-item
-	&:nth-child(1),&:nth-child(2)
-		width 30%
-	&:nth-child(3)
-		width 36%
+.search-wrap_1
+	.search-item
+		&:nth-child(1),&:nth-child(2)
+			width 30%
+		&:nth-child(3)
+			width 36%
 </style>
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index 2c2a9ac..a0a9d3a 100644
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -10,8 +10,8 @@
 					<uni-icons v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
 				</view>
 				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
-				<view class="uni-select__selector" v-if="showSelector">
-					<view class="uni-popper__arrow"></view>
+				<view class="uni-select__selector" :class="{'uni-select__selector_up': selectUp === true}" v-if="showSelector">
+					<view class="uni-popper__arrow" :style="selectUp ? 'display: none' : ''"></view>
 					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
 						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
 							<text>{{emptyTips}}</text>
@@ -88,7 +88,11 @@
 			format: {
 				type: String,
 				default: ''
-			},
+			},
+			selectUp: {
+				type: Boolean,
+				default: false
+			}
 		},
 		data() {
 			return {
@@ -410,6 +414,10 @@
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 		z-index: 3;
 		padding: 4px 0;
+	}
+	.uni-select__selector_up {
+		top: auto;
+		bottom: calc(100% + 12px);
 	}
 
 	.uni-select__selector-scroll {
diff --git a/utils/getData2.js b/utils/getData2.js
index 91c3e4c..368372d 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -79,9 +79,10 @@ export const inOutExceptionInstConfirm = (wcode, vcode, type) => request({
 /** 缓存线盘点 */
 // 1.1工序下拉框查询
 export const workprocedureQuery = () => request({
-	url:'api/cacheLineHand/workprocedureQuery',
+	url:'api/cacheLineHand/getWorkprocedure',
 	data: {}
 })
+
 // 1.2缓存线盘点-缓存线物料信息盘点
 export const getCacheLineMaterialInfo = (area, code) => request({
 	url:'api/cacheLineHand/getCacheLineMaterialInfo',