需求修改

common/style/layout.styl

@@ -301,6 +301,9 @@ uni-button:after {
 	border: 2rpx solid #ff6a00;
 	border-radius: 10rpx;
 }
+.button-primary_s {
+	font-size: 28rpx;
+}
 .button-info, .submit-button[disabled] {
 	background-color: #c9c9c9;
 	border: 2rpx solid #c9c9c9;

components/LinkScan.vue

@@ -13,7 +13,7 @@
 				@blur="handleBlur"
 				@confirm="handleSend">
 			</view>
-			<uni-icons v-show="scanList.length" class="mgr20" type="clear" size="24" color="#4e6ef2" @tap="toDel"></uni-icons>
+			<uni-icons v-show="scanList.length" class="pdr10" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
 			<uni-icons type="scan" size="22" :color="focusState ? '#D7592F' : '#4e6ef2'" @tap="focusState=true"></uni-icons>
 		</view>
 		<view v-show="scanList.length > 0 && show" class="scan_list_select">

pages/home/home.vue

@@ -32,10 +32,10 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '物料入库', icon: 'RF03', path: '/pages/manage/mater-in-storage'},
+					{title: '物料入库转运', icon: 'RF03', path: '/pages/manage/mater-in-storage'},
-					{title: '外协区空笼框送回', icon: 'RF01', path: '/pages/manage/empty-tray-back'},
+					{title: '外协区送回', icon: 'RF01', path: '/pages/manage/empty-tray-back'},
-					{title: '外协区空料架送回', icon: 'RF05', path: '/pages/manage/empty-material-racks-back'},
+					// {title: '外协区空料架送回', icon: 'RF05', path: '/pages/manage/empty-material-racks-back'},
-					{title: '物料转运', icon: 'RF02', path: '/pages/manage/material-transfer'},
+					// {title: '物料转运', icon: 'RF02', path: '/pages/manage/material-transfer'},
 					{title: '区域锁定', icon: 'RF06', path: '/pages/manage/area-lock'},
 					{title: '补空框', icon: 'RF04', path: '/pages/manage/fill-tray'},
 					{title: '修改订单工序', icon: 'RF07', path: '/pages/manage/modify-process'}

pages/manage/area-lock.vue

@@ -5,18 +5,34 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
-						<span class="filter_label">区域</span>
+						<span class="filter_label">区域一</span>
 					</view>
 					<view class="zd-col-19 filter_select">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index1" :localdata="options1"></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 filter_select">
+						<uni-data-select v-model="index2" :localdata="options1"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">区域三</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<uni-data-select v-model="index3" :localdata="options1"></uni-data-select>
 					</view>
 				</view>
 			</view>
 		</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': index === ''}" :disabled="disabled" @tap="_handheldLock('1')">锁定</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': index1 === '' && index2 === '' && index3 === ''}" :disabled="disabled" @tap="_handheldLock('1')">锁定</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': index === ''}" :disabled="disabled" @tap="_handheldLock('0')">释放</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': index1 === '' && index2 === '' && index3 === ''}" :disabled="disabled" @tap="_handheldLock('0')">释放</button>
 		</view>
 	</view>
 </template>
