子卷质检、add管制点修改

pages.json

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

pages/SecondPhase/production/ControlPoint.vue

@@ -0,0 +1,90 @@
+<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">{{$t('grid.sub-roll-number')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">{{$t('filter.control-point')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">{{$t('filter.inspection-results')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :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">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !index1}" :disabled="disabled" @tap="_updatePackageInfo">{{$t('button.confirm')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {updatePackageInfo2} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{value: '3', text: '合格品'}, {value: '0', text: '空点位'}, {value: '1', text: '有架子'}],
+				index: '',
+				options1: [{value: '1', text: '1'}, {value: '2', text: '2'}],
+				index1: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			selectChange1 (e) {
+				this.index1 = e
+			},
+			async _updatePackageInfo () {
+				this.disabled = true
+				if (!this.val1 && !this.index1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await updatePackageInfo2(this.index, this.val1, this.index1)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.index1 = ''
+			}
+		}
+	}
+</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">{{$t('filter.control-point')}}</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
 				<view class="filter_item">
 					<view class="filter_label">{{$t('filter.inspection-results')}}</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">{{$t('button.clear')}}</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !index1}" :disabled="disabled" @tap="_updatePackageInfo">{{$t('button.confirm')}}</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_updatePackageInfo">{{$t('button.confirm')}}</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: '管制品'}],
 				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

@@ -148,8 +148,15 @@ 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}
+})
+/**
+ * 管制点修改
+ */
+export const updatePackageInfo2 = (ivt, cn, code) => request({
+	url:'/api/twoPda/vehicle/updatePackageInfo2',
 	data: {ivt_status: ivt, container_name: cn, pointCode: code}
 })
 /**

utils/mork2.js

@@ -21,6 +21,7 @@ export const allAuthority = () => {
 				// {menu_id: '4', title: '表处工序', path: '/pages/SecondPhase/production/SurfaceProcess'},
 				{menu_id: '5', title: '人工烘烤', path: '/pages/SecondPhase/production/ManmadeBake'},
 				{menu_id: '6', title: '子卷质检', path: '/pages/SecondPhase/production/ZjCheck'},
+				{menu_id: '6', title: '管制点修改', path: '/pages/SecondPhase/production/ControlPoint'},
 				{menu_id: '8', title: '子卷装箱', path: '/pages/SecondPhase/production/ZjContainer'},
 				{menu_id: '8', title: '木箱库存', path: '/pages/SecondPhase/production/BoxStock'},
 				{menu_id: '8', title: '子卷入库', path: '/pages/SecondPhase/production/ZjInStore'},