From 51a96d19d25d0d6f93ff4067649775f2b33efdb5 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 5 Aug 2024 20:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E5=A2=9E=E5=8A=A0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/CreateOrder.js           |   1 -
 src/api/storagecost/index.js                  |  34 +++++
 src/option/reportforms/DeliveryDetails.js     |  44 ++++++
 src/option/reportforms/Selfpickupreport.js    |  22 +++
 src/option/storagecost/Categorypricingunit.js |   8 +-
 .../goodsArea/basicdataGoodsArea.vue          |  18 ++-
 .../goodsShelf/basicdataGoodsShelf.vue        |  56 ++++++-
 .../goodsShelf/basicdataGoodsShelfView.vue    |   1 +
 .../Basicconfiguration.vue                    |   7 +-
 .../Categorypricingunit.vue                   | 139 ++++++++++++++----
 .../WarehousePricingTemplate.vue              |  84 ++++++++---
 .../WarehouseTemplateHome.vue                 |  17 +--
 .../deliverylist/distributionDeliveryList.vue |  12 +-
 .../warehouseWarehouseingAddReceipt.vue       |   1 -
 14 files changed, 359 insertions(+), 85 deletions(-)

diff --git a/src/api/distribution/CreateOrder.js b/src/api/distribution/CreateOrder.js
index d82f3ab1..b2a3d6df 100644
--- a/src/api/distribution/CreateOrder.js
+++ b/src/api/distribution/CreateOrder.js
@@ -18,7 +18,6 @@ export const postOpenOrderOpenWaybill = data => {
   return request({
     url: '/api/logpm-trunkline/openOrder/openWaybill',
     method: 'post',
-    data,
   });
 };
 
diff --git a/src/api/storagecost/index.js b/src/api/storagecost/index.js
index d4f4e8b5..845de824 100644
--- a/src/api/storagecost/index.js
+++ b/src/api/storagecost/index.js
@@ -149,3 +149,37 @@ export const $_WarehouseTemplateHome = data => {
     data,
   });
 };
+// 配送-删除模板
+export const $_removeTemplate = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceTemplate/remove',
+    method: 'post',
+    params,
+  });
+};
+
+// 配送-模板-品牌品类计价单位
+export const $_expenseDispatchPriceUnit = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceUnit/page',
+    method: 'get',
+    params,
+  });
+};
+
+// 配送-模板-品牌品类计价单位-新增
+export const $_expenseDispatchPriceUnitadd = data => {
+  return request({
+    url: '/api/logpm-statisticsdata-zqb/expenseDispatchPriceUnit/save',
+    method: 'post',
+    data,
+  });
+};
+// 配送-模板-品牌品类计价单位-修改
+export const $_expenseDispatchPriceUnitupdate = data => {
+  return request({
+    url: '/api/logpm-statisticsdata-zqb/expenseDispatchPriceUnit/update',
+    method: 'post',
+    data,
+  });
+};
\ No newline at end of file
diff --git a/src/option/reportforms/DeliveryDetails.js b/src/option/reportforms/DeliveryDetails.js
index a43ca5d8..4c126461 100644
--- a/src/option/reportforms/DeliveryDetails.js
+++ b/src/option/reportforms/DeliveryDetails.js
@@ -59,6 +59,50 @@ export const columnList = [
       sortable: true,
       head: false,
     },
