add 漏斗复位

pages.json

@@ -138,6 +138,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/manage/point-reset",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/manage/point-reset.vue

@@ -0,0 +1,110 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">起点</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">终点</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled" @tap="toSure1">开始</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {getWastePointList, startMoveWasteFoilv2} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				title: '',
+				index1: '',
+				options1: [],
+				index2: '',
+				options2: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._getWastePointList(1)
+			this._getWastePointList(2)
+		},
+		methods: {
+			async _getWastePointList (type) {
+				let res = await getWastePointList(type)
+				if (res) {
+					res.map(el => {
+						this.$set(el, 'text', el.point_code)
+						this.$set(el, 'value', el.point_code)
+					})
+					if (type === 1) {
+						this.options1 = [...res]
+					}
+					if (type === 2) {
+						this.options2 = [...res]
+					}
+				}
+			},
+			async toSure1 () {
+				this.disabled = true
+				if (!this.index1 || !this.index2) {
+					this.disabled = false
+					return
+				}
+				uni.showModal({
+					title: '提示',
+					content: '是否确定漏斗复位',
+					confirmColor: '#ff6a00',
+					success: (res) => {
+						if (res.confirm) {
+							this._startMoveWasteFoilv2()
+						} else if (res.cancel) {
+							this.disabled = false
+						}
+					}
+				})
+			},
+			async _startMoveWasteFoilv2 () {
+				try {
+					let res = await startMoveWasteFoilv2(this.index2, this.index1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

utils/getData2.js

@@ -49,9 +49,9 @@ export const resumeMoveWasteFoilv3 = (flag, scode, ecode) => request({
 	data: {flag: flag, startPoint: scode, endPoint: ecode}
 })
 // 废箔搬运
-export const startMoveWasteFoilv2 = (code) => request({
+export const startMoveWasteFoilv2 = (code, sp) => request({
 	url:'api/pda/other/startMoveWasteFoil/v2',
-	data: {point_code: code}
+	data: {point_code: code, start_point: sp}
 })
 export const resumeMoveWasteFoilv2 = (flag, code) => request({
 	url:'api/pda/other/resumeMoveWasteFoil/v2',
@@ -200,4 +200,8 @@ export const getWeightCacheInfos = () => request({
 export const doSubVolumeDown = (code) => request({
 	url:'api/pda/nbj/doSubVolumeDown',
 	data: {point_code: code}
+})
+export const getWastePointList = (type) => request({
+	url:'api/schBasePoint/getWastePointList?point_type=' + type,
+	method: 'get'
 })

utils/mork2.js

@@ -7,7 +7,7 @@ export const authority = () => {
 			[
 				{path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]},
 				{path: 'RF02', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]},
-				{path: 'RF03', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]},
+				{path: 'RF03', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}, {title: '漏斗复位', path: '/pages/manage/point-reset'}]},
 				{path: 'RF04', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}, {title: '重量维护', path: '/pages/manage/weight-bind'}, {title: '套轴申请', path: '/pages/manage/axis-application'}]},
 				{path: 'RF05', title: '装箱区', sonTree: [{title: '装箱暂存管理', path: '/pages/manage/pack-storage'}]},
 				{path: 'RF06', title: '分切管理', sonTree: [{title: '分切上料', path: '/pages/manage/split-feed'}, {title: '分切下料', path: '/pages/manage/split-cut'}, {title: '子卷维护', path: '/pages/manage/sub-vol-bind'}, {title: '子卷下线', path: '/pages/manage/sub-vol-offline'}]},
@@ -35,4 +35,8 @@ export const queryOrderInfo = () => {
 		data: [{container_name: 'R-A11ED00002-241206144453-A1_014_521 2', zc_point: 'zc_point'}]
 	}
 	return res
+}
+export const getWastePointList = (type) => {
+	let res = [{point_code: 'A' + type}]
+	return res
 }