From 63c8fd81e6a70ed2cf60b634ab89a17b32ff7312 Mon Sep 17 00:00:00 2001
From: "bbl\\baobl" <bbl17156787365@163.com>
Date: Thu, 14 Mar 2024 09:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=88=86=E9=85=8D-=E4=BA=BA=E5=B7=A5=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pickDetail.js                               |  4 ++--
 src/views/base-data/box/index.vue                   |  4 ++--
 src/views/business-data/pick/index.vue              |  2 +-
 src/views/business-data/pickDetail/index.vue        |  2 +-
 .../business-data/pickDetail/pickTicketTask.vue     | 13 +++++++------
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/api/pickDetail.js b/src/api/pickDetail.js
index ebef82c..68b8b50 100644
--- a/src/api/pickDetail.js
+++ b/src/api/pickDetail.js
@@ -40,11 +40,11 @@ export function cancelAllocate(ids) {
   })
 }
 
-export function picking(pickDetailId) {
+export function picking(datas) {
   return request({
     url: 'api/pickDetail/picking',
     method: 'post',
-    data: pickDetailId
+    data: datas
   })
 }
 
diff --git a/src/views/base-data/box/index.vue b/src/views/base-data/box/index.vue
index bd717f7..f763fda 100644
--- a/src/views/base-data/box/index.vue
+++ b/src/views/base-data/box/index.vue
@@ -32,10 +32,10 @@
         <rrOperation :crud="crud"/>
       </div>
 
-      <crudOperation :permission="permission">
+      <crudOperation :permission="permission" :tableKey="this.$options.name">
       </crudOperation>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+      <el-dialog  :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
                  :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
           <el-form-item label="编号" prop="code">
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index eed94fe..955d337 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -81,7 +81,7 @@
         </el-table-column>
         <el-table-column prop="dispatchDate" label="发货时间" />
         <el-table-column prop="erTime" label="操作时间" />
-        <el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" width="150px" align="center">
+        <el-table-column fixed="right" v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
diff --git a/src/views/business-data/pickDetail/index.vue b/src/views/business-data/pickDetail/index.vue
index 151c04f..412b2ef 100644
--- a/src/views/business-data/pickDetail/index.vue
+++ b/src/views/business-data/pickDetail/index.vue
@@ -97,7 +97,7 @@
           icon="el-icon-edit"
           size="mini"
           :loading="crud.delAllLoading"
-          :disabled="show_jh"
+          :disabled="crud.selections.length !== 1 || this.crud.selections[0].allocatedQty<=this.crud.selections[0].pickedQty"
           @click="getPickTask(crud.selections[0].id)"
         >
           拣货确认
diff --git a/src/views/business-data/pickDetail/pickTicketTask.vue b/src/views/business-data/pickDetail/pickTicketTask.vue
index 7cb3d13..7f73980 100644
--- a/src/views/business-data/pickDetail/pickTicketTask.vue
+++ b/src/views/business-data/pickDetail/pickTicketTask.vue
@@ -20,8 +20,8 @@
           class="filter-item"
           type="primary"
           icon="el-icon-lollipop"
-          @click="picking"
-        >整单拣货
+          @click="picking(crud.selections)"
+        >人工拣货
         </el-button>
 
         <el-button
@@ -38,6 +38,7 @@
     </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" style="width: 100%;margin-top: -10px;">
+      <el-table-column type="selection" width="50" />
       <el-table-column type="index" :index="indexMethod" label="序号"/>
       <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="任务号">
         <template slot-scope="scope">
@@ -117,15 +118,15 @@ export default {
     indexMethod(index) {
       return index * 1 + 1;
     },
-    picking() {
-      this.$confirm(`确认整单拣货?`, '提示', {
+    picking(datas) {
+      this.$confirm(`确认拣货?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
 
-        crudPickDetail.picking(this.pickDetailId).then(res => {
-          this.$parent.crud.notify('拣货成功！', CRUD.NOTIFICATION_TYPE.SUCCESS);
+        crudPickDetail.picking(datas).then(res => {
+          this.$parent.crud.notify(res.message, res.status)
           this.queryPickTask(this.pickDetailId)
         }).catch(() => {