change

pages.json

@@ -347,6 +347,14 @@
                 "navigationStyle": "custom"
             }
             
+        }
+        ,{
+            "path" : "pages/outbound/line-transfer2",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
         }
         ,{
             "path" : "pages/outbound/empty-vehicle-outstore",

pages/home/home.vue

@@ -42,7 +42,7 @@
 				userName: '',
 				menuList: [
 					{title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group2'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
-					{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '取货确认', path: '/pages/outbound/quhuo-confirm'}]},
+					{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '取货确认', path: '/pages/outbound/quhuo-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer2'}]},
 					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
 					{title: '出库管理', path: 'RF02', sonTree: [{title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
 					// {title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},

pages/outbound/line-callmater.vue

@@ -34,24 +34,24 @@
 					<table>
 						<thead>
 							<tr>
+								<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" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
+								<td>{{e.struct_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.qty}}</td>
 								<td>{{e.material_spec}}</td>
+								<td>{{e.qty_unit_name}}</td>
 								<td>{{e.material_code}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.struct_code}}</td>
-								<td>{{e.qty_unit_name}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -168,6 +168,9 @@
 				}
 			},
 			toChek (e) {
+				if (e.material_code === 'KH001') {
+					return
+				}
 				this.pkId = this.pkId === e.group_id ? '' : e.group_id
 				this.pkObj = this.pkId === e.group_id ? e : {}
 			},

pages/outbound/line-transfer.vue

@@ -75,7 +75,7 @@
 				val3: '',
 				val2: '',
 				options: [{text:'站点', value:'1'},{text:'区域',value: '2'}],
-				index: '',
+				index: '2',
 				// options2: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
 				options2: [],
 				index2: '',

pages/outbound/line-transfer2.vue

@@ -0,0 +1,150 @@
+<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">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">站点类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom" v-show="index !== '2'">
+					<view class="zd-col-7">
+						<span class="filter_label">终点站点</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom" v-show="index == '2'">
+					<view class="zd-col-7">
+						<span class="filter_label">目标区域</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_transferConfirm">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getSect, getRegion, transferConfirm} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val3: '',
+				val2: '',
+				options: [{text:'站点', value:'1'},{text:'区域',value: '2'}],
+				index: '2',
+				// options2: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				options2: [],
+				index2: '',
+				disabled: false,
+				currentData: {},
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._getRegion()
+		},
+		methods: {
+			async _getRegion () {
+				try {
+					let res = await getRegion()
+					if (res) {
+						this.options2 = res
+						this.index2 = res[0].value
+					} else {
+						this.options2 =[]
+					}
+				} catch (e) {
+					this.options2 = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.index2 = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _transferConfirm () {
+				this.disabled = true
+				if (!this.val3 || !this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await transferConfirm(this.val3, this.val1, this.val2, this.index2)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>

pages/outbound/mater-outstore.vue

@@ -113,6 +113,7 @@
 					let res = await getSect('XB')
 					if (res) {
 						this.options = res
+						this.index = res[0].value
 					} else {
 						this.options =[]
 					}