Merge branch '0601Action' into test

src/views/businessManager/orderManager/salesList.vue

@@ -38,13 +38,15 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <select-all  multiple
+          <select-all
+            multiple
             collapse-tags
             v-model="searchForm.organIdList"
             clearable
             filterable
-            placeholder="请选择所属分部">
-              <el-option
+            placeholder="请选择所属分部"
+          >
+            <el-option
               v-for="(item, index) in selects.branchs"
               :key="index"
               :label="item.name"
@@ -125,7 +127,12 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="orderNo" label="订单号" width="180px">
+          <el-table-column
+            align="center"
+            prop="orderNo"
+            label="订单号"
+            width="180px"
+          >
             <template slot-scope="scope">
               <div>
                 <copy-text>{{ scope.row.orderNo }}</copy-text>
@@ -142,7 +149,12 @@
               scope.row.type | saleType
             }}</template>
           </el-table-column>
-          <el-table-column align="center" prop="goodsName" label="商品名称" width="200px">
+          <el-table-column
+            align="center"
+            prop="goodsName"
+            label="商品名称"
+            width="200px"
+          >
             <template slot-scope="scope">
               <div>
                 <copy-text>{{ scope.row.goodsName }}</copy-text>
@@ -154,6 +166,23 @@
             prop="num"
             label="数量"
           ></el-table-column>
+          <el-table-column align="center" prop="expectAmount" label="订单金额">
+            <template slot-scope="scope">
+              <div>
+                {{
+                  (scope.row.couponRemitAmount + scope.row.expectAmount)
+                    | moneyFormat
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="expectAmount" label="优惠金额">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.couponRemitAmount | moneyFormat }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             width="100"
@@ -396,7 +425,7 @@ import { paymentChannelStatus } from "@/utils/searchArray";
 import { Export } from "@/utils/downLoadFile";
 import dayjs from "dayjs";
 import { getTimes } from "@/utils";
-import cleanDeep from 'clean-deep'
+import cleanDeep from "clean-deep";
 export default {
   components: { pagination },
   name: "backMoney",
@@ -515,7 +544,7 @@ export default {
         search: "",
         goodsName: [],
         cooperationOrganId: "",
-        orderDate:[dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")]
+        orderDate: [dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")],
       };
       this.getList();
     },
@@ -558,7 +587,7 @@ export default {
               });
             });
           } else {
-            this.$message.error(res.msg)
+            this.$message.error(res.msg);
           }
         });
     },
@@ -579,7 +608,7 @@ export default {
       // applyRefundAudit()
     },
     onOrderExport() {
-        let { orderDate, ...rest } = this.searchForm;
+      let { orderDate, ...rest } = this.searchForm;
       let params = {
         ...rest,
         page: this.pageInfo.page,
@@ -590,8 +619,8 @@ export default {
         this,
         {
           url: "/api-web/export/exportSellOrders",
-          fileName:`销售列表导出.xls`,
-          params:cleanDeep( {
+          fileName: `销售列表导出.xls`,
+          params: cleanDeep({
             ...params,
             organIdList: [...this.searchForm.organIdList].join(),
           }),