add分切呼叫套轴

manifest.json

@@ -2,8 +2,8 @@
     "name" : "海亮铜箔",
     "appid" : "__UNI__3A002CD",
     "description" : "海亮铜箔二期手持系统",
-    "versionName" : "1.1.5",
+    "versionName" : "1.1.6",
-    "versionCode" : 115,
+    "versionCode" : 116,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

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

pages/ProductManage/CallPaperShaft.vue

@@ -0,0 +1,192 @@
+<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="index1" :localdata="options1" @change="selectChange1"></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="index2" :localdata="options2" @change="selectChange2"></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 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_wraper">
+						<span class="filter_label">代数</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">数量</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="qty">
+					</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 || (!upL && !upR) || !index3 || !index4 || !qty}" :disabled="disabled" @tap="_callPaperShaft">送轴</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryDeviceByarea} from '@/utils/getData2.js'
+	import {paperQueryPaperMaterial, callPaperShaft} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				options2: [{text: '上半区', value: '0'}, {text: '下半区', value: '1'}],
+				index2: '',
+				options3: [{text: '3寸', value: '3'}, {text: '6寸', value: '6'}],
+				index3: '',
+				options4: [{text: '3代', value: '3'}, {text: '4代', value: '4'}],
+				index4: '',
+				axis: [],
+				newaxis1: [],
+				newaxis2: [],
+				upL: '',
+				upR: '',
+				qty: null,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._queryProductArea()
+			this._paperQueryPaperMaterial()
+		},
+		methods: {
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options1 = [...res.data]
+			},
+			selectChange1(e) {
+				this.index1 = e
+			},
+			selectChange2(e) {
+				this.index2 = e
+			},
+			selectChange3(e) {
+				this.index3 = e
+			},
+			selectChange4(e) {
+				this.index4 = e
+			},
+			async _paperQueryPaperMaterial () {
+				let res = await paperQueryPaperMaterial()
+				this.axis = [...res.rows]
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.upL = ''
+				this.upR = ''
+				this.index3 = ''
+				this.index4 = ''
+				this.qty = null
+				this.disabled = false
+			},
+			async _callPaperShaft () {
+				this.disabled = true
+				if (!this.index1 || !this.index2 || (!this.upL && !this.upR) || !this.index3 || !this.index4 || !this.qty) {
+					this.disabled = false
+					return
+				}
+				let upLT = ''
+				let upRT = ''
+				this.axis.map(el => {
+					if (el.value === this.upL) {
+						upLT = el.text
+					}
+					if (el.value === this.upR) {
+						upRT = el.text
+					}
+				})
+				try {
+					let res = await callPaperShaft(this.index1, this.index2, upLT, this.upL, upRT, this.upR, this.index3, this.index4, this.qty)
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			/** 模糊匹配 */
+			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

@@ -374,4 +374,21 @@ export const shaftGoBack = (area, size, qzz) => request({
 		qzz_size: size,
 		qzz_generation: qzz
 	}
+})
+/**
+ * 分切呼叫套轴
+ */
+export const callPaperShaft = (area, location, ulk, ulv, urk, urv, size, qzz, num) => request({
+	url:'api/pda/paper/callPaperShaft',
+	data: {
+		area: area,
+		location: location,
+		up_left_size_k: ulk,
+		up_left_size_v: ulv,
+		up_right_size_k: urk,
+		up_right_size_v: urv, 
+		qzz_size: size,
+		qzz_generation: qzz,
+		qqz_num: num
+	}
 })

utils/mork2.js

@@ -21,7 +21,8 @@ export const allAuthority = () => {
 				{menu_id: '4', title: '空轴进站', path: '/pages/ProductManage/ZjInStore'},
 				{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: '7', title: '空轴回库', path: '/pages/ProductManage/UnAxisBack'},
+				{menu_id: '8', title: '分切呼叫套轴', path: '/pages/ProductManage/CallPaperShaft'}
 				]},
 			{menu_id: '4', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/ProductManage/PointManage'},