Просмотр исходного кода

顺丰费用系数以及费用明细

zxf 3 дней назад
Родитель
Сommit
077ef1bf0b

+ 1 - 1
jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizFinancialAdjustmentRecordMapper.xml

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!-- 数据范围过滤 -->
             <!-- 数据范围过滤 -->
             ${params.dataScope}
             ${params.dataScope}
         </where>
         </where>
-
+     order by GREATEST(a.create_time, a.update_time) DESC
 
 
     </select>
     </select>
     
     

+ 2 - 1
jd-logistics-ui-v3/src/views/logistics/monthSummary/index.vue

@@ -83,6 +83,7 @@
     <el-table v-loading="loading" :data="monthSummaryList">
     <el-table v-loading="loading" :data="monthSummaryList">
 <!--      <el-table-column type="selection" width="55" align="center" />-->
 <!--      <el-table-column type="selection" width="55" align="center" />-->
 <!--      <el-table-column label="月度汇总id" align="center" prop="summaryId" width="90" />-->
 <!--      <el-table-column label="月度汇总id" align="center" prop="summaryId" width="90" />-->
+      <el-table-column label="供应商" align="center" prop="deptName" />
       <el-table-column label="汇总月份" align="center" >
       <el-table-column label="汇总月份" align="center" >
         <template #default="scope">
         <template #default="scope">
           <el-button
           <el-button
@@ -101,7 +102,7 @@
           <dict-tag :options="monthly_report_status" :value="scope.row.status" />
           <dict-tag :options="monthly_report_status" :value="scope.row.status" />
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="供应商" align="center" prop="deptName" />
+
 <!--      <el-table-column label="用户id" align="center" prop="userId" />-->
 <!--      <el-table-column label="用户id" align="center" prop="userId" />-->
 <!--      <el-table-column label="百旺开票单据编号" align="center" prop="bwDjbh" />-->
 <!--      <el-table-column label="百旺开票单据编号" align="center" prop="bwDjbh" />-->
 <!--      <el-table-column label="电子发票pdf地址" align="center" prop="bwDzfpPdfUrl" />-->
 <!--      <el-table-column label="电子发票pdf地址" align="center" prop="bwDzfpPdfUrl" />-->