add 空木箱出库 117

common/style/layout.styl

@@ -511,6 +511,7 @@ uni-button[disabled]:not([type]) {
 	font-weight: 700;
 	color: #ff6a00;
 	margin-top: 30rpx;
+	word-break: break-all;
 }
 .msg_modal {
 	position: fixed;

common/style/reset.css

@@ -131,8 +131,8 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
     width: 4.16667%
 }
 .letter-30 {
-	letter-spacing: 30rpx;
+	/* letter-spacing: 30rpx;
-	text-indent: 30rpx;
+	text-indent: 30rpx; */
 }
 .h-50 {
 	height: 50% !important;

manifest.json

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

pages.json

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

pages/SecondPhase/EmptyBoxOutStore.vue

@@ -0,0 +1,162 @@
+<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">木箱号</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" @handleChange="handleChange1" />
+					</view>
+				</view>
+				<view v-if="editValue.length" class="msg_item" style="margin-bottom:16rpx;">已扫木箱号：{{editValue.toString()}}</view>
+				<view class="zd-row filter_item">
+					<view class="zd-col-11 zd-row">
+						<view class="filter_label">已选木箱数</view>
+						<view class="filter_input_wraper">
+							<view class="filter_input" style="font-size: 34rpx; color: #ff6a00;text-align: center;">{{selectedNum}}</view>
+						</view>
+					</view>
+					<view class="zd-col-11 zd-row">
+						<view class="filter_label" style="width:auto">可选木箱数</view>
+						<view class="filter_input_wraper">
+							<view class="filter_input" style="font-size: 34rpx; color: #4e6ef2;text-align: center;">{{selectedNum !== null ? (10 - selectedNum) : null}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>选择</th>
+								<th>木箱号</th>
+								<th>木箱料号</th>
+								<th>木箱描述</th>
+								<th>最大子卷数</th>
+								<th>木箱长度</th>
+								<th>木箱宽度</th>
+								<th>木箱高度</th>
+								<th>载具类型</th>
+								<th>木箱重量</th>
+								<th>仓位</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}" @tap="toCheck(e)">
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}">&#xe66b;</span></td>
+								<td>{{e.box_no}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.num}}</td>
+								<td>{{e.box_length}}</td>
+								<td>{{e.box_width}}</td>
+								<td>{{e.box_high}}</td>
+								<td>{{e.vehicle_type}}</td>
+								<td>{{e.box_weight}}</td>
+								<td>{{e.struct_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !checkArr.length}" :disabled="disabled" @tap="_twoBoxOut">出库确认</button>
+		</view>
+		<up-top ref="UT" :scrollTop="top"></up-top>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import UpTop from '@/components/upTop.vue'
+	import {twoQueryBoxIvt, twoBoxOut} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			UpTop
+		},
+		data() {
+			return {
+				title: '',
+				top: 0,
+				val1: '',
+				editValue: [], // 扫描木箱号集合
+				selectedNum: null, // 已选木箱数
+				dataList: [],
+				checkArr: [],
+				disabled: false
+			};
+		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange1 (e) {
+				if (e) {
+					this._twoQueryBoxIvt(e)
+				}
+			},
+			async _twoQueryBoxIvt (e) {
+				try {
+					let res = await twoQueryBoxIvt(e)
+					if (res && res.data.length) {
+						res.data.map(el => {
+							this.$set(el, 'checked', false)
+						})
+						this.dataList = [...this.dataList, ...res.data]
+						this.editValue.push(this.val1)
+					}
+				} catch (e) {
+					this.val1 = ''
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+				this.selectedNum = this.checkArr.length
+				if (this.selectedNum > 10) {
+					e.checked = false
+					this.checkArr = this.dataList.filter(i => { return i.checked === true })
+					this.selectedNum = this.checkArr.length
+				}
+			},
+			async _twoBoxOut () {
+				this.disabled = true
+				if (!this.checkArr.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await twoBoxOut(this.checkArr)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.clearUp()
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.editValue = []
+				this.selectedNum = null
+				this.checkArr = []
+				this.dataList = []
+				this.disabled = false
+			}
+		}
+	}
+</script>

utils/getData3.js

@@ -404,4 +404,19 @@ export const cutUpShaft = (area, device, point, lk, rk) => request({
 		left_spec: lk,
 		right_spec: rk
 	}
-})
+})
+/**
+ * 空木箱出库（二期空木箱出库）
+ */
+export const twoQueryBoxIvt = (no) => request({
+	url:'api/twoPda/st/queryBoxIvt',
+	data: {
+		box_no: no
+	}
+})
+export const twoBoxOut = (data) => request({
+	url:'api/twoPda/st/boxOut',
+	data: {
+		data: data
+	}
+})