+    {
+      prop: 'brand',
+      label: '品牌',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'signNum',
+      label: '签收数量',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'loadingMode',
+      label: '装车方式',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'signType',
+      label: '签收方式',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
     {
         prop: 'type',
         label: '配送类型',
diff --git a/src/option/reportforms/Selfpickupreport.js b/src/option/reportforms/Selfpickupreport.js
index 84762884..391bbfb9 100644
--- a/src/option/reportforms/Selfpickupreport.js
+++ b/src/option/reportforms/Selfpickupreport.js
@@ -36,6 +36,28 @@ export const columnList = [
       sortable: true,
       head: false,
     },
+    {
+      prop: 'brand',
+      label: '品牌',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'signNum',
+      label: '签收数量',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
     {
       prop: 'consigneeUnit',
       label: '收货单位',
diff --git a/src/option/storagecost/Categorypricingunit.js b/src/option/storagecost/Categorypricingunit.js
index 8856fb6e..f4ee8533 100644
--- a/src/option/storagecost/Categorypricingunit.js
+++ b/src/option/storagecost/Categorypricingunit.js
@@ -7,7 +7,7 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'xh',
+    prop: '',
     label: '序号',
     type: 12,
     values: '',
@@ -15,7 +15,7 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'a1',
+    prop: 'categoryId',
     label: '成本结算品类',
     type: 2,
     values: '',
@@ -27,7 +27,7 @@ export const columnList = [
   },
 
   {
-    prop: 'a3',
+    prop: 'unit',
     label: '计价单位',
     type: 1,
     values: '',
@@ -38,7 +38,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'createUserName',
+    prop: '',
     label: '操作',
     type: 6,
     values: '',
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 060a9463..4e2bb0cc 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -173,7 +173,15 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="货区名称:" prop="headline" label-width="110px">
-                <el-input v-model="form.headline" placeholder="请输入标题" style="width: 100%" />
+                <!-- <el-input v-model="form.headline" placeholder="请输入标题" style="width: 100%" /> -->
+                <el-input
+                v-model="form.headline"
+                style="width: 100%" 
+               placeholder="请输入货区"
+               @input="headlineinput"
+                >
+            <template #append>区</template>
+            </el-input>
               </el-form-item>
             </el-col>
 
@@ -614,6 +622,7 @@ export default {
           this.buttonLoadingList.handleSubmitBtn = true;
           try {
             if (!this.form.id) {
+              this.form.headline=this.form.headline+'区'
               add(this.form).then(() => {
                 this.box = false;
                 this.isShow = false;
@@ -624,6 +633,7 @@ export default {
                 });
               });
             } else {
+              this.form.headline=this.form.headline+'区'
               update(this.form).then(() => {
                 this.box = false;
                 this.onLoad(this.page);
@@ -659,6 +669,7 @@ export default {
       this.aaa = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
+        this.headlineinput(this.form.headline)
         console.log(this.form);
       });
     },
@@ -693,6 +704,11 @@ export default {
           });
         });
     },
+    headlineinput(data){
+      if (data.includes('区')) {
+        this.form.headline = data.replace('区', '');
+      }   
+    },
     handleExports() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 70a71309..e9bc5a7d 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -166,11 +166,19 @@
             <!--            </el-col>-->
             <el-col :span="12" v-if="!allocation">
               <el-form-item label="货架名称:" prop="goodsShelfName" label-width="100px">
-                <el-input
+                <!-- <el-input
                   v-model="form.goodsShelfName"
                   placeholder="请输入货架名称"
                   style="width: 88%"
-                />
+                /> -->
+                <el-input
+                v-model.trim="form.goodsShelfName"
+                style="width: 100%" 
+                placeholder="请输入货架名称" 
+               @input="headlineinput"
+                >
+            <template #append>排</template>
+            </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="allocation">
@@ -338,7 +346,8 @@
         width="600px"
         v-model="dialogVisible"
       >
-        <div>
+        <div  class="el_ewm"    v-loading="ewmloading"
+          element-loading-text="二维码加载中...">
           <!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
           <!--          <el-divider></el-divider>-->
 
@@ -375,10 +384,17 @@
         >
           <template #menu-left>
             <el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
-              >查看二维码
+              >批量查看二维码
             </el-button>
           </template>
           <template #menu="{ size, row, index }">
+            <el-button
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="viewhandleqr(row)"
+              >查看二维码</el-button
+            >
             <el-button
               type="primary"
               text
@@ -455,6 +471,7 @@ export default {
         goodsAreaId: null,
       },
       form2: {},
+      ewmloading:true,
       box2: false,
       form3: {},
       box3: false,
@@ -670,7 +687,7 @@ export default {
         searchMenuSpan: 6,
         border: true,
         index: true,
-        viewBtn: true,
+        viewBtn: false,
         selection: true,
         editBtn: false,
         delBtn: false,
@@ -992,6 +1009,7 @@ export default {
         return;
       }
 
+      this.ewmloading=true;
       let checkcode = [];
       this.allselectionList.map(item => {
         checkcode.push(item.id);
@@ -1007,6 +1025,22 @@ export default {
         this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
       });
       this.dialogVisible = true;
+      
+      this.ewmloading=false;
+    },
+    viewhandleqr(row){
+      console.log(row);
+      let ids = row.id;
+      this.html = '';
+      this.ewmloading=true;
+      getPrintTemplate({ ids }).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+      });
+      this.dialogVisible = true;
+      
+      this.ewmloading=false;
     },
     // 格式化数据，递归将空的children置为undefined
     formatCascaderData(data) {
@@ -1123,6 +1157,7 @@ export default {
     handleSubmit() {
       if (this.allocation) {
         console.log('this.form>>>>>>>货位', this.form);
+
         addAllocation(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
@@ -1148,6 +1183,7 @@ export default {
               //     this.form.goodsAreaName = item.headline
               //   }
               // })
+              this.form.goodsShelfName=this.form.goodsShelfName+'排'
               add(this.form).then(() => {
                 this.box = false;
                 this.onLoad(this.page);
@@ -1157,6 +1193,7 @@ export default {
                 });
               });
             } else {
+              this.form.goodsShelfName=this.form.goodsShelfName+'排'
               update(this.form).then(() => {
                 this.box = false;
                 this.onLoad(this.page);
@@ -1193,6 +1230,7 @@ export default {
       this.idShowStatus = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
+        this.headlineinput(this.form.goodsShelfName)
         console.log('>>>>>>>>>>', this.form);
         //TODO 这里还需要对二维码图片进行控制显示
       });
@@ -1223,6 +1261,11 @@ export default {
         });
       });
     },
+    headlineinput(data){
+      if (data.includes('排')) {
+        this.form.goodsShelfName = data.replace('排', '');
+      }
+    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
@@ -1493,4 +1536,7 @@ export default {
   display: flex;
   justify-content: space-between;
 }
+.el_ewm{
+  min-height: 300px;
+}
 </style>
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 32d06d12..3d483ce4 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -2667,6 +2667,7 @@ const {
     display: flex;
     align-items: center;
     justify-content: flex-start;
+    padding: 10px 0;
     // width: 6000px;
   }
   .item {
diff --git a/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue b/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue
index ab988aea..77e32ab1 100644
--- a/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue
+++ b/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue
@@ -78,12 +78,13 @@ const nextstep = () => {
   $_WarehouseTemplateHome(data).then(res => {
     console.log(res, '新增成功');
     if(res.data.code ==200){
-      
+      emit('request-data',{id:res.data.data}); //通知父页面传递数据
+      console.log(props, '最新参数');
     }
   });
   return;
-  emit('request-data', '给父页面传递的参数：'); //通知父页面传递数据
-  console.log(props, '最新参数');
+
+
 };
 </script>
 
diff --git a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
index 5b424bd5..9729f3b7 100644
--- a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
+++ b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
@@ -17,7 +17,9 @@
       <!-- 控件模块 -->
       <el-row>
         <div class="avue-crud__header">
-          <div class="avue-crud__left"></div>
+          <div class="avue-crud__left">
+            <el-button type="primary" icon="el-icon-search" @click="addCategory">新 增</el-button>
+          </div>
           <div class="avue-crud__right">
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
@@ -69,13 +71,29 @@
         </div>
       </el-row>
     </div>
-    <el-dialog v-model="dialogedit" title="编辑" width="40%">
+    <el-dialog v-model="dialogedit" :title="categorytitle" width="40%">
       <el-form :model="form" class="elform">
         <el-form-item label="成本结算品类">
-          <el-input v-model.trim="form.name" placeholder="暂无成本结算品类" disabled />
+          <el-select
+            v-model="form.categoryId"
+            filterable
+            remote
+            reserve-keyword
+            placeholder="请输入成本结算品类"
+            :remote-method="remoteMethod"
+            :loading="Methodloading"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in categoryList"
+              :key="item.goodsId"
+              :label="item.goodsName"
+              :value="item.goodsId"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="计价单位">
-          <el-select v-model="form.value" placeholder="请选择计价单位" style="width: 240px">
+          <el-select v-model="form.unit" placeholder="请选择计价单位" style="width: 240px">
             <el-option
               v-for="item in Pricingunit"
               :key="item.value"
@@ -88,7 +106,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="dialogedit = false">取消</el-button>
-          <el-button type="primary" @click="dialogVisible = false"> 确定 </el-button>
+          <el-button type="primary" @click="Categoryaddition"> 确定 </el-button>
         </div>
       </template>
     </el-dialog>
@@ -106,36 +124,27 @@
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/storagecost/Categorypricingunit.js';
+import {
+  $_expenseDispatchPriceUnit,
+  $_expenseDispatchPriceUnitadd,
+  $_expenseDispatchPriceUnitupdate,
+} from '@/api/storagecost/index.js';
+import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
-import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+const categorytitle = ref('新增');
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
+const Methodloading = ref(false);
 const $route = useRoute(); //获取地址栏参数
 const dialogedit = ref(false); //编辑弹窗
 const form = ref({});
-const Pricingunit=ref([
-  {
-    value: '1',
-    label: '按件',
-  },
-  {
-    value: '2',
-    label: '按方',
-  },
-  {
-    value: '3',
-    label: '按重量',
-  },
-  {
-    value: '4',
-    label: '按吨',
-  },
-])
+const categoryList = ref([]); //品类列表
+const Pricingunit = ref([]);
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -177,7 +186,7 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -269,19 +278,21 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 每页多少条
 const sizeChange = val => {
-  page.value.pageSize = val;
+  details.page.pageSize = val;
+  onLoad();
 };
 /** 页码改变执行的回调 */
 const currentChange = val => {
-  page.value.currentPage = val;
+  details.page.currentPage = val;
+  onLoad();
 };
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 顶部搜索
 const searchHide = () => {
@@ -302,14 +313,80 @@ function updateDictionary(targetArray, dictionaryType) {
     });
   });
 }
-// 页面初始化
-const onLoad = () => {};
 
+// 页面初始化
+const onLoad = value => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+    ...value,
+  };
+  details.loadingObj.list = true;
+  $_expenseDispatchPriceUnit(data)
+    .then(res => {
+      if (res.data.code == 200) {
+        details.data = res.data.data.records || [];
+        details.page.total = res.data.data.total; //页码
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    })
+    .finally(() => {
+      details.loadingObj.list = false;
+    });
+};
+const PageOnload = () => {
+  updateDictionary(Pricingunit.value, 'expense_pricing_unit');
+  onLoad(); //获取列表参数
+};
+// 页面初始化方法
+PageOnload();
 // 编辑
 const handleEdit = row => {
   console.log(row);
   dialogedit.value = true;
 };
+// 新增品牌
+const addCategory = () => {
+  dialogedit.value = true;
+};
+const remoteMethod = goodsName => {
+  if (goodsName) {
+    Methodloading.value = true;
+    let data = {
+      goodsName: goodsName,
+    };
+    postFindCategoryInfo(data)
+      .then(res => {
+        console.log(res, '品类');
+        if (res.data.code == 200) {
+          categoryList.value = res.data.data;
+        }
+      })
+      .catch(() => {})
+      .finally(() => {
+        Methodloading.value = false;
+      });
+  }
+};
+// 新增品类
+const Categoryaddition = () => {
+  let data = {
+    categoryId: form.value.categoryId, //成本结算品类
+    unit: form.value.unit, //计价单位
+  };
+  if (categorytitle.value == '新增') {
+    $_expenseDispatchPriceUnitadd(data).then(res => {
+      console.log(res, '新增成功');
+    });
+  } else {
+    $_expenseDispatchPriceUnitupdate(data).then(res => {
+      console.log(res, '修改成功');
+    });
+  }
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
index 6436d2c7..edfdfe86 100644
--- a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
@@ -81,7 +81,8 @@
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
-                <el-text size="small" @click="EditTemplate(slotProps.scope.row)">编 辑</el-text>
+              <el-text size="small" @click="EditTemplate(slotProps.scope.row)">编 辑</el-text>
+              <el-text size="small" @click="deleteTemplate(slotProps.scope.row)">删 除</el-text>
             </template>
           </template>
         </tablecmt>
@@ -122,17 +123,22 @@
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/storagecost/WarehousePricingTemplate.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { $_getMyWarehouseList ,$_WarehousePricingTemplate} from '@/api/storagecost/index.js';
+import {
+  $_getMyWarehouseList,
+  $_WarehousePricingTemplate,
+  $_removeTemplate,
+} from '@/api/storagecost/index.js';
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+import error from '@/error';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
-const queryTop=ref({})
+const queryTop = ref({});
 const warehouseList = ref([]);
 const details = reactive({
   /** 是否开启搜索 */
@@ -267,7 +273,7 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  details.search = false; //关闭搜索
+  onLoad()
 };
 // 每页多少条
 const sizeChange = val => {
@@ -309,18 +315,20 @@ const onLoad = value => {
     ...details.query,
     ...value,
   };
-  details.loadingObj.list=true;
-  $_WarehousePricingTemplate(data).then(res => {
-    if (res.data.code == 200) {
-      details.data = res.data.data.records || [];
-      details.page.total = res.data.data.total; //页码
-    }
-  }).catch((error)=>{
-    console.log(error);
-  }).finally(()=>{
-    details.loadingObj.list=false;
-  });
-;
+  details.loadingObj.list = true;
+  $_WarehousePricingTemplate(data)
+    .then(res => {
+      if (res.data.code == 200) {
+        details.data = res.data.data.records || [];
+        details.page.total = res.data.data.total; //页码
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    })
+    .finally(() => {
+      details.loadingObj.list = false;
+    });
 };
 // 获取仓库
 const MyWarehouseList = () => {
@@ -335,27 +343,57 @@ const MyWarehouseList = () => {
   });
 };
 // 页面初始化方法
-const EditTemplate = (row) => {
+const EditTemplate = row => {
   $router.push({
     path: '/cost/Deliverycostmanagement/WarehouseTemplateHome',
-    query:{
-      id:row.id
-    }
+    query: {
+      id: row.id,
+    },
   });
 };
+// 删除模板
+const deleteTemplate = row => {
+  ElMessageBox.confirm('是否删除该模板?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      let data = {
+        ids: row.id,
+      };
+      details.loadingObj.list = true;
+      $_removeTemplate(data).then(res => {
+        console.log(res, '删除成功');
+        if (res.data.code == 200) {
+          ElMessage({
+            message: res.data.msg,
+            type: 'success',
+          });
+          onLoad();
+        }
+      });
+    })
+    .catch(error => {
+      console.log(error);
+    })
+    .finally(() => {
+      details.loadingObj.list = false;
+    })
+    .catch(() => {});
+};
 const PageOnload = () => {
   MyWarehouseList(); //获取仓库
   onLoad(); //获取数据
-
 };
 
 //页面初始化方法
 PageOnload();
-const lyadded=()=>{
+const lyadded = () => {
   $router.push({
     path: '/cost/Deliverycostmanagement/WarehouseTemplateHome',
   });
-}
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue b/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
index bd9807a1..a91d3aad 100644
--- a/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
@@ -33,7 +33,7 @@
 import { ref, defineAsyncComponent } from 'vue';
 import { ElMessage } from 'element-plus';
 import { $_getMyWarehouseList } from '@/api/storagecost/index.js';
-const templateInfo=ref({a:'1'});//给子页面的数据
+const templateInfo=ref({});//给子页面的数据
 const active = ref(1);
 //品类映射表
 // const WarehouseTemplate = defineAsyncComponent(() =>
@@ -63,25 +63,14 @@ const input = ref('');
 const handleClick = (tab, event) => {
   console.log(tab, event);
 };
-// 下一步
-const nextstep = () => {
-  
-  if (active.value == 4) {
-    ElMessage({
-      message: '已经最后一步了',
-      type: 'warning',
-    });
-    return;
-  }
-  active.value++;
-};
+
 
 const onLoad=()=>{
 
 }
 onLoad();
 const provideData=(data)=>{
-  console.log(data,'数据');
+  templateInfo.value={...data}
 }
 </script>
 
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index 4e500435..784d9ddf 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -330,7 +330,7 @@ import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
 import print from '@/utils/print';
 import { getBillLadingExport } from '@/api/distribution/distrilbutionBillLading';
 import { downloadXls, getObjType, setNodeHeight } from '@/utils/util';
-
+import dayjs from 'dayjs';
 export default {
   data() {
     return {
@@ -1088,7 +1088,15 @@ export default {
         params.taskTimeStart = this.query.taskTimeArr[0];
         params.taskTimeEnd = this.query.taskTimeArr[1];
       }
-
+// 获取当前日期
+const currentDate = dayjs();
+// 计算一个月前的日期
+const startDate = currentDate.subtract(1, 'month');
+// 格式化日期为 'YYYY-MM-DD'
+const formatDate = (date) => date.format('YYYY-MM-DD');
+this.query.taskTimeArr = []
+this.query.taskTimeArr[0] = formatDate(startDate), // 一个月前的日期
+this.query.taskTimeArr[1] = formatDate(currentDate) // 当前日期
       getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         // eslint-disable-next-line no-empty
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index 11feb0f4..024b2fc7 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -141,7 +141,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="备注" />