From bc41f05b4ac92f2606845b750fa95985c4f41681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 13 Sep 2024 17:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/axis-application.vue | 35 ++++++++++++++++++++++++-------
 pages/manage/bake-process.vue     | 10 ++++-----
 pages/manage/raw-foil-progess.vue |  2 +-
 utils/mork2.js                    |  4 ++++
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/pages/manage/axis-application.vue b/pages/manage/axis-application.vue
index 12a6315..0892c91 100644
--- a/pages/manage/axis-application.vue
+++ b/pages/manage/axis-application.vue
@@ -8,7 +8,15 @@
 						<span class="filter_label">分切设备</span>
 					</view>
 					<view class="zd-col-17 filter_select">
-						<uni-data-select v-model="index1" :localdata="options1"></uni-data-select>
+						<uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">分切位置</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<zxz-uni-data-select v-model="index3" filterable :localdata="options3"></zxz-uni-data-select>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -58,7 +66,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th>分切设备</th>
+								<th>分切位置</th>
 								<th>左/右卷</th>
 								<th>管芯规格</th>
 								<th>管芯类型</th>
@@ -80,7 +88,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !index1 || !index2 || picker1 === '' || picker2 === '' || picker3 === ''}" @tap="toSave">暂存</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !index3 || !index2 || picker1 === '' || picker2 === '' || picker3 === ''}" @tap="toSave">暂存</button>
 			<button class="zd-col-8 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_requestTubeShaft">请求套轴</button>
 		</view>
 	</view>
@@ -89,8 +97,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	// import {getSlitterDeviceBox, gxgetGxSpecification} from '@/utils/mork2.js'
-	import {getSlitterDeviceBox, gxgetGxSpecification, requestTubeShaft} from '@/utils/getData2.js'
+	// import {getSlitterDeviceBox, gxgetGxSpecification, devicePointQuery} from '@/utils/mork2.js'
+	import {getSlitterDeviceBox, gxgetGxSpecification, devicePointQuery, requestTubeShaft} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -103,6 +111,8 @@
 				index1: '',
 				options2: [],
 				index2: '',
+				options3: [],
+				index3: '',
 				range1: [{value: '1', text: '左卷'}, {value: '2', text: '右卷'}],
 				picker1: '',
 				range2: [{value: '1', text: '纸管'}, {value: '2', text: 'FRP管'}],
@@ -127,6 +137,16 @@
 				let res = await gxgetGxSpecification()
 				this.options2 = [...res]
 			},
+			selectChange (e) {
+				this.index3 = ''
+				if (e) {
+					this._devicePointQuery(e)
+				}
+			},
+			async _devicePointQuery (e) {
+				let res = await devicePointQuery(e)
+				this.options3 = [...res]
+			},
 			pickerChange1 (e) {
 				this.picker1 = e.detail.value
 			},
@@ -137,7 +157,7 @@
 				this.picker3 = e.detail.value
 			},
 			toSave () {
-				if (!this.index1 || !this.index2 || this.picker1 === '' || this.picker2 === '' || this.picker3 === '') {
+				if (!this.index3 || !this.index2 || this.picker1 === '' || this.picker2 === '' || this.picker3 === '') {
 					return
 				}
 				let point_name = ''
@@ -153,7 +173,7 @@
 					}
 				})
 				let obj = {
-					point_code: this.index1,
+					point_code: this.index3,
 					point_name: point_name,
 					left_or_right: this.range1[this.picker1].value,
 					material_code: this.index2,
@@ -183,6 +203,7 @@
 			clearUp () {
 				this.index1 = ''
 				this.index2 = ''
+				this.index3 = ''
 				this.picker1 = ''
 				this.picker2 = ''
 				this.picker3 = ''
diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue
index 894a03f..4b3512c 100644
--- a/pages/manage/bake-process.vue
+++ b/pages/manage/bake-process.vue
@@ -67,19 +67,19 @@
 					<view class="zd-col-7">
 						<span class="filter_label">母卷号</span>
 					</view>
-					<view class="zd-col-17 filter_msg">{{obj.order_code}}</view>
+					<view class="zd-col-17 filter_msg">{{obj.container_name}}</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">烘烤状态</span>
 					</view>
-					<view class="zd-col-17 filter_msg">{{obj.is_baking}}</view>
+					<view class="zd-col-17 filter_msg">{{obj.status}}</view>
 				</view>
 				<view class="zd-row">
 					<view class="zd-col-7">
 						<span class="filter_label">提示</span>
 					</view>
-					<view class="zd-col-17 filter_msg">{{obj.msg}}</view>
+					<view class="zd-col-17 filter_msg">{{obj.tip}}</view>
 				</view>
 			</view>
 		</view>
@@ -111,7 +111,7 @@
 				isChecked: false,
 				val3: '',
 				val4: '',
-				obj: {order_code: '-', is_baking: '-', msg: '-'},
+				obj: {container_name: '-', status: '-', tip: '-'},
 				disabled: false
 			};
 		},
@@ -149,7 +149,7 @@
 				this.isChecked = false
 				this.val3 = ''
 				this.val4 = ''
-				this.obj = {order_code: '-', is_baking: '-', msg: '-'}
+				this.obj = {container_name: '-', status: '-', tip: '-'}
 				this.disabled = false
 			},
 			async _bakingQuality (type) {
diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue
index 059e725..ee77eb6 100644
--- a/pages/manage/raw-foil-progess.vue
+++ b/pages/manage/raw-foil-progess.vue
@@ -25,7 +25,7 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">流转单号</span>
+						<span class="filter_label">母卷号</span>
 					</view>
 					<view class="zd-col-17">
 						<input v-model="val2" type="text" class="filter_input">
diff --git a/utils/mork2.js b/utils/mork2.js
index 49ccd63..de5e12f 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -25,4 +25,8 @@ export const getSlitterDeviceBox = () => {
 export const gxgetGxSpecification = () => {
 	let res = [{"text":"纸制筒管|纸管|3英寸|680","value":"482210000000013"},{"text":"1500*182.4*152.4*15*0*2","value":"482210000000014"}]
 	return res
+}
+export const devicePointQuery = () => {
+	let res = [{"text":"A1_FQ_01","value":"A10FQ00001"},{"text":"A1_FQ_02","value":"A10FQ00002"},{"text":"A1_FQ_03","value":"A10FQ00003"},{"text":"A1_FQ_04","value":null},{"text":"A1_FQ_05","value":null},{"text":"A1_FQ_06","value":null},{"text":"A1_FQ_07","value":null},{"text":"A1_FQ_08","value":null},{"text":"A1_FQ_09","value":null},{"text":"A1_FQ_10","value":null},{"text":"A1_FQ_11","value":null},{"text":"A1_FQ_12","value":null}]
+	return res
 }
\ No newline at end of file