From 6b27ca5c094ddc34379bba998112b2ec531475cc Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 21 May 2024 17:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=82=E7=BA=BF=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/modules/man-paichan.vue |  18 +---
 pages/modules/wire-board.vue  |  29 +++++--
 utils/getData2.js             |   5 ++
 utils/mork2.js                | 149 ++++++++++++++++++++++++++++++++++
 4 files changed, 177 insertions(+), 24 deletions(-)

diff --git a/pages/modules/man-paichan.vue b/pages/modules/man-paichan.vue
index 7791033..f9ed0c9 100644
--- a/pages/modules/man-paichan.vue
+++ b/pages/modules/man-paichan.vue
@@ -22,7 +22,7 @@
 								<td class="fontcol1">{{e.workorder_code}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
-								<td><view class="fontbg" :class="'fontbg' + e.workorder_status">{{textState(e.workorder_status)}}</view></td>
+								<td>{{e.workorder_status}}</td>
 								<td>{{e.operator}}</td>
 								<td>{{e.create_name}}</td>
 								<!-- <td><input class="td_input" type="number" v-model="e.plan_qty"></td> -->
@@ -60,22 +60,6 @@
 			this._manualSortingOrders()
 		},
 		methods: {
-			textState (e) {
-				switch (e) {
-					case '1':
-						return '未生产'
-						break
-					case '3':
-						return '生产中'
-						break
-					case '4':
-						return '暂停'
-						break
-					default:
-						return ''
-						break
-				}
-			},
 			/** grid查询 */
 			async _manualSortingOrders () {
 				let res = await manualSortingOrders()
diff --git a/pages/modules/wire-board.vue b/pages/modules/wire-board.vue
index bdf419c..ebda583 100644
--- a/pages/modules/wire-board.vue
+++ b/pages/modules/wire-board.vue
@@ -6,7 +6,7 @@
 				<view class="filter_item">
 					<view class="filter_label">点位编码</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val1">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -41,27 +41,29 @@
 		<view class="zd-row submit-bar_new">
 			<button class="zd-col-5 submit-button_c" @tap="toClear">清空</button>
 			<button class="zd-col-5 submit-button_c" @tap="_coatedWireIntoStorageTaskShow">刷新</button>
-			<button class="zd-col-13 submit-button_new" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_coatedWireIntoStorageTask">确认</button>
+			<button class="zd-col-13 submit-button_new" :class="{'btn-disabled': !index1 || !val2}" :disabled="disabled" @tap="_coatedWireIntoStorageTask">确认</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {coatedWireIntoStorageTaskShow, coatedWireIntoStorageTask} from '@/utils/getData2.js'
+	import {getPointList, coatedWireIntoStorageTaskShow, coatedWireIntoStorageTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar
 		},
 		data() {
 			return {
+				options1: [],
+				index1: '',
 				dataList: [],
 				disabled: false,
-				val1: '',
 				val2: ''
 			};
 		},
 		created () {
+			this._getPointList()
 			this._coatedWireIntoStorageTaskShow()
 		},
 		methods: {
@@ -84,23 +86,36 @@
 						break
 				}
 			},
+			selectChange1 (e) {
+				this.index1 = e
+			},
+			/** 下拉框查询 */
+			async _getPointList () {
+				let res = await getPointList()
+				res.map(el => {
+					this.$set(el, 'value', el.point_code)
+					this.$set(el, 'text', el.point_name)
+				})
+				this.options1 = [...res]
+				console.log(this.options1)
+			},
 			/** grid查询 */
 			async _coatedWireIntoStorageTaskShow () {
 				let res = await coatedWireIntoStorageTaskShow()
 				this.dataList = [...res]
 			},
 			toClear () {
-				this.val1 = ''
+				this.index1 = ''
 				this.val2 = ''
 			},
 			async _coatedWireIntoStorageTask () {
 				this.disabled = true
-				if (!this.val1 || !this.val2) {
+				if (!this.index1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await coatedWireIntoStorageTask(this.val1, this.val2)
+					let res = await coatedWireIntoStorageTask(this.index1, this.val2)
 					this.disabled = false
 					this._coatedWireIntoStorageTaskShow()
 					uni.showToast({
diff --git a/utils/getData2.js b/utils/getData2.js
index 64f6a59..0ccf7fd 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -44,6 +44,11 @@ export const productionComplete = (code, user) => request({
 /**
  * 涂板线
  */
+// 点位编码列表
+export const getPointList = () => request({
+	url:'api/pda/getPointList',
+	data: {}
+})
 // 数据
 export const coatedWireIntoStorageTaskShow = () => request({
 	url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow',
diff --git a/utils/mork2.js b/utils/mork2.js
index f6b92ba..b589253 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -50,6 +50,155 @@ export const manualSortingOrders = () => {
 ]
 	return res
 }
+export const getPointList = () => {
+	let res = [
+    {
+        "point_code": "PTX01DJW01",
+        "point_name": "普涂线01对接位01",
+        "region_code": "TBX",
+        "region_name": "涂板线区域",
+        "point_type": "2",
+        "point_status": null,
+        "can_material_type": null,
+        "can_vehicle_type": "1",
+        "vehicle_max_qty": 0,
+        "vehicle_type": null,
+        "vehicle_code": null,
+        "vehicle_qty": 0,
+        "block_num": 0,
+        "row_num": 0,
+        "col_num": 0,
+        "layer_num": 0,
+        "in_order_seq": 0,
+        "out_order_seq": 0,
+        "in_empty_seq": 0,
+        "out_empty_seq": 0,
+        "parent_point_code": "PTX01",
+        "ext_point_code": null,
+        "ing_task_code": null,
+        "is_has_workder": false,
+        "workshop_code": "A1",
+        "is_auto": true,
+        "remark": null,
+        "is_used": true,
+        "create_id": "1",
+        "create_name": "管理员",
+        "create_time": "2023-11-14 17:42:30",
+        "update_id": null,
+        "update_name": null,
+        "update_time": null
+    },
+    {
+        "point_code": "PTX02DJW02",
+        "point_name": "普涂线02对接位02",
+        "region_code": "TBX",
+        "region_name": "涂板线区域",
+        "point_type": "2",
+        "point_status": null,
+        "can_material_type": null,
+        "can_vehicle_type": "1",
+        "vehicle_max_qty": 0,
+        "vehicle_type": null,
+        "vehicle_code": null,
+        "vehicle_qty": 0,
+        "block_num": 0,
+        "row_num": 0,
+        "col_num": 0,
+        "layer_num": 0,
+        "in_order_seq": 0,
+        "out_order_seq": 0,
+        "in_empty_seq": 0,
+        "out_empty_seq": 0,
+        "parent_point_code": "PTX02",
+        "ext_point_code": null,
+        "ing_task_code": null,
+        "is_has_workder": false,
+        "workshop_code": "A1",
+        "is_auto": true,
+        "remark": null,
+        "is_used": true,
+        "create_id": "1",
+        "create_name": "管理员",
+        "create_time": "2023-11-14 17:42:30",
+        "update_id": null,
+        "update_name": null,
+        "update_time": null
+    },
+    {
+        "point_code": "PTX03DJW03",
+        "point_name": "普涂线03对接位03",
+        "region_code": "TBX",
+        "region_name": "涂板线区域",
+        "point_type": "2",
+        "point_status": null,
+        "can_material_type": null,
+        "can_vehicle_type": "1",
+        "vehicle_max_qty": 0,
+        "vehicle_type": null,
+        "vehicle_code": null,
+        "vehicle_qty": 0,
+        "block_num": 0,
+        "row_num": 0,
+        "col_num": 0,
+        "layer_num": 0,
+        "in_order_seq": 0,
+        "out_order_seq": 0,
+        "in_empty_seq": 0,
+        "out_empty_seq": 0,
+        "parent_point_code": "PTX03",
+        "ext_point_code": null,
+        "ing_task_code": null,
+        "is_has_workder": false,
+        "workshop_code": "A1",
+        "is_auto": true,
+        "remark": null,
+        "is_used": true,
+        "create_id": "1",
+        "create_name": "管理员",
+        "create_time": "2023-11-14 17:42:30",
+        "update_id": null,
+        "update_name": null,
+        "update_time": null
+    },
+    {
+        "point_code": "PTX04DJW04",
+        "point_name": "普涂线04对接位04",
+        "region_code": "TBX",
+        "region_name": "涂板线区域",
+        "point_type": "2",
+        "point_status": null,
+        "can_material_type": null,
+        "can_vehicle_type": "1",
+        "vehicle_max_qty": 0,
+        "vehicle_type": null,
+        "vehicle_code": null,
+        "vehicle_qty": 0,
+        "block_num": 0,
+        "row_num": 0,
+        "col_num": 0,
+        "layer_num": 0,
+        "in_order_seq": 0,
+        "out_order_seq": 0,
+        "in_empty_seq": 0,
+        "out_empty_seq": 0,
+        "parent_point_code": "PTX04",
+        "ext_point_code": null,
+        "ing_task_code": null,
+        "is_has_workder": false,
+        "workshop_code": "A1",
+        "is_auto": true,
+        "remark": null,
+        "is_used": true,
+        "create_id": "1",
+        "create_name": "管理员",
+        "create_time": "2023-11-14 17:42:30",
+        "update_id": null,
+        "update_name": null,
+        "update_time": null
+    }
+]
+	return res
+}
 export const coatedWireIntoStorageTaskShow = () => {
 	let res = [{"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"1","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"2","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"3","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"4","remark":"普涂线01对接位01"}]
 	return res