From 0d329f3e3c556ec448e3ce1e4de737f435e44529 Mon Sep 17 00:00:00 2001
From: "bbl\\baobl" <bbl17156787365@163.com>
Date: Tue, 12 Mar 2024 16:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=87=BA=E5=BA=93=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business-data/asn/index.vue         |  2 +-
 .../business-data/pickDetail/pickTask.vue     | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/business-data/asn/index.vue b/src/views/business-data/asn/index.vue
index 23df384..4c180f5 100644
--- a/src/views/business-data/asn/index.vue
+++ b/src/views/business-data/asn/index.vue
@@ -64,7 +64,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table border ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="dept.name" label="仓库" />
         <el-table-column prop="billType.name" label="单据类型" />
diff --git a/src/views/business-data/pickDetail/pickTask.vue b/src/views/business-data/pickDetail/pickTask.vue
index 683c6db..6ba8538 100644
--- a/src/views/business-data/pickDetail/pickTask.vue
+++ b/src/views/business-data/pickDetail/pickTask.vue
@@ -39,11 +39,11 @@
       <el-input v-model="query.dstPointCode" clearable placeholder="目标点位" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
       <rrOperation :crud="crud" />
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name" />
+      <crudOperation :permission="permission" :table-key="tableKey" />
       <!--表单组件-->
 
       <!--表格渲染-->
-      <el-table ref="table"  height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table border ref="table"  height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="xh" type="index" :index="indexMethod"  label="序号"/>
         <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
@@ -56,16 +56,23 @@
             <div>{{ scope.row.item.name }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="srcStockCode" label="容器编码" />
-        <el-table-column prop="srcPointCode" label="原点位" />
-        <el-table-column prop="dstPointCode" label="目标点位" />
+        <el-table-column prop="srcPoint.code" label="原点位" />
+        <el-table-column prop="dstPoint.code" label="目标点位" />
         <el-table-column prop="agvStatus" label="任务状态">
           <template slot-scope="scope">
-            {{ dict.label.task_status[scope.row.agvTask.status] }}
+            <span v-if="dict.label.pick_status[scope.row.taskStatus] ==null">{{ scope.row.taskStatus }}</span>
+            <span v-if="scope.row.taskStatus !=null">{{ dict.label.pick_status[scope.row.taskStatus] }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="agvTask" label="AGV搬运任务">
+          <template slot-scope="scope">
+            <div v-if="scope.row.agvTask !=null">{{ scope.row.agvTask.id }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="beSkip" label="是否AGV任务" />
         <el-table-column prop="planQty" label="计划数量" />
         <el-table-column prop="moveQty" label="移位数量" />
+        <el-table-column prop="moveQty" label="移位数量" />
         <el-table-column prop="createBy" label="创建人" />
         <el-table-column prop="createTime" label="创建时间" />
       </el-table>
@@ -92,7 +99,7 @@ export default {
   name: 'Task',
   components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['task_status'],
+  dicts: ['pick_status'],
   cruds() {
     return CRUD({ query:{taskType:['PICK']}, title: '出库任务', url: 'api/task', idField: 'id', sort: 'id,desc', crudMethod: { ...crudTask },
         optShow: {
@@ -113,6 +120,7 @@ export default {
         edit: ['admin', 'task:edit'],
         del: ['admin', 'task:del']
       },
+      tableKey: 'api/task',
       rules: {
       },
       queryTypeOptions: [