Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/distribution/distributionStockArticle.js

@@ -54,9 +54,10 @@ export const stockArticExport = row => {
  * @param {*} params
  * @returns
  */
+
 export const getClientList = (current, size, params) => {
   return request({
-    url: '/api/logpm-distribution/maill/clientList',
+    url: '/api/logpm-distribution/distributionStockArticle/clientList',
     method: 'get',
     params: {
       ...params,
@@ -65,10 +66,22 @@ export const getClientList = (current, size, params) => {
     },
   });
 };
+export const $_clientList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/mall/order/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
 // 导出
 export const $_exportmaillOrder = (params) => {
   return request({
-    url: '/api/logpm-distribution/maill/export-maillOrder',
+    url: '/api/logpm-distribution/mall/order/export-order',
     method: 'get',
     params,
     responseType: 'blob',

src/api/distribution/distributionStockList.js

@@ -86,6 +86,29 @@ export const getStockListClient = (current, size, params) => {
     }
   })
 }
+
+
+export const $_StockListClient = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/mall/stock/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+
+export const $_listexportorder = (params) => {
+  return request({
+    url: '/api/logpm-distribution/mall/stock/export-stock',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
 /**
  * 查询库存品详情
  * @param current

src/api/storagecost/index.js

@@ -107,3 +107,29 @@ export const $_Financialreview = params => {
     params,
   });
 };
+// 配送-财务审单-导出
+export const $_expenseDispatchFinancialReview= params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchFinancialReview/export-expenseDispatchFinancialReview',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
+// 配送-车次成本明细
+export const $_Traincostbreakdown = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchTrainDetail/page',
+    method: 'get',
+    params,
+  });
+};
+// 配送-车次成本明细-导出
+export const $_expenseDispatchTrainDetail= params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchTrainDetail/export-expenseDispatchTrainDetail',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};

src/option/storagecost/Financialreview.js

@@ -28,7 +28,7 @@ export const columnList = [
   {
     prop: 'trainNumber',
     label: '车次号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -39,7 +39,7 @@ export const columnList = [
   {
     prop: 'deliveryDate',
     label: '配送日期',
-    type: 1,
+    type: 4,
     values: '',
     width: '150',
     checkarr: [],
@@ -50,7 +50,7 @@ export const columnList = [
   {
     prop: 'destinationWarehouse',
     label: '目的仓',
-    type: 3,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -61,7 +61,7 @@ export const columnList = [
   {
     prop: 'customerName',
     label: '客户名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -72,7 +72,7 @@ export const columnList = [
   {
     prop: 'orderCode',
     label: '订单自编号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -83,7 +83,7 @@ export const columnList = [
   {
     prop: 'distributionType',
     label: '配送类型',
-    type: 1,
+    type: 3,
     values: '',
     width: '150',
     checkarr: [
@@ -114,7 +114,7 @@ export const columnList = [
   {
     prop: 'deliveryVehicle',
     label: '配送车辆',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -125,7 +125,7 @@ export const columnList = [
   {
     prop: 'distributionModel',
     label: '配送车型',
-    type: 1,
+    type: 3,
     values: '',
     width: '150',
     checkarr: [],
@@ -136,7 +136,7 @@ export const columnList = [
   {
     prop: 'carrierName',
     label: '承运方名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -147,7 +147,7 @@ export const columnList = [
   {
     prop: 'carrierType',
     label: '承运方类型',
-    type: 1,
+    type: 3,
     values: '',
     width: '150',
     checkarr: [],
@@ -158,7 +158,7 @@ export const columnList = [
   {
     prop: 'deliveryDriver',
     label: '配送司机',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -400,7 +400,7 @@ export const columnList = [
   {
     prop: 'financialAuditTime',
     label: '财务审核时间',
-    type: 1,
+    type: 4,
     values: '',
     width: '150',
     checkarr: [],
@@ -411,7 +411,7 @@ export const columnList = [
   {
     prop: 'financialAuditor',
     label: '财务审核人',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],

src/option/storagecost/Traincostbreakdown.js

@@ -15,7 +15,7 @@ export const columnList = [
       fixed: true,
     },
     {
-      prop: 'a1',
+      prop: 'trainNumber',
       label: '车次号',
       type: 2,
       values: '',
@@ -26,7 +26,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a2',
+      prop: 'deliveryDate',
       label: '配送日期',
       type: 1,
       values: '',
@@ -37,7 +37,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a3',
+      prop: 'destinationWarehouse',
       label: '目的仓',
       type: 1,
       values: '',
@@ -48,7 +48,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a4',
+      prop: 'customerName',
       label: '客户名称',
       type: 3,
       values: '',
@@ -59,7 +59,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a5',
+      prop: 'orderCode',
       label: '订单自编号',
       type: 1,
       values: '',
@@ -70,7 +70,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'distributionType	',
       label: '配送类型',
       type: 1,
       values: '',
@@ -89,7 +89,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a7',
+      prop: 'deliveryVehicle',
       label: '配送车辆',
       type: 1,
       values: '',
@@ -101,7 +101,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'distributionModel',
       label: '配送车型',
       type: 1,
       values: '',
@@ -112,7 +112,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'carrierName',
       label: '承运方名称',
       type: 1,
       values: '',
@@ -123,7 +123,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'carrierType',
       label: '承运方类型',
       type: 1,
       values: '',
@@ -134,7 +134,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'deliveryDriver',
       label: '配送司机',
       type: 1,
       values: '',
@@ -145,7 +145,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'plannedTotalQuantity',
       label: '计划总件数',
       type: 1,
       values: '',
@@ -156,7 +156,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'totalOrderQuantity',
       label: '订单总数',
       type: 1,
       values: '',
@@ -167,7 +167,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'inventoryItemCount',
       label: '库存品件数',
       type: 1,
       values: '',
@@ -178,7 +178,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'totalLoadedPieces',
       label: '装车总件数',
       type: 1,
       values: '',
@@ -189,7 +189,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'totalReceiptCost',
       label: '签收总件数',
       type: 1,
       values: '',
@@ -200,7 +200,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'totalDistributionCost',
       label: '配送总成本',
       type: 1,
       values: '',
@@ -211,7 +211,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'distributionCost',
       label: '配送成本',
       type: 1,
       values: '',
@@ -222,7 +222,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'inventoryDistributionCost',
       label: '库存品配送成本',
       type: 1,
       values: '',
@@ -233,7 +233,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'tagRemovalCost',
       label: '撕标签成本',
       type: 1,
       values: '',
@@ -244,7 +244,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'stairCarryingFee',
       label: '上楼费成本',
       type: 1,
       values: '',
@@ -255,7 +255,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'goodsAllocationCost',
       label: '分货费成本',
       type: 1,
       values: '',
@@ -266,7 +266,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'repositioningCost',
       label: '平移费成本',
       type: 1,
       values: '',
@@ -277,7 +277,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'handlingCost',
       label: '装卸费成本',
       type: 1,
       values: '',
@@ -288,7 +288,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'mileageCost',
       label: '公里数成本',
       type: 1,
       values: '',
@@ -299,7 +299,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'subsidizedKilometerCost',
       label: '补贴公里数成本',
       type: 1,
       values: '',
@@ -310,7 +310,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'excessZoneMileageCost',
       label: '超区公里费成本',
       type: 1,
       values: '',
@@ -321,7 +321,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'locationSubsidyCost',
       label: '点位补贴费成本',
       type: 1,
       values: '',
@@ -332,7 +332,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'minimumGuaranteeCost',
       label: '保底费成本',
       type: 1,
       values: '',
@@ -343,7 +343,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'fuelCost',
       label: '油费成本',
       type: 1,
       values: '',
@@ -354,7 +354,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'otherCosts',
       label: '其他成本',
       type: 1,
       values: '',
@@ -365,15 +365,15 @@ export const columnList = [
       head: false,
     },
    
-    {
-      prop: 'createUserName',
-      label: '操作',
-      type: 6,
-      values: '',
-      width: '200',
-      checkarr: [],
-      fixed: 'right',
-      sortable: false,
-    },
+    // {
+    //   prop: 'createUserName',
+    //   label: '操作',
+    //   type: 6,
+    //   values: '',
+    //   width: '200',
+    //   checkarr: [],
+    //   fixed: 'right',
+    //   sortable: false,
+    // },
   ];
   

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -581,8 +581,13 @@ export default {
       }).then(async () => {
         try {
           this.loadingObj.pageLoading = true;
-
-          const res = await exportBlob(downloadUrl, this.query);
+          let data={
+            ...this.query
+          }
+          if(this.selectionList.length){
+            data.ids=this.selectionList.map(res=>res.id).join(',')
+          }
+          const res = await exportBlob(downloadUrl,data);
           if (res.status !== 200) return;
           downloadXls(res.data, `司机信息${dateNow()}.xlsx`);
         } catch (error) {

src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue

@@ -163,6 +163,7 @@ export default {
           type: 'select',
           dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_driver_type',
           options: [],
+          rules: [{ required: true, message: '请选择司机类型', trigger: ['blur', 'change'] }],
         },
         {
           label: '职务类型',
@@ -172,6 +173,7 @@ export default {
           dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_driverjob_type',
           options: [],
           multiple: true,
+          rules: [{ required: true, message: '请选择职务类型', trigger: ['blur'] }],
         },
         {
           label: '准驾车型',
@@ -179,6 +181,7 @@ export default {
           filterable: true,
           type: 'select',
           dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_driving_type',
+          rules: [{ required: true, message: '请选择准驾车型', trigger: ['blur', 'change'] }],
           options: [],
         },
 

src/views/cost/Deliverycostmanagement/Financialreview.vue

@@ -19,7 +19,7 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="AddInfo"
+            <el-button type="primary" @click="exportExcel"
               ><el-icon><Plus /></el-icon>导出</el-button
             >
           </div>
@@ -34,6 +34,10 @@
 
       <!-- 首页表格 -->
       <el-row>
+        <el-tabs v-model="activeName" class="demo-tabs" type="border-card" @tab-click="handleClick">
+          <el-tab-pane label="待审核" name="first"></el-tab-pane>
+          <el-tab-pane label="已审核" name="second"></el-tab-pane>
+        </el-tabs>
         <!-- 列表模块 -->
         <tablecmt
           class="tableNode"
@@ -49,7 +53,7 @@
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="ElBtnClass">
-                <el-button type="primary">编辑</el-button>
+                <el-button type="primary" @click="toexamine">审核</el-button>
               </div>
             </template>
           </template>
@@ -76,6 +80,72 @@
       </el-row>
     </div>
   </basic-container>
+  <!-- 审核弹窗 -->
+  <el-dialog v-model="toexaminedialog" title="附加成本编辑" width="500">
+    <el-form :model="form" label-width="auto">
+      <el-form-item label="装卸费:">
+        <el-input-number
+          v-model="form.a"
+          :min="0"
+          :value-on-clear="0"
+          :precision="2"
+          :controls="false"
+        />
+      </el-form-item>
+      <el-form-item label="分货费:">
+        <el-input-number
+          v-model="form.a"
+          :min="0"
+          :value-on-clear="0"
+          :precision="2"
+          :controls="false"
+        />
+      </el-form-item>
+      <el-form-item label="平移费:">
+        <el-input-number
+          v-model="form.a"
+          :min="0"
+          :value-on-clear="0"
+          :precision="2"
+          :controls="false"
+        />
+      </el-form-item>
+      <el-form-item label="上楼费:">
+        <el-input-number
+          v-model="form.a"
+          :min="0"
+          :value-on-clear="0"
+          :precision="2"
+          :controls="false"
+        />
+      </el-form-item>
+      <el-form-item label="其他费用:">
+        <el-input-number
+          v-model="form.a"
+          :min="0"
+          :value-on-clear="0"
+          :precision="2"
+          :controls="false"
+        />
+      </el-form-item>
+      <el-form-item label="其他费用备注:">
+        <el-input
+          v-model="form.name"
+          :autosize="{ minRows: 4, maxRows: 6 }"
+          placeholder="请输入其他费用备注"
+          type="textarea"
+        />
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="toexaminecancel">取消</el-button>
+        <el-button type="primary" @click="Confirmaudit"> 确认审核 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
   <!-- 列表配置显示 -->
   <edittablehead
     @setcolum="setnewcolum"
@@ -89,8 +159,7 @@
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/storagecost/Financialreview.js';
-import { $_getMyWarehouseList,$_Financialreview } from '@/api/storagecost/index.js';
-
+import { $_getMyWarehouseList, $_Financialreview,$_expenseDispatchFinancialReview } from '@/api/storagecost/index.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import functions from '@/utils/functions.js';
@@ -101,6 +170,10 @@ import dayjs from 'dayjs';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
+const toexaminedialog = ref(false);
+const form = ref({
+  a: 0,
+});
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -142,7 +215,7 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [],
+  data: [{}],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -277,16 +350,19 @@ const onLoad = value => {
   };
 
   details.loadingObj.list = true;
-  $_Financialreview(data).then(res => {
+  $_Financialreview(data)
+    .then(res => {
       if (res.data.code == 200) {
         details.data = res.data.data.records || [];
         details.page.total = res.data.data.total; //页码
       }
-  }).catch((error)=>{
+    })
+    .catch(error => {
       console.log(error, '错误信息');
-  }).finally(()=>{
+    })
+    .finally(() => {
       details.loadingObj.list = false;
-  });;
+    });
 };
 
 // 页面初始化方法
@@ -296,6 +372,46 @@ const PageOnload = () => {
 // 页面初始化方法
 PageOnload();
 
+const toexamine = () => {
+  toexaminedialog.value = true; //开启审核弹窗
+};
+// 确认审核
+const Confirmaudit = () => {
+  ElMessageBox.confirm('是否确认审核?', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {})
+    .catch(() => {});
+};
+// 取消审核
+const toexaminecancel = () => {};
+// 导出数据
+const exportExcel = () => {
+  ElMessageBox.confirm('是否导出数据?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      console.log(details.query, '搜索参数');
+      details.loadingObj.list = true;
+      let data = {
+        ...details.query,
+      };
+      console.log(data, '要提交的数据');
+      $_expenseDispatchFinancialReview(data).then(res => {
+        details.loadingObj.list = false;
+        downloadXls(res.data, `财务审单.xlsx`);
+        ElMessage({
+          message: '导出成功',
+          type: 'success',
+        });
+      });
+    })
+    .catch(() => {});
+};
 </script>
 
 <style scoped lang="scss">
@@ -303,6 +419,7 @@ PageOnload();
   border: none;
   padding: 0;
   background-color: transparent;
+  color: #ff9800;
 }
 :deep(.el-card) {
   height: 100%;
@@ -323,4 +440,14 @@ PageOnload();
   display: flex;
   flex-direction: column;
 }
+.el-form {
+  .el-input-number {
+    width: 100% !important;
+  }
+}
+:deep(.demo-tabs){
+  .el-tabs__content{
+    display: none;
+  }
+}
 </style>

src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue

@@ -19,7 +19,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-              <el-button type="primary" @click="AddInfo"><el-icon><Plus /></el-icon>导出</el-button>
+            <el-button type="primary" @click="exportExcel"
+              ><el-icon><Plus /></el-icon>导出</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -89,7 +91,7 @@
 import { columnList } from '@/option/storagecost/Traincostbreakdown.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import functions from '@/utils/functions.js';
+import { $_getMyWarehouseList,$_Traincostbreakdown ,$_expenseDispatchTrainDetail} from '@/api/storagecost/index.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
@@ -200,12 +202,9 @@
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   test(details.query);
-      
 };
 // 实例函数
-  const test=(val)=>{
-  
-  }
+const test = val => {};
 /** 表格表头时间选择 */
 const timesc = (index, row) => {
   console.log(index, row);
@@ -267,11 +266,58 @@
   });
 }
 // 页面初始化
-const onLoad=()=>{
-
+const onLoad = value => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+    ...value,
+  };
+  details.loadingObj.list=true;
+  $_Traincostbreakdown(data).then(res => {
+    console.log(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 = () => {
+  onLoad(); //获取列表参数
+};
+// 页面初始化方法
+PageOnload();
+// 导出
+const exportExcel = () => {
+  ElMessageBox.confirm('是否导出数据?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      console.log(details.query, '搜索参数');
+      details.loadingObj.list = true;
+      let data = {
+        ...details.query,
+      };
+      console.log(data, '要提交的数据');
+      $_expenseDispatchTrainDetail(data).then(res => {
+        details.loadingObj.list = false;
+        downloadXls(res.data, `车次成本明细.xlsx`);
+        ElMessage({
+          message: '导出成功',
+          type: 'success',
+        });
+      });
+    })
+    .catch(() => {});
+};
 </script>
 
 <style scoped lang="scss">
@@ -300,4 +346,3 @@ const onLoad=()=>{
   flex-direction: column;
 }
 </style>
-  

src/views/mail/inventory/list.vue

@@ -26,6 +26,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
+            <el-button type="danger" icon="el-icon-edit" @click="exportExcel" 
+              >导出</el-button
+            >
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
              <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>全部拆包</el-button>-->
@@ -33,6 +36,7 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            
             <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
@@ -259,7 +263,8 @@ import {
   update,
   remove,
   addParcels,
-  getStockListClient,
+  $_StockListClient,
+  $_listexportorder,
 } from '@/api/distribution/distributionStockList';
 import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 import { getListMaterial } from '@/api/basic/basicMaterial';
@@ -271,7 +276,7 @@ import { downloadXls, handleClearTableQuery } from '@/utils/util';
 import dayjs from 'dayjs';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { detail } from '@/api/flow/flow';
-
+import { ElMessage, ElMessageBox } from 'element-plus'
 export default {
   data() {
     return {
@@ -981,7 +986,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       this.query.serviceType = '2';
-      getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+      $_StockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
         res => {
           const { code, data } = res.data;
           this.loading = false;
@@ -994,7 +999,10 @@ export default {
           this.data = data.records;
           this.data.forEach(i => {
             let a = this.distributionType.find(d => d.dictKey == i.serviceType);
-            i.serviceTypeName = a.dictValue;
+            if(a){
+              i.serviceTypeName = a.dictValue?a.dictValue:'';
+            }
+      
             if (i.unpack == false) {
               i.unpack = '否';
             } else {
@@ -1005,6 +1013,37 @@ export default {
         }
       );
     },
+    // 导出
+   exportExcel() {
+  ElMessageBox.confirm('是否导出数据?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      this.loading = true;
+      let data = {
+        ...this.query,
+      };
+      if( this.selectionList.length){
+        data.ids=this.selectionList.map(item=>item.id).join(',')
+      }
+      console.log(data, '要提交的数据');
+      $_listexportorder(data).then(res => {
+        downloadXls(res.data, `库存品列表.xlsx`);
+        ElMessage({
+          message: '导出成功',
+          type: 'success',
+        });
+
+      }).catch((error) => {
+        console.log(error);
+      }).finally(()=>{
+        this.loading = false;
+      });
+    })
+    .catch(() => {});
+    }
   },
 };
 </script>

src/views/mail/order/list.vue

@@ -351,7 +351,7 @@
 
 <script>
 import {
-  getClientList,
+  $_clientList,
   getDetail,
   add,
   update,
@@ -1232,7 +1232,7 @@ export default {
           break;
       }
       this.query.typeService = '1';
-      getClientList(
+      $_clientList(
         this.page.currentPage,
         this.page.pageSize,
         Object.assign(params, this.query)
@@ -1339,7 +1339,7 @@ export default {
       this.loading = true;
       this.query.genre = 1;
       this.query.typeService = 2;
-      getClientList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+      $_clientList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
         res => {
           const data = res.data.data;
           this.page.total = data.total;