无人车卸货

pages/hdyy/wrcdj/wrc-unload.vue

@@ -3,45 +3,27 @@
 		<!-- 无人车卸货 -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
-						<span class="filter_label">卸货区</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
-						<span class="filter_label">目的区域</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<uni-data-select v-model="index2" :localdata="options2"></uni-data-select>
-					</view>
-				</view>
-			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
 					<table>
 						<thead>
 							<tr>
-								<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
 								<th>序号</th>
 								<th>点位编码</th>
 								<th>点位名称</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
 								<th>物料类型</th>
-								<th>AGV任务</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
-								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
 								<td>{{i+1}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.point_name}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
 								<td>{{e.class_name}}</td>
-								<td>{{e.task_code}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -50,31 +32,22 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-7 button-primary" :class="{'button-info': !index2 || !checkedArr.length}" :disabled="disabled" @tap="_unload">卸货</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_unload">卸货</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled" @tap="_waiting">等待</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_back">回库</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled" @tap="_back">回库</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
+	import {queryNotCarPoint, unload, back} from '@/utils/getData3.js'
-	import {queryXhRegion, queryEndRegion, queryRegionPoint, unload, waiting, back} from '@/utils/getData3.js'
 	export default {
 		components: {
-			NavBar,
+			NavBar
-			SearchBox
 		},
 		data() {
 			return {
 				title: '',
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				allCheck: false,
-				checkedArr: [],
 				dataList: [],
 				dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
 				disabled: false
@@ -82,60 +55,16 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryRegionPoint()
+			this._queryNotCarPoint()
-			this._queryEndRegion()
 		},
 		methods: {
-			selectChange (e) {
-				this.index1 = e
-				this._queryRegionPoint()
-			},
-			/** 下拉框*/
-			async _queryXhRegion () {
-				try {
-					let res = await queryXhRegion()
-					if (res && res.data) {
-						this.options1 = [...res.data]
-					} else {
-						this.options1 = []
-					}
-				} catch (e) {
-					this.options1 = []
-				}
-			},
-			/** 下拉框*/
-			async _queryEndRegion () {
-				try {
-					let res = await queryEndRegion()
-					if (res && res.data) {
-						this.options2 = [...res.data]
-					} else {
-						this.options2 = []
-					}
-				} catch (e) {
-					this.options2 = []
-				}
-			},
 			toEmpty () {
-				this.index1 = ''
-				this.index2 = ''
 				this.dataList = []
 				this.disabled = false
 			},
-			toAllCheck () {
+			async _queryNotCarPoint () {
-				this.allCheck = !this.allCheck
-				this.dataList.map(el => {
-					el.checked = this.allCheck
-				})
-			},
-			toCheck (e) {
-				e.checked = !e.checked
-				this.checkedArr = this.dataList.filter(el => el.checked === true)
-				this.allCheck = this.checkedArr.length === this.dataList.length
-			},
-			async _queryRegionPoint () {
 				try {
-					let res = await queryRegionPoint(this.index1)
+					let res = await queryNotCarPoint()
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 					} else {
@@ -146,35 +75,13 @@
 				}
 			},
 			async _unload () {
-				this.checkedArr = this.dataList.filter(el => el.checked === true)
 				this.disabled = true
-				if (!this.index2 || !this.checkedArr.length) {
+				if (!this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await unload(this.index2, this.checkedArr)
+					let res = await unload(this.dataList)
-					if (res) {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-					}
-					this.toEmpty()
-					this.disabled = false
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			async _waiting () {
-				this.checkedArr = this.dataList.filter(el => el.checked === true)
-				this.disabled = true
-				if (!this.checkedArr.length) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await waiting()
 					if (res) {
 						uni.showToast({
 							title: res.message,
@@ -188,9 +95,8 @@
 				}
 			},
 			async _back () {
-				this.checkedArr = this.dataList.filter(el => el.checked === true)
 				this.disabled = true
-				if (!this.checkedArr.length) {
+				if (!this.dataList.length) {
 					this.disabled = false
 					return
 				}

utils/getData3.js

@@ -442,31 +442,17 @@ export const queryIvt = (scode, pcode, mcode, pcsn) => request({
 /**
  * 无人车
  */
-// 无人车卸货（无人车对接）共 (6) 个
+// 无人车卸货（无人车对接）共 (3) 个
-// 查询卸货区下拉框
+// 查询无人车点位信息
-export const queryXhRegion = () => request({
+export const queryNotCarPoint = () => request({
-	url:'api/notCar/queryXhRegion',
+	url:'api/notCar/queryNotCarPoint',
-	data: {}
-})
-// 根据区域查询对应点位
-export const queryRegionPoint = (rcode) => request({
-	url:'api/notCar/queryRegionPoint',
-	data: {region_code: rcode}
-})
-// 查询目的区域下拉框
-export const queryEndRegion = () => request({
-	url:'api/notCar/queryEndRegion',
 	data: {}
 })
+
 // 卸货
-export const unload = (rcode, rows) => request({
+export const unload = (rows) => request({
 	url:'api/notCar/unload',
-	data: {region_code: rcode, rows: rows}
+	data: {rows: rows}
-})
-// 等待
-export const waiting = () => request({
-	url:'api/notCar/waiting',
-	data: {}
 })
 // 回库
 export const back = () => request({