add

pages/ftdl/man-get-goods.vue

@@ -1,20 +1,12 @@
 <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-24 filter_select">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">载具编码</span>
+						<span class="filter_label">点位</span>
 					</view>
 					<view class="zd-col-24 filter_select">
 						<search-box
@@ -28,17 +20,19 @@
 					<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>
+								<th>设备号</th>
+								<th>当前步骤</th>
+								<th>异常信息</th>
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
+							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.task_type}}</td>
 								<td>{{e.task_code}}</td>
 								<td>{{e.vehicle_code}}</td>
@@ -46,6 +40,8 @@
 								<td>{{e.point_code1}}</td>
 								<td>{{e.point_code2}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,10 +50,8 @@
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="toSure('80')">确认取货</button>
 		</view>
 	</view>
 </template>
@@ -65,7 +59,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStatusEnum, schBaseTask, saveCheckTask} from '@/utils/getData2.js'
+	import {schBaseTask, saveCheckTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -74,11 +68,8 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
 				val1: '',
 				dataList: [],
-				pkId: '',
 				reload: false,
 				status: 'more',
 				contentText: {
@@ -94,18 +85,12 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._getStatusEnum()
 		},
 		methods: {
-			async _getStatusEnum () {
-				let res = await getStatusEnum()
-				this.options = [...res]
-				this.options.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
-			selectChange (e) {
-				this.index = e
+			clearUp () {
+				this.val1 = ''
+				this.dataList = []
+				this.disabled = false
 			},
 			searchList () {
 				this.dataList = []
@@ -113,7 +98,7 @@
 				this._schBaseTask()
 			},
 			async _schBaseTask () {
-				let res = await schBaseTask(this.pageNum + '', this.pageSize + '', this.index, this.val1)
+				let res = await schBaseTask(this.pageNum + '', this.pageSize + '', this.val1)
 				if (res.code === '200') {
 					this.totalCount = res.totalElements
 					if (res.totalElements > 0) {
@@ -140,22 +125,17 @@
 					this.status = 'noMore'
 				}
 			},
-			toCheck (e) {
-				this.pkId = e.e.task_code === this.pkId ? '' : e.task_code
-			},
 			async toSure (status) {
 				this.disabled = true
-				if (!this.pkId) {
+				if (!this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await saveCheckTask(this.pkId, status)
+					let res = await saveCheckTask(this.dataList)
 					if (res.code === '200') {
-						this.index = ''
 						this.val1 = ''
 						this.dataList = []
-						this.pkId = ''
 						uni.showToast({
 							title: res.desc,
 							icon: 'none'