子卷质检添加功能，add任务管理页

README.md

@@ -6,4 +6,5 @@
 + 当前应用版本名称1.0.0
 + 当前应用版本号100
 + 线上菜单接口地址：(https://apifox.com/apidoc/shared-cb4996b0-0426-44a6-82a5-0cefe2540fb9/api-152616802)
-+ 生产入库、退货入库、报废入库、拆分入库这几个页面的木箱输入框只能扫码，不能输入；盘点明细页面木箱输入框只能扫码，不能输入，点击确定按钮后再次获取焦点；虚拟区发货确认、生产区发货确认两个页面点击确认后会再次获取焦点
++ 生产入库、退货入库、报废入库、拆分入库这几个页面的木箱输入框只能扫码，不能输入；盘点明细页面木箱输入框只能扫码，不能输入，点击确定按钮后再次获取焦点；虚拟区发货确认、生产区发货确认两个页面点击确认后会再次获取焦点
++ 一期二期菜单会公用一个页面

common/style/layout.styl

@@ -424,6 +424,9 @@ uni-button[disabled]:not([type]) {
 }
 
 /** 下拉框 */
+.uni-select {
+	height: 80rpx !important;
+}
 .uni-select__selector {
 	z-index: 300 !important;
 }

pages.json

@@ -742,6 +742,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/slitting/Task",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/SecondPhase/production/ZjCheck.vue

@@ -4,6 +4,21 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
+				<view class="zd-row filter_item">
+					<view class="zd-col-19">
+						<view class="filter_item">
+							<view class="filter_label_wraper">
+								<span class="filter_label">点位</span>
+							</view>
+							<view class="filter_input_wraper">
+								<search-box v-model="val2" @handleChange="handleChange"/>
+							</view>
+						</view>
+					</view>
+					<view class="zd-col-4">
+						<button  class="btn-submit btn-success" @tap="_getPointInfo(val2)">查询</button>
+					</view>
+				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
 						<span class="filter_label">子卷号</span>
@@ -36,7 +51,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getControlList, updatePackageInfo} from '@/utils/getData3.js'
+	import {getControlList, updatePackageInfo, getPointInfo} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -50,6 +65,7 @@
 				index: '',
 				options1: [],
 				index1: '',
+				val2: '',
 				disabled: false
 			};
 		},
@@ -58,6 +74,21 @@
 			this._getControlList()
 		},
 		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getPointInfo(e)
+				}
+			},
+			async _getPointInfo (e) {
+				try {
+					let res = await getPointInfo(e)
+					if (res) {
+						this.val1 = res.container_name
+					}
+				} catch (e) {
+					this.val2 = ''
+				}
+			},
 			async _getControlList () {
 				let res = await getControlList()
 				if (res) {
@@ -77,7 +108,7 @@
 					return
 				}
 				try {
-					let res = await updatePackageInfo(this.index, this.val1, this.index1)
+					let res = await updatePackageInfo(this.val2, this.index, this.val1, this.index1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -88,6 +119,7 @@
 				}
 			},
 			clearUp () {
+				this.val2 = ''
 				this.val1 = ''
 				this.index = ''
 				this.index1 = ''

pages/SecondPhase/slitting/Task.vue

@@ -0,0 +1,97 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="任务管理"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">关键字</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>任务号</th>
+								<th>任务状态</th>
+								<th>起点1</th>
+								<th>终点1</th>
+								<th>起点2</th>
+								<th>终点2</th>
+								<th>载具号1</th>
+								<th>载具号2</th>
+								<th>车间</th>
+								<th>创建者</th>
+								<th>创建时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.task_code}}</td>
+								<td>{{options | findByValue(e.task_status)}}</td>
+								<td>{{e.point_code1}}</td>
+								<td>{{e.point_code2}}</td>
+								<td>{{e.point_code3}}</td>
+								<td>{{e.point_code4}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.vehicle_code2}}</td>
+								<td>{{e.product_area}}</td>
+								<td>{{e.create_name}}</td>
+								<td>{{e.create_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-22 btn-submit btn-success letter-30" @tap="_seeTaskByPoint">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {seeTaskByPoint} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				options: [{value: '01', text: '生成'}, {value: '02', text: '确定起点'}, {value: '03', text: '确定终点'}, {value: '04', text: '起点终点确认'}, {value: '05', text: '下发'}, {value: '06', text: '执行中'}, {value: '07', text: '完成'}, {value: '071', text: '取货完成，执行中'}]
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			/** 初始化查询 */
+			async _seeTaskByPoint () {
+				try {
+					let res = await seeTaskByPoint(this.val1)
+					if (res && res.length > 0) {
+						this.dataList = [...res]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}	
+			}
+		}
+	}
+</script>

utils/getData3.js

@@ -156,14 +156,18 @@ export const doInitShaftPoint = (code, is) => request({
 /**
  * 子卷质检
  */
-export const updatePackageInfo = (ivt, cn, code) => request({
+export const updatePackageInfo = (point, ivt, cn, code) => request({
 	url:'api/twoPda/vehicle/updatePackageInfo',
-	data: {ivt_status: ivt, container_name: cn, pointCode: code}
+	data: {point_code: point, ivt_status: ivt, container_name: cn, pointCode: code}
 })
 export const getControlList = () => request({
 	url:'api/twoPda/vehicle/getControlList',
 	data: {}
 })
+export const getPointInfo = (code) => request({
+	url:'api/twoPda/vehicle/getPointInfo',
+	data: {point_code: code}
+})
 /**
  * 纸管绑定
  */
@@ -640,4 +644,11 @@ export const getTubeVehicleInfo = (point) => request({
 export const vehicleRelabel = (code) => request({
 	url:'api/twoPda/vehicle/relabel',
 	data: {box_no: code}
+})
+/**
+ * 任务管理（二期分切管理）
+ */
+export const seeTaskByPoint = (code) => request({
+	url:'api/pda/slitter/seeTaskByPoint',
+	data: {data: code}
 })

utils/mork2.js

@@ -112,7 +112,8 @@ export const allAuthority = () => {
 				{menu_id: '8', title: '呼叫套轴', path: '/pages/SecondPhase/slitting/CallAxis'},
 				{menu_id: '8', title: '子卷拼单', path: '/pages/SecondPhase/slitting/Zjpindan'},
 				{menu_id: '8', title: '人工呼叫空轴', path: '/pages/SecondPhase/slitting/ManEmptyAxle'},
-				{menu_id: '11', title: '备货出入库', path: '/pages/SecondPhase/slitting/GdsPrepInOut'}
+				{menu_id: '11', title: '备货出入库', path: '/pages/SecondPhase/slitting/GdsPrepInOut'},
+				{menu_id: '11', title: '任务管理', path: '/pages/SecondPhase/slitting/Task'}
 			]},
 			{menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [
 				{menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'},