@@ -24,6 +40,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	// import {regionList} from '@/utils/mork2.js'
 	import {regionList, handheldLock} from '@/utils/getData2.js'
 	export default {
 		components: {
@@ -33,8 +50,10 @@
 		data() {
 			return {
 				title: '',
-				options: [],
+				options1: [],
-				index: '',
+				index1: '',
+				index2: '',
+				index3: '',
 				disabled: false
 			};
 		},
@@ -45,22 +64,20 @@
 		methods: {
 			async _regionList () {
 				let res = await regionList()
-				this.options = [...res.content]
+				this.options1 = [...res.content]
-				this.options.map(el => {
+				this.options1.map(el => {
 					this.$set(el, 'text', el.label)
 				})
 			},
-			selectChange (e) {
-				this.index = e
-			},
 			async _handheldLock (type) {
 				this.disabled = true
-				if (this.index === '') {
+				if (this.index1 === '' && this.index2 === '' && this.index3 === '') {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await handheldLock(this.index, type)
+					let arr = [this.index1, this.index2, this.index3]
+					let res = await handheldLock(arr, type)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -71,7 +88,9 @@
 				}
 			},
 			clearUp () {
-				this.index = ''
+				this.index1 = ''
+				this.index2 = ''
+				this.index3 = ''
 				this.disabled = false
 			}
 		}

pages/manage/empty-tray-back.vue

@@ -13,7 +13,7 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row">
+				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
 						<span class="filter_label">载具号</span>
 					</view>
@@ -21,11 +21,20 @@
 						<link-scan ref="scanChild" @getScanlist="getScanlist"/>
 					</view>
 				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">目的地</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-4 button-default button-primary_s" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_handheldCageFrame">送回确认</button>
+			<button class="zd-col-9 button-primary button-primary_s" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_handheldCageFrame">空笼框送回确认</button>
+			<button class="zd-col-9 button-primary button-primary_s" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldRack">空料架送回确认</button>
 		</view>
 	</view>
 </template>
@@ -34,7 +43,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import LinkScan from '@/components/LinkScan.vue'
-	import {handheldCageFrame} from '@/utils/getData2.js'
+	import {handheldCageFrame, handheldRack} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -46,6 +55,8 @@
 				title: '',
 				val1: '',
 				val2: '',
+				options: [{ value: '1', text: '货架' }, { value: '2', text: '内部' }, { value: '3', text: '外协' }],
+				index: '',
 				disabled: false
 			};
 		},
@@ -57,13 +68,30 @@
 				this.val2 = e.join()
 			},
 			async _handheldCageFrame () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handheldCageFrame(this.val1, this.val2, this.index)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _handheldRack () {
 				this.disabled = true
 				if (!this.val1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await handheldCageFrame(this.val1, this.val2)
+					let res = await handheldRack(this.val1, this.val2)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -76,6 +104,7 @@
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
+				this.index = ''
 				this.$refs.scanChild.toDel()
 				this.disabled = false
 			}

pages/manage/mater-in-storage.vue

@@ -27,12 +27,12 @@
 					<view class="zd-col-5">
 						<span class="filter_label">目的地</span>
 					</view>
-					<view class="zd-col-19">
+					<view class="zd-col-19 filter_select">
-						<input type="text" class="filter_input" v-model="val3">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 			</view>
-			<view class="zd_wrapper grid-wraper">
+			<view v-show="index === '1'" class="zd_wrapper grid-wraper">
 				<view class="slide_new">
 					<table>
 						<thead>
@@ -54,10 +54,21 @@
 					</table>
 				</view>
 			</view>
+			<view v-show="dataList.length > 0 && dataList[0].order_code.indexOf('OR') !== -1" class="zd_wrapper">
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">下一道工序</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<uni-data-select v-model="index1" :localdata="options1"></uni-data-select>
+					</view>
+				</view>
+			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldBlanking">入库确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldBlanking">入库确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldTranshipment">物料转运</button>
 		</view>
 	</view>
 </template>
@@ -65,7 +76,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {handheldBlanking} from '@/utils/getData2.js'
+	import {regionList, handheldBlanking, handheldTranshipment} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -76,23 +87,39 @@
 				title: '',
 				val1: '',
 				val2: '',
-				val3: '',
+				options: [{ value: '1', text: '货架' }, { value: '2', text: '内部' }, { value: '3', text: '外协' }],
+				index: '',
+				options1: [],
+				index1: '',
 				disabled: false,
 				dataList: [{order_code: '', material_code: '', material_qty: 0}]
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._regionList()
 		},
 		methods: {
+			selectChange (e) {
+				this.dataList = [{order_code: '', material_code: '', material_qty: 0}]
+				this.index1 = ''
+			},
+			async _regionList () {
+				let res = await regionList()
+				this.options1 = [...res.content]
+				this.options1.map(el => {
+					this.$set(el, 'text', el.label)
+				})
+			},
 			addRow () {
 				this.dataList.push({order_code: '', material_code: '', material_qty: 0})
 			},
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
-				this.val3 = ''
+				this.index = ''
 				this.dataList = [{order_code: '', material_code: '', material_qty: 0}]
+				this.index1 = ''
 				this.disabled = false
 			},
 			async _handheldBlanking () {
@@ -108,11 +135,28 @@
 					}
 				})
 				try {
-					let res = await handheldBlanking(this.val1, this.val3, this.val2, arr)
+					let res = await handheldBlanking(this.val1, this.index, this.val2, arr, this.index1)
 					this.clearUp()
 				} catch (e) {
 					this.disabled = false
 				}
+			},
+			async _handheldTranshipment () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handheldTranshipment(this.val1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
 			}
 		}
 	}

pages/manage/modify-process.vue

@@ -107,6 +107,10 @@
 				try {
 					let res = await updateOrder(this.dataList)
 					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
 				} catch (e) {
 					this.disabled = false
 				}

utils/getData2.js

@@ -36,9 +36,9 @@ export const handheldRack = (code, vcode) => request({
 	data: {device_code: code, vehicle_code: vcode}
 })
 // 外协区空笼框送回
-export const handheldCageFrame = (code, list) => request({
+export const handheldCageFrame = (code, list, rcode) => request({
 	url:'api/handheld/cageFrame',
-	data: {device_code: code, vehicle_list: list}
+	data: {device_code: code, vehicle_list: list, region_code: rcode}
 })
 // 物料转运
 export const handheldTranshipment = (code, vcode) => request({
@@ -60,9 +60,9 @@ export const handheldStorehouse = (code, type) => request({
 // 	url:'api/handheld/getRegionCode',
 // 	data: {orderCode: code}
 // })
-export const handheldBlanking = (code, rcode, vcode, material) => request({
+export const handheldBlanking = (code, rcode, vcode, material, rcode1) => request({
 	url:'api/handheld/blanking',
-	data: {device_code: code, region_code: rcode, vehicle_code: vcode, material: material}
+	data: {device_code: code, region_code: rcode, vehicle_code: vcode, material: material, region_code1: rcode1}
 })
 // 修改订单工序
 export const fabOrders = (code) => request({
@@ -72,4 +72,4 @@ export const fabOrders = (code) => request({
 export const updateOrder = (data) => request({
 	url:'api/handheld/updateOrder',
 	data: data
-})
+})