add 管芯入库/管芯出库/套轴绑定

common/style/layout.styl

@@ -116,158 +116,102 @@ uni-button:after {
 	height: 100%;
 	overflow-y: auto;
 }
-.slide_h {
-	overflow-y: hidden;
-}
 .slide_new table {
 	table-layout: fixed;
 	min-width: 100%;
 	border-collapse: separate;
-	border-spacing: 0;
+	-webkit-border-horizontal-spacing: 0px;
-	border: 0;
+	-webkit-border-vertical-spacing: 10rpx;
+	padding-bottom: 8rpx;
+	background-color: #f5f5f5;
 }
-.slide_new table td, .slide_new table th {
+.slide_new table th {
+	position: sticky;
+	top: 0;
+	left: 0;
+	z-index: 120;
+	font-size: 26rpx;
+	line-height: 98rpx;
+	color: #696969;
+	font-weight: bold;
+	text-align: center;
 	box-sizing: border-box;
 	overflow: hidden;
+	white-space: nowrap;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	padding: 0 20rpx;
-	border-bottom: 10rpx solid #f5f5f5;
+	background: #d7d7d7;
-	text-align: center;
 }
-.slide_h table td, .slide_h table th {
+.slide_new table th:first-child{
-	white-space: wrap;
+	left: 0;
-	padding: 0 20rpx;
+	z-index: 121;
-	border-bottom: 10rpx solid #f5f5f5;
+	color: #4e6ef2;
+	font-weight: bold;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table th.th_2 {
+	left: 86rpx;
+	z-index: 122;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table td {
+	font-size: 28rpx;
+	line-height: 98rpx;
+	color: #323232;
 	text-align: center;
+	box-sizing: border-box;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	padding: 0 20rpx;
+	background: #fff;
 }
 .slide_new table td:first-child{
 	position: sticky;
 	left: 0;
-	z-index: 31;
+	z-index: 100;
-}
+	color: #4e6ef2;
-.slide_new table th:first-child{
-	position: sticky;
-	left: 0;
-	z-index: 32;
-}
-.slide_new table thead tr th {
-	position: sticky;
-	top: 0;
-	background: #d7d7d7;
-	font-size: 26rpx;
-	line-height: 28rpx;
-	padding: 35rpx 10rpx;
-	color: #7d7d7d;
-	background-color: #dcdfea;
 	font-weight: bold;
-	z-index: 30;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
 }
-.slide_new table tbody tr td {
+.slide_new table td.td_2 {
-	font-size: 28rpx;
+	position: sticky;
-	line-height: 58rpx;
+	left: 86rpx;
-	padding: 14rpx 20rpx;
+	z-index: 101;
-	color: #7d7d7d;
+	box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
-	background: #fff;
 }
-.slide_h table tbody tr td {
+.slide_new table th.fontcol1,.slide_new table td.fontcol1 {
-	font-size: 28rpx;
-	line-height: 28rpx;
-	padding: 14rpx 20rpx;
-	color: #7d7d7d;
-	background: #fff;
-}
-.slide_new table tbody tr td .td_input {
-	width: 230rpx;
-	font-size: 28rpx;
-	color: #305fbf;
-	line-height: 58rpx;
-	height: 58rpx;
-	padding: 0 10rpx;
-	border: 1px solid #889dc7;
-	box-shadow: 0 0 0 2px rgba(136, 157, 199,.2);
-	border-radius: 10rpx;
-	margin: 0 auto;
-}
-.slide_new table tbody tr td .td_select {
-	width: 230rpx;
-	font-size: 28rpx;
-	color: #305fbf;
-	line-height: 58rpx;
-	margin: 0 auto;
-}
-.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
 	color: #4e6ef2;
 	font-weight: bold;
 }
-.slide_new table tbody tr td.fontcol2 {
+.slide_new table th.fontcol2,.slide_new table td.fontcol2 {
-	color: #000;
+	color: #d7592f;
+	font-weight: bold;
 }
-.slide_new table tbody tr td .fontbg{
+.slide_new table tr.checked {
-	font-size: 26rpx;
+	// background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
-	line-height: 30rpx;
+	background-color: #6190e8;
-	padding: 8rpx 20rpx;
+}
-	border-radius: 8rpx;
+.slide_new table tr.checked td {
-	background-color: #F60;
+	background-color: transparent;
 	color: #fff;
 }
-.slide_new table tbody tr td .fontbg1 {
+.slide_new table tr.checked td:first-child {
-	background-color: #cfd2d4;
+	// background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
-	color: #5e5d5d;
+	background-color: #6190e8;
 }
-.slide_new table tbody tr td .fontbg2 {
+.slide_new table tr.checked td:nth-child(2) {
-	background-color: #96f3b8;
+	// background-image: linear-gradient(to top,#c2cde3,#f6f7fb);
-	color: #36744c;
+	background-color: #6190e8;
 }
-.slide_new table tbody tr td .fontbg3 {
+.slide_new table tr.checked td:first-child {
-	background-color: #f3ccb5;
+	border-left: 1rpx solid #6798ef;
-	color: #ff5e00;
 }
-.slide_new table tbody tr.checked
+.slide_new table tr.checked td:last-child {
-	td
+	border-right: 1rpx solid #6798ef;
-		background-color: #4e6ef2
-		color #fff
-	td.fontcol1, td.fontcol2
-		color #fff
-.item-wrapper {
-	width: 100%;
-	height: auto;
 }
-.item-wrap {
-	background-color: #fff;
-	border-radius: 24rpx;
-	padding: 22rpx 14rpx;
-	margin-bottom: 20rpx;
-	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
-}
-.item-font-1
-	_font(30rpx,28rpx,#000,,)
-.item-font-2
-	_font(24rpx,40rpx,$red,,)
-.item-font-3
-	width 110rpx
-	_font(24rpx,26rpx,#333,,)
-	text-align:justify;
-	text-align-last: justify;
-	text-justify: inter-ideograph;
-.item-font-4
-	width calc(100% - 110rpx)
-	_font(26rpx,26rpx,#999,,)
-.item-font-5
-	_font(44rpx,60rpx,$green,,center)
-	background-color #f6f6f6
-.item-font-6
-	width calc(50% - 110rpx)
-	_font(24rpx,52rpx,#666,,center)
-	background-color #e5e5e5
-	border-radius 26rpx
-.item-font-7
-	width 110rpx
-	_font(24rpx,52rpx,#666,,center)
-.item-font-8
-	_font(24rpx,52rpx,#666,,center)
-.isChecked
-	box-shadow inset 2px 2px 4px 0px rgba(120, 141, 250, 0.7), inset -2px -2px 4px 0px rgba(120, 141, 250, 0.7)
 /** 提交栏 **/
 .submit-bar {
 	position: fixed;
@@ -301,6 +245,10 @@ uni-button:after {
 	border: 2rpx solid #ff6a00;
 	border-radius: 10rpx;
 }
+.button-primary_s {
+	font-size: 26rpx;
+	line-height: 60rpx;
+}
 .button-info, .submit-button[disabled] {
 	background-color: #c9c9c9;
 	border: 2rpx solid #c9c9c9;

pages.json

@@ -43,7 +43,23 @@
             
         }
         ,{
-            "path" : "pages/manage/mater-in-storage",
+            "path" : "pages/manage/tube-core-storage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+		,{
+		    "path" : "pages/manage/tube-core-out",
+		    "style" :                                                                                    
+		    {
+		        "navigationStyle": "custom"
+		    }
+		    
+		}
+        ,{
+            "path" : "pages/manage/axis-bind",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
@@ -57,14 +73,6 @@
                 "navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/manage/material-transfer",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/manage/modify-process",

pages/manage/axis-bind.vue

@@ -0,0 +1,181 @@
+<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-7">
+						<span class="filter_label">分切暂存位</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">分切设备</span>
+					</view>
+					<view class="zd-col-12 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+					<button class="zd-col-4 button-primary button-primary_s" @tap="_getSlitterNeedShaftPlans">查询</button>
+				</view>	
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th class="th_2">母卷号</th>
+								<th>子卷号</th>
+								<th>机台编号</th>
+								<th>分切组</th>
+								<th>生产顺序</th>
+								<th>生产日期</th>
+								<th>订单号</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
+								<td>{{Number(i) + 1}}</td>
+								<td class="td_2">{{e.source_container_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_doSendShaft">呼叫送轴</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_toCleanCutCacheInventory">点位清除</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !pkId}" :disabled="disabled" @tap="_doBindingGx">纸管绑定</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getSlitterDeviceBox, getSlitterNeedShaftPlans, doSendShaft, toCleanCutCacheInventory, doBindingGx} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				index: '',
+				options: [],
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._getSlitterDeviceBox()
+		},
+		methods: {
+			async _getSlitterDeviceBox () {
+				let res = await getSlitterDeviceBox()
+				this.options = [...res]
+			},
+			async _getSlitterNeedShaftPlans () {
+				let res = await getSlitterNeedShaftPlans(this.val1, this.index)
+				this.dataList = [...res]
+			},
+			async _doSendShaft () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await doSendShaft(this.val1, this.index)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _toCleanCutCacheInventory () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await toCleanCutCacheInventory(this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _doBindingGx () {
+				this.disabled = true
+				if (!this.val1 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await doBindingGx(this.val1, [this.pkObj])
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.dataList = []
+				this.pkId = ''
+				this.pkObj = {}
+				this.disabled = false
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.container_name ? '' : e.container_name
+				this.pkObj = this.pkId === e.container_name ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/mater-in-storage.vue

@@ -1,122 +0,0 @@
-<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">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">载具号</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">目的地</span>
-					</view>
-					<view class="zd-col-19">
-						<input type="text" class="filter_input" v-model="val3">
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>操作</th>
-								<th>订单号</th>
-								<th>物料号</th>
-								<th>物料数量</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td @tap="addRow"><uni-icons type="plus-filled" size="30" color="#4e6ef2"></uni-icons></td>
-								<td><input type="text" class="td_input" v-model="e.order_code"></td>
-								<td><input type="text" class="td_input" v-model="e.material_code"></td>
-								<td><input type="number" class="td_input" v-model="e.material_qty"></td>
-							</tr>
-						</tbody>
-					</table>
-				</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': !val1 || !val2}" :disabled="disabled" @tap="_handheldBlanking">入库确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {handheldBlanking} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				val3: '',
-				disabled: false,
-				dataList: [{order_code: '', material_code: '', material_qty: 0}]
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			addRow () {
-				this.dataList.push({order_code: '', material_code: '', material_qty: 0})
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.val3 = ''
-				this.dataList = [{order_code: '', material_code: '', material_qty: 0}]
-				this.disabled = false
-			},
-			async _handheldBlanking () {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				let arr = []
-				this.dataList.map(el => {
-					if (el.order_code !== '' && el.material_qty !== '') {
-						arr.push(el)
-					}
-				})
-				try {
-					let res = await handheldBlanking(this.val1, this.val3, this.val2, arr)
-					this.clearUp()
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>

pages/manage/tube-core-out.vue

@@ -4,31 +4,36 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
+					<view class="zd-col-7">
-						<span class="filter_label">当前点位</span>
+						<span class="filter_label">物料编码</span>
 					</view>
-					<view class="zd-col-19">
+					<view class="zd-col-17">
 						<search-box
 						v-model="val1"
 						/>
 					</view>
 				</view>
-				<view class="zd-row">
+				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
+					<view class="zd-col-7">
-						<span class="filter_label">载具号</span>
+						<span class="filter_label">管芯规格</span>
 					</view>
-					<view class="zd-col-19">
+					<view class="zd-col-17 filter_select">
-						<search-box
+						<zxz-uni-data-select v-model="index" filterable :localdata="options"></zxz-uni-data-select>
-						v-model="val2"
+					</view>
-						/>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">管芯数量</span>
+					</view>
+					<view class="zd-col-19">
+						<input v-model=" val2" type="number" class="filter_input">
 					</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': !val1 || !val2}" :disabled="disabled" @tap="_handheldTranshipment">确认</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2 || index === ''}" :disabled="disabled" @tap="_gxconfirmedOutStorage">管芯出库</button>
 		</view>
 	</view>
 </template>
@@ -36,7 +41,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {handheldTranshipment} from '@/utils/getData2.js'
+	import {gxgetGxSpecification, gxconfirmedOutStorage} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -45,6 +50,8 @@
 		data() {
 			return {
 				title: '',
+				index: '',
+				options: [],
 				val1: '',
 				val2: '',
 				disabled: false
@@ -52,16 +59,27 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._gxgetGxSpecification()
 		},
 		methods: {
-			async _handheldTranshipment () {
+			async _gxgetGxSpecification () {
+				let res = await gxgetGxSpecification()
+				this.options = [...res]
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.index = ''
+				this.disabled = false
+			},
+			async _gxconfirmedOutStorage () {
 				this.disabled = true
-				if (!this.val1 || !this.val2) {
+				if (!this.val1 || !this.val2 || this.index === '') {
-					this.disabled1 = false
+					this.disabled = false
 					return
 				}
 				try {
-					let res = await handheldTranshipment(this.val1, this.val2)
+					let res = await gxconfirmedOutStorage(this.val2, this.val1, this.index)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -70,11 +88,6 @@
 				} catch (e) {
 					this.disabled = false
 				}
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.disabled = false
 			}
 		}
 	}

pages/manage/tube-core-storage.vue

@@ -0,0 +1,121 @@
+<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-7">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">管芯规格</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<zxz-uni-data-select v-model="index" filterable :localdata="options"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">管芯数量</span>
+					</view>
+					<view class="zd-col-19">
+						<input v-model=" val2" type="number" class="filter_input" @blur="handleBlur">
+					</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': !val1 || !val2 || index === ''}" :disabled="disabled" @tap="_gxconfirmedInStorage">确认入库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {gxgetGxSpecification, gxremainingQty, gxconfirmedInStorage} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				index: '',
+				options: [],
+				val1: '',
+				val2: '',
+				qty: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._gxgetGxSpecification()
+		},
+		methods: {
+			async _gxgetGxSpecification () {
+				let res = await gxgetGxSpecification()
+				this.options = [...res]
+			},
+			async _gxremainingQty () {
+				let res = await gxremainingQty()
+				this.qty = res.qty
+				if (Number(this.val2) > Number(this.qty)) {
+					uni.showToast({
+						title: '管芯库空位不足！',
+						icon: 'none'
+					})
+					this.val2 = ''
+				}
+			},
+			handleBlur () {
+				if (this.val2 !== '') {
+					this._gxremainingQty()
+				} else if (Number(this.val2) > 5) {
+					uni.showToast({
+						title: '一次性最多只能入5根管芯！',
+						icon: 'none'
+					})
+					this.val2 = ''
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.index = ''
+				this.qty = ''
+				this.disabled = false
+			},
+			async _gxconfirmedInStorage () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || this.index === '') {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await gxconfirmedInStorage(this.val2, this.val1, this.index)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/waste-foil-move.vue

@@ -17,9 +17,9 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_startMoveWasteFoilv2">开始</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure1">开始</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_resumeMoveWasteFoilv2('1')">确认</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure2('1')">确认</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_resumeMoveWasteFoilv2('2')">结束</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure2('2')">结束</button>
 		</view>
 	</view>
 </template>
@@ -46,12 +46,26 @@
 			this.title = options.title
 		},
 		methods: {
-			async _startMoveWasteFoilv2 () {
+			async toSure1 () {
 				this.disabled = true
 				if (!this.val1) {
 					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.val1)
 					this.clearUp()
@@ -63,12 +77,30 @@
 					this.disabled = false
 				}
 			},
-			async _resumeMoveWasteFoilv2 (type) {
+			toSure2 (type) {
 				this.disabled = true
 				if (!this.val1) {
 					this.disabled = false
 					return
 				}
+				if (type === '1') {
+					uni.showModal({
+						title: '提示',
+						content: '请确认废箔搬运',
+						confirmColor: '#ff6a00',
+						success: (res) => {
+							if (res.confirm) {
+								this._resumeMoveWasteFoilv2(type)
+							} else if (res.cancel) {
+								this.disabled = false
+							}
+						}
+					})
+				} else {
+					this._resumeMoveWasteFoilv2(type)
+				}
+			},
+			async _resumeMoveWasteFoilv2 (type) {
 				try {
 					let res = await resumeMoveWasteFoilv2(type, this.val1)
 					this.clearUp()

utils/getData2.js

@@ -52,4 +52,43 @@ export const startMoveWasteFoilv2 = (code) => request({
 export const resumeMoveWasteFoilv2 = (flag, code) => request({
 	url:'api/pda/other/resumeMoveWasteFoil/v2',
 	data: {flag: flag, point_code: code}
+})
+// 管芯入库
+export const gxgetGxSpecification = () => request({
+	url:'api/pda/gx/getGxSpecification',
+	data: {}
+})
+export const gxconfirmedInStorage = (num, code, spec) => request({
+	url:'api/pda/gx/confirmedInStorage',
+	data: {gx_number: num, material_code: code, material_spec: spec}
+})
+export const gxremainingQty = () => request({
+	url:'api/pda/gx/remainingQty',
+	data: {}
+})
+// 管芯出库
+export const gxconfirmedOutStorage = (num, code, spec) => request({
+	url:'api/pda/gx/confirmedOutStorage',
+	data: {number: num, material_code: code, material_spec: spec}
+})
+// 套轴绑定
+export const getSlitterDeviceBox = () => request({
+	url:'api/pda/nbj/getSlitterDeviceBox',
+	data: {}
+})
+export const getSlitterNeedShaftPlans = () => request({
+	url:'api/pda/nbj/getSlitterNeedShaftPlans',
+	data: {point_code: code, device: device}
+})
+export const doSendShaft = (code, device) => request({
+	url:'api/pda/nbj/doSendShaft',
+	data: {point_code: code, device: device}
+})
+export const doBindingGx = (code, row) => request({
+	url:'api/pda/nbj/doBindingGx',
+	data: {point_code: code, row: row}
+})
+export const toCleanCutCacheInventory = (code) => request({
+	url:'api/pda/nbj/toCleanCutCacheInventory',
+	data: {point_code: code}
 })

utils/mork2.js

@@ -7,7 +7,8 @@ export const authority = () => {
 			[
 				{path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]},
 				{path: 'RF01', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]},
-				{path: 'RF01', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]}
+				{path: 'RF01', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]},
+				{path: 'RF01', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}]}
 			]
 		}
 	}}