utils/mork2.js

@@ -113,47 +113,15 @@ export const allAuthority = () => {
 			]},
 			{menu_id: '8', path: 'RF13', title: '立库库存', sonTree: [
 				{menu_id: '1', title: '空木箱库存', path: '/pages/SecondPhase/lvt/EmptyBox'}
+			]},
+			{menu_id: '9', path: 'RF14', title: '空木箱出库', sonTree: [
+				{menu_id: '1', title: '空木箱出库', path: '/pages/SecondPhase/EmptyBoxOutStore'}
 			]}
 		]
 		}
 	}}
 	return res
 }
-export const authority = () => {
-	let res = {
-		code: '1',
-		result: {
-			rf_menu0: {
-				sonTree: [
-					{title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '人工烘烤'}]},
-					{title: '半成品管理',sonTree: [{title: '半成品入库'},{title: '半成品出库'}]},
-					{title: '分切管理',sonTree: [{title: '分切上料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'}]},
-					{title: '点位管理',sonTree: [{title: '点位管理'},{title: '异常出库解锁'}]},
-					{title: '纸管/FRP管管理', sonTree: [{title: '空管入库'},{title: '空管出库'}]},
-					{title: '成品管理',sonTree: [{title: '生产入库'},{title: '退货入库'},{title: '报废入库'},{title: '拆分入库'},{title: '生产区发货'},{title: '虚拟区发货'},{title: '贴标捆扎'}]},
-					{title: '在库管理', sonTree: [{title: '盘点管理'}]},
-					{title: '载具管理', sonTree: [{title: '空载具入库'},{title: '空载具出库'}]},
-					{title: '打印管理', sonTree: [{title: '客户标签打印'}]},
-					{title: '调度管理', sonTree: [{title: '任务管理'},{title: 'RGV状态查询'}]}
-				]
-			},
-			rf_menu1: {
-				sonTree: [
-					{title: '载具入库',sonTree: [{title: '空载具入库'}]},
-					{title: '空木箱入库',sonTree: [{title: '空木箱入库'}]},
-					{title: '发货区',sonTree: [{title: '发货区解绑'}]},
-					{title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '表处工序'},{title: '人工烘烤'},{title: '子卷质检'}, {title: '子卷装箱'}, {title: '标签打印'}]},
-					{title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}, {title: '子卷重量维护'}, {title: '分切上轴'}]},
-					{title: '点位管理', sonTree: [{title: '点位管理'},{title: '异常出库解锁'},{title: '人工放行'}]},
-					{title: '成品入库', sonTree: [{title: '退货口入库'},{title: '异常口入库'},{title: '木箱称重'}]},
-					{title: '立库库存', sonTree: [{title: '空木箱库存'}]}
-				]
-			}
-		}
-	}
-	return res
-}
-
 export const twoPdaIvtQuery = (no, code) => {
 	let res = {
 		data: [{bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}, {bill_code: '3', bill_status: 'ljdjldj'}, {bill_code: '4'}, {bill_code: '5', bill_status: 'ljdjldj'}, {bill_code: '6'}, {bill_code: '7', bill_status: 'ljdjldj'}, {bill_code: '8'}, {bill_code: '9', bill_status: 'ljdjldj'}, {bill_code: '12', confirm_time: '2020-10-20'}]
@@ -287,4 +255,11 @@ export const paperQueryPaperMaterial = () => {
 		}]
 	}
 	return res
+}
+export const twoQueryBoxIvt = (code) => {
+	let res = {
+		msg: 'ok',
+		data: [{box_no: '100010000a' + code}]
+	}
+	return res
 }