From ec27cac3c79c2df6b283705b85da4610b93d0671 Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Tue, 25 Jul 2023 10:49:16 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=80=BB=E7=B4=AF=E8=AE=A1=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shop.js             |  3 ++-
 src/views/erp/OrderList.vue | 40 ++++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/api/shop.js b/src/api/shop.js
index e5cc3a6..d342112 100644
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -1,4 +1,5 @@
 import { getAction, deleteAction, putAction, postAction, httpAction } from '@/api/manage'
 
 export const editOrder = (params)=>postAction("/erp/order/edit",params);
-export const editGoods = (params)=>postAction("/erp/goods/edit",params);
\ No newline at end of file
+export const getOrderTotalPrice = (params)=>getAction("/erp/order/getTotalAmount",params);
+export const editGoods = (params)=>postAction("/erp/goods/edit",params);
diff --git a/src/views/erp/OrderList.vue b/src/views/erp/OrderList.vue
index d705697..6e42ff7 100644
--- a/src/views/erp/OrderList.vue
+++ b/src/views/erp/OrderList.vue
@@ -26,14 +26,13 @@
       </a-dropdown>
 
     </div>
-
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+        <b style="margin-left: 24px" >  总累计金额：￥{{totalPrice}}</b>
       </div>
-
       <a-table
         ref="table"
         size="middle"
@@ -165,7 +164,7 @@
   import OrderModal from './modules/OrderModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import '@/assets/less/TableExpand.less'
-  import { editOrder } from '@/api/shop'
+  import { editOrder, getOrderTotalPrice } from '@/api/shop'
   import orderList from '@views/erp/const/orderList'
   import { mapGetters } from 'vuex'
   import  moment from 'moment'
@@ -210,10 +209,12 @@
         },
         dictOptions:{},
         superFieldList:[],
+        totalPrice: 0
       }
     },
     created() {
       this.getSuperFieldList();
+      this.getOrderTotalPrice()
     },
     computed: {
       importExcelUrl: function(){
@@ -225,6 +226,27 @@
     },
     methods: {
       ...mapGetters(["userInfo"]),
+      getOrderTotalPrice() {
+        const params = this.getQueryParams()
+        getOrderTotalPrice(params).then(res => {
+          if (res.success) {
+            this.totalPrice = res.result
+          }
+        })
+      },
+      handleSuperQuery(params, matchType) {
+        //高级查询方法
+        if(!params){
+          this.superQueryParams=''
+          this.superQueryFlag = false
+        }else{
+          this.superQueryFlag = true
+          this.superQueryParams=JSON.stringify(params)
+          this.superQueryMatchType = matchType
+        }
+        this.loadData(1)
+        this.getOrderTotalPrice()
+      },
       handleOk(type) {
         const that = this
         const user = that.userInfo()
@@ -346,16 +368,16 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'recipient',text:'收件人',dictCode:''})
+        fieldList.push({type:'string',value:'createTime',text:'创建时间'})
+        fieldList.push({type:'string',value:'recipient',text:'联系人',dictCode:''})
         fieldList.push({type:'string',value:'mobile',text:'手机',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'totalAmount',text:'总金额',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'用户id',dictCode:''})
         fieldList.push({type:'string',value:'addr',text:'地址',dictCode:''})
-        fieldList.push({type:'string',value:'financeReview',text:'审核人',dictCode:''})
-        fieldList.push({type:'datetime',value:'financeTime',text:'审核时间'})
-        fieldList.push({type:'string',value:'financeRemark',text:'审核意见',dictCode:''})
-        fieldList.push({type:'string',value:'dispacher',text:'派单人',dictCode:''})
-        fieldList.push({type:'datetime',value:'dispacherTime',text:'派发时间'})
+        fieldList.push({type:'string',value:'financeReview',text:'财务确认人',dictCode:''})
+        fieldList.push({type:'string',value:'financeTime',text:'财务确认时间'})
+        fieldList.push({type:'string',value:'dispacher',text:'出货确认人',dictCode:''})
+        fieldList.push({type:'string',value:'dispacherTime',text:'出货确认时间'})
         fieldList.push({type:'int',value:'state',text:'状态',dictCode:'orderState'})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList