add人工点维护

pages.json

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

pages/SecondPhase/ManMaintain.vue

@@ -0,0 +1,78 @@
+<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 class="filter_item">
+					<view class="filter_label">检验结果</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_updatePackagePoint">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {updatePackagePoint} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{value: '0', text: '空点位'}, {value: '1', text: '有架子'}],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _updatePackagePoint () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await updatePackagePoint(this.index, this.val1)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+			}
+		}
+	}
+</script>

pages/SecondPhase/production/ZjCheck.vue

@@ -12,12 +12,6 @@
 						<search-box v-model="val1" />
 					</view>
 				</view>
-				<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">
@@ -28,7 +22,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !index1}" :disabled="disabled" @tap="_updatePackageInfo">确认</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_updatePackageInfo">确认</button>
 		</view>
 	</view>
 </template>
@@ -46,10 +40,8 @@
 			return {
 				title: '',
 				val1: '',
-				options: [{value: '3', text: '合格品'}, {value: '4', text: '管制品'}, {value: '0', text: '空点位'}, {value: '1', text: '有架子'}],
+				options: [{value: '3', text: '合格品'}, {value: '4', text: '管制品'}, {value: '5', text: '人工卷'}],
 				index: '',
-				options1: [{value: '1', text: '1'}, {value: '2', text: '2'}],
-				index1: '',
 				disabled: false
 			};
 		},
@@ -60,17 +52,14 @@
 			selectChange (e) {
 				this.index = e
 			},
-			selectChange1 (e) {
-				this.index1 = e
-			},
 			async _updatePackageInfo () {
 				this.disabled = true
-				if (!this.val1 && !this.index1) {
+				if (!this.val1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await updatePackageInfo(this.index, this.val1, this.index1)
+					let res = await updatePackageInfo(this.index, this.val1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -83,7 +72,6 @@
 			clearUp () {
 				this.val1 = ''
 				this.index = ''
-				this.index1 = ''
 			}
 		}
 	}

utils/getData3.js

@@ -156,9 +156,9 @@ export const doInitShaftPoint = (code, is) => request({
 /**
  * 子卷质检
  */
-export const updatePackageInfo = (ivt, cn, code) => request({
+export const updatePackageInfo = (ivt, cn) => request({
 	url:'api/twoPda/vehicle/updatePackageInfo',
-	data: {ivt_status: ivt, container_name: cn, pointCode: code}
+	data: {ivt_status: ivt, container_name: cn}
 })
 /**
  * 纸管绑定
@@ -551,3 +551,10 @@ export const downBait = (area, device, point, lk, lkv, rk, rkv, up) => request({
 		up_or_down: up
 	}
 })
+/**
+ * 人工点维护
+ */
+export const updatePackagePoint = (ivt, code) => request({
+	url:'api/twoPda/vehicle/updatePackagePoint',
+	data: {ivt_status: ivt, pointCode: code}
+})

utils/mork2.js

@@ -112,7 +112,8 @@ export const allAuthority = () => {
 			]},
 			{menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [
 				{menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'},
-				{menu_id: '1', title: '装箱口木箱回库', path: '/pages/SecondPhase/BoxReturn'}
+				{menu_id: '1', title: '装箱口木箱回库', path: '/pages/SecondPhase/BoxReturn'},
+				{menu_id: '1', title: '人工点维护', path: '/pages/SecondPhase/ManMaintain'}
 			]},
 			{menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},