From 4187f2d9ba9edbd99726de8f189f3e3d3eacdfb0 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 6 Aug 2024 10:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E9=85=8D=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/storagecost/index.js                       | 14 ++++++++++++--
 .../Deliverycostmanagement/Categorypricingunit.vue | 11 +++++++++++
 .../distribution/turndelivery/deliveryDiscuss.vue  |  4 ++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/api/storagecost/index.js b/src/api/storagecost/index.js
index 845de824..d1c0e8fa 100644
--- a/src/api/storagecost/index.js
+++ b/src/api/storagecost/index.js
@@ -170,7 +170,7 @@ export const $_expenseDispatchPriceUnit = params => {
 // 配送-模板-品牌品类计价单位-新增
 export const $_expenseDispatchPriceUnitadd = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zqb/expenseDispatchPriceUnit/save',
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceUnit/save',
     method: 'post',
     data,
   });
@@ -178,7 +178,17 @@ export const $_expenseDispatchPriceUnitadd = data => {
 // 配送-模板-品牌品类计价单位-修改
 export const $_expenseDispatchPriceUnitupdate = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zqb/expenseDispatchPriceUnit/update',
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceUnit/update',
+    method: 'post',
+    data,
+  });
+};
+
+
+// 配送-模板-品牌品类计价单位-删除
+export const $_expenseDispatchPriceUnitremove = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceUnit/remove',
     method: 'post',
     data,
   });
diff --git a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
index 9729f3b7..a91f4f07 100644
--- a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
+++ b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
@@ -46,6 +46,7 @@
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="ElBtnClass">
                 <el-text size="small" @click="handleEdit(slotProps.scope)">编 辑</el-text>
+                <el-text size="small" @click="handledelete(slotProps.scope)">删 除</el-text>
               </div>
             </template>
           </template>
@@ -128,6 +129,7 @@ import {
   $_expenseDispatchPriceUnit,
   $_expenseDispatchPriceUnitadd,
   $_expenseDispatchPriceUnitupdate,
+  $_expenseDispatchPriceUnitremove,
 } from '@/api/storagecost/index.js';
 import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
@@ -348,6 +350,15 @@ const handleEdit = row => {
   console.log(row);
   dialogedit.value = true;
 };
+// 删除
+const handledelete=()=>{
+  let data={
+    
+  }
+  $_expenseDispatchPriceUnitremove(data).then(res=>{
+    console.log(res,'删除成功');
+  })
+}
 // 新增品牌
 const addCategory = () => {
   dialogedit.value = true;
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 7da0b9cf..c07f6fe7 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -2674,6 +2674,10 @@ const QuantityEntry = val => {
     getZeroOrderDetail(val.id).then(res => {
       console.log(res, '数量录入返回信息');
       isZeroTable.value = res.data.data;
+      comprehensive.value = true; //开启弹窗
+      QuantityEntryStatus.value = true; //此时开启零担录入
+      EnteringLibrary.value = true; //显示零担
+      SjTc.value = false; //关闭司机弹窗
     });
   }
 };