From d5cd8827ddd25e413d3b7afd504239b13f943d8d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 19 Jul 2024 17:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=B6=82=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     |   8 ++
 pages/home/home.vue            |   7 +-
 pages/modules/coating-line.vue | 137 +++++++++++++++++++++++++++++++++
 pages/modules/wire-board.vue   |   3 +-
 static/image/menu/RF07.png     | Bin 0 -> 1887 bytes
 utils/getData2.js              |  15 ++++
 6 files changed, 165 insertions(+), 5 deletions(-)
 create mode 100644 pages/modules/coating-line.vue
 create mode 100644 static/image/menu/RF07.png

diff --git a/pages.json b/pages.json
index f90d8ee..34b87b6 100644
--- a/pages.json
+++ b/pages.json
@@ -72,6 +72,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/modules/coating-line",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 9ea4e54..857d9e8 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -33,11 +33,12 @@
 				userName: '',
 				menuList: [
 					{id: '1', name: '工单管理', icon: 'RF01', path: '/pages/modules/man-paichan'},
-					{id: '2', name: '涂线板', icon: 'RF02', path: '/pages/modules/wire-board'},
+					{id: '2', name: '普涂线', icon: 'RF02', path: '/pages/modules/wire-board'},
+					{id: '7', name: '连涂线', icon: 'RF07', path: '/pages/modules/coating-line'},
 					{id: '3', name: '物料库存', icon: 'RF03', path: '/pages/modules/mater-inventory'},
 					{id: '4', name: '库存管理', icon: 'RF04', path: '/pages/modules/point-manage'},
-					{id: '5', name: '指令管理', icon: 'RF05', path: '/pages/modules/command-manage'},
-					{id: '6', name: '任务管理', icon: 'RF06', path: '/pages/modules/task-manage'}
+					{id: '5', name: '指令管理', icon: 'RF06', path: '/pages/modules/command-manage'},
+					{id: '6', name: '任务管理', icon: 'RF05', path: '/pages/modules/task-manage'}
 				]
 			};
 		},
diff --git a/pages/modules/coating-line.vue b/pages/modules/coating-line.vue
new file mode 100644
index 0000000..1115623
--- /dev/null
+++ b/pages/modules/coating-line.vue
@@ -0,0 +1,137 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="连涂线"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">点位编码</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">动作</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="item-wrapper">
+				<view class="item-wrap" v-for="(e, i) in dataList" :key="i">
+					<view class="zd-row mgb10">
+						<view class="zd-col-4 item-font-1">点位1:</view>
+						<view class="zd-col-9 item-font-2">{{e.point_name1}}</view>
+						<view class="zd-col-1 item-line-1"></view>
+						<view class="zd-col-9 item-font-3">{{e.point_name2}}</view>
+					</view>
+					<view class="zd-row mgb10">
+						<view class="zd-col-4 item-font-1">点位2:</view>
+						<view class="zd-col-9 item-font-2">{{e.point_name3}}</view>
+						<view class="zd-col-1 item-line-1"></view>
+						<view class="zd-col-9 item-font-3">{{e.point_name4}}</view>
+					</view>
+					<view class="zd-row">
+						<view class="zd-col-3 item-font-1">备注:</view>
+						<view class="zd-col-17 item-font-4">{{e.remark}}</view>
+						<view class="zd-col-4 item-status" :class="'item-status-' + e.task_status">{{textState(e.task_status)}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<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': !index1 || !index2}" :disabled="disabled" @tap="_ltxTask">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {getLtxPointList, coatedWireIntoStorageTaskShow, ltxTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				options1: [],
+				index1: '',
+				options2: [{value: '0', text: '下料'}, {value: '1', text: '上空架'}],
+				index2: '',
+				dataList: [],
+				disabled: false
+			};
+		},
+		created () {
+			this._getLtxPointList()
+			this._coatedWireIntoStorageTaskShow()
+		},
+		methods: {
+			textState (e) {
+				switch (e) {
+					case '1':
+						return '创建'
+						break
+					case '2':
+						return '创建完成'
+						break
+					case '3':
+						return '下发'
+						break
+					case '4':
+						return '执行中'
+						break
+					default:
+						return ''
+						break
+				}
+			},
+			selectChange1 (e) {
+				this.index1 = e
+			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
+			/** 下拉框查询 */
+			async _getLtxPointList () {
+				let res = await getLtxPointList()
+				res.map(el => {
+					this.$set(el, 'value', el.point_code)
+					this.$set(el, 'text', el.point_name)
+				})
+				this.options1 = [...res]
+			},
+			/** grid查询 */
+			async _coatedWireIntoStorageTaskShow () {
+				let res = await coatedWireIntoStorageTaskShow()
+				this.dataList = [...res]
+			},
+			toClear () {
+				this.index1 = ''
+				this.index2 = ''
+			},
+			async _ltxTask () {
+				this.disabled = true
+				if (!this.index1 || !this.index2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await ltxTask(this.index1, this.index2)
+					this.disabled = false
+					this._coatedWireIntoStorageTaskShow()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/modules/wire-board.vue b/pages/modules/wire-board.vue
index ebda583..35ea56d 100644
--- a/pages/modules/wire-board.vue
+++ b/pages/modules/wire-board.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="涂线板"></nav-bar>
+		<nav-bar title="普涂线"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
@@ -97,7 +97,6 @@
 					this.$set(el, 'text', el.point_name)
 				})
 				this.options1 = [...res]
-				console.log(this.options1)
 			},
 			/** grid查询 */
 			async _coatedWireIntoStorageTaskShow () {
diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
new file mode 100644
index 0000000000000000000000000000000000000000..df4e2f4a234a877cb2180ec55ce26e7daa23f6ba
GIT binary patch
literal 1887
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
LC>%T=yfx<^nalG1

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index 31cba85..0fc9060 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -63,6 +63,21 @@ export const coatedWireIntoStorageTask = (code, qty) => request({
 	}
 })
 
+/**
+ * 连涂线
+ */
+export const getLtxPointList = () => request({
+	url:'api/pda/getLtxPointList',
+	data: {}
+})
+export const ltxTask = (code, action) => request({
+	url:'api/pda/manualSorting/ltxTask',
+	data: {
+		point_code: code,
+		action: action
+	}
+})
+
 /**
  * 物料库存
  */