连涂线

pages.json

@@ -72,6 +72,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/modules/coating-line",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

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: '5', name: '指令管理', icon: 'RF06', path: '/pages/modules/command-manage'},
-					{id: '6', name: '任务管理', icon: 'RF06', path: '/pages/modules/task-manage'}
+					{id: '6', name: '任务管理', icon: 'RF05', path: '/pages/modules/task-manage'}
 				]
 			};
 		},

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>

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 () {

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
+	}
+})
+
 /**
  * 物料库存
  */