add 分切上轴

pages.json

@@ -591,6 +591,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/ProductManage/UpperShaftCut",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/ProductManage/UpperShaftCut.vue

@@ -0,0 +1,184 @@
+<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">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
+					</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">
+						<uni-data-select v-model="upL" :searchInput="true" :localdata="newaxis1" @handleChange="handleChange1" @showSelector="showSelector1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">管芯右</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="upR" :searchInput="true" :localdata="newaxis2" @handleChange="handleChange2" @showSelector="showSelector2"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index1 ||!index2 || !index3 || (!upL && !upR)}" :disabled="disabled" @tap="_cutUpShaft">上空轴</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryDeviceByarea, devicePointQuery} from '@/utils/getData2.js'
+	import {paperQueryPaperMaterial, cutUpShaft} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				options3: [],
+				index3: '',
+				disabled: false,
+				axis: [],
+				newaxis1: [],
+				newaxis2: [],
+				upL: '',
+				upR: ''
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._queryProductArea()
+			this._paperQueryPaperMaterial()
+		},
+		methods: {
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options2 = [...res.data]
+			},
+			selectChange2(e) {
+				this.index2 = e
+				if (e) {
+					this._queryDeviceByarea(e)
+				} else {
+					this.index3 = ''
+					this.options3 = []
+				}
+			},
+			/** 设备下拉框 */
+			async _queryDeviceByarea (e) {
+				let res = await queryDeviceByarea(e)
+				this.options3 = [...res.data]
+			},
+			selectChange3(e) {
+				this.index3 = e
+				if (e) {
+					this._devicePointQuery(e)
+				} else {
+					this.index1 = ''
+					this.options1 = []
+				}
+			},
+			/** 点位下拉框查询 */
+			async _devicePointQuery (e) {
+				let res = await devicePointQuery(e)
+				this.options1 = [...res.data]
+			},
+			selectChange1(e) {
+				this.index = e
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.index3 = ''
+				this.options3 = []
+				this.options1 = []
+				this.upL = ''
+				this.upR = ''
+				this.disabled = false
+			},
+			/** 确认 */
+			async _cutUpShaft () {
+				this.disabled = true
+				if (!this.index1 ||!this.index2 || !this.index3 || (!this.upL && !this.upR)) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await cutUpShaft(this.index1, this.index2, this.index3, this.upL, this.upR)
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			/** 管芯下拉框 */
+			async _paperQueryPaperMaterial () {
+				let res = await paperQueryPaperMaterial()
+				this.axis = [...res.rows]
+			},
+			/** 模糊匹配 */
+			selectMatchItem (lists, keyWord) {
+				let resArr = []
+				lists.filter((item) => {
+					if (item.text.indexOf(keyWord) > -1) {
+						resArr.push(item)
+					}
+				})
+				return resArr
+			},
+			handleChange1 (e) {
+				if (e){
+					this.upL = ''
+					this.newaxis1 = this.selectMatchItem(this.axis, e)
+				} else {
+					this.newaxis1 = this.axis
+				}
+			},
+			showSelector1 () {
+				this.newaxis1 = this.axis
+			},
+			handleChange2 (e) {
+				if (e){
+					this.upR = ''
+					this.newaxis2 = this.selectMatchItem(this.axis, e)
+				} else {
+					this.newaxis2 = this.axis
+				}
+			},
+			showSelector2 () {
+				this.newaxis2 = this.axis
+			}
+		}
+	}
+</script>

utils/getData3.js

@@ -391,4 +391,17 @@ export const callPaperShaft = (area, location, ulk, ulv, urk, urv, size, qzz, nu
 		qzz_generation: qzz,
 		qqz_num: num
 	}
+})
+/**
+ * 分切上轴（一期分切管理）
+ */
+export const cutUpShaft = (area, device, point, lk, rk) => request({
+	url:'api/pda/in/cutUpShaft',
+	data: {
+		area: area,
+		device_code: device,
+		point_code: point,
+		left_spec: lk,
+		right_spec: rk
+	}
 })

utils/mork2.js

@@ -22,7 +22,8 @@ export const allAuthority = () => {
 				{menu_id: '5', title: '子卷出站', path: '/pages/ProductManage/ZjOutStore'},
 				{menu_id: '6', title: '套轴申请', path: '/pages/ProductManage/AxisApply'},
 				{menu_id: '7', title: '空轴回库', path: '/pages/ProductManage/UnAxisBack'},
-				{menu_id: '8', title: '分切呼叫套轴', path: '/pages/ProductManage/CallPaperShaft'}
+				{menu_id: '8', title: '分切呼叫套轴', path: '/pages/ProductManage/CallPaperShaft'},
+				{menu_id: '8', title: '分切上轴', path: '/pages/ProductManage/UpperShaftCut'}
 				]},
 			{menu_id: '4', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/ProductManage/PointManage'},
@@ -251,6 +252,12 @@ export const queryDeviceByarea = () => {
 	}
 	return res
 }
+export const devicePointQuery = () => {
+	let res = {
+		data: [{value: '0aa', text: 'aa'}, {value: '0bb', text: 'bb'}]
+	}
+	return res
+}
 export const zjInBound = () => {
 	let res = {
 		content: [{package_box_sn: '01'}, {package_box_sn: '02'}]