Browse Source

优化营收管理

yuhao 1 year ago
parent
commit
fe767d2bb0
2 changed files with 16 additions and 8 deletions
  1. 5 5
      src/pages/revenueManage/createOrder/index.vue
  2. 11 3
      src/pages/revenueManage/index.vue

+ 5 - 5
src/pages/revenueManage/createOrder/index.vue

@@ -8,7 +8,7 @@
8
       <!-- 选择客户信息 -->
8
       <!-- 选择客户信息 -->
9
       <div class="titleBox">
9
       <div class="titleBox">
10
         <div class="title">
10
         <div class="title">
11
-          <span class="notice">*</span>
11
+          <!-- <span class="notice">*</span> -->
12
           选择客户
12
           选择客户
13
           <el-select
13
           <el-select
14
             clearable
14
             clearable
@@ -434,10 +434,10 @@ export default {
434
     // 保存表单
434
     // 保存表单
435
     save() {
435
     save() {
436
       // 验证
436
       // 验证
437
-      if (!this.user_id) {
438
-        this.$message.error("请选择客户");
439
-        return;
440
-      }
437
+      // if (!this.user_id) {
438
+      //   this.$message.error("请选择客户");
439
+      //   return;
440
+      // }
441
       // console.log(this.suser_list);
441
       // console.log(this.suser_list);
442
       // 产品列表
442
       // 产品列表
443
       let project_list = [];
443
       let project_list = [];

+ 11 - 3
src/pages/revenueManage/index.vue

@@ -11,19 +11,19 @@
11
           <el-card>
11
           <el-card>
12
             <div class="titleBox">
12
             <div class="titleBox">
13
               <div class="title">销售金额:</div>
13
               <div class="title">销售金额:</div>
14
-              <div class="money">{{dataTotal.total_price}}</div>
14
+              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.total_price}}</div>
15
             </div>
15
             </div>
16
           </el-card>
16
           </el-card>
17
           <el-card>
17
           <el-card>
18
             <div class="titleBox">
18
             <div class="titleBox">
19
               <div class="title">消耗金额:</div>
19
               <div class="title">消耗金额:</div>
20
-              <div class="money">{{dataTotal.card_expend_price}}</div>
20
+              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.card_expend_price}}</div>
21
             </div>
21
             </div>
22
           </el-card>
22
           </el-card>
23
           <el-card>
23
           <el-card>
24
             <div class="titleBox">
24
             <div class="titleBox">
25
               <div class="title">实收金额:</div>
25
               <div class="title">实收金额:</div>
26
-              <div class="money">{{dataTotal.payer_price}}</div>
26
+              <div class="money"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E4%BA%BA%E6%B0%91%E5%B8%81.png" alt="">{{dataTotal.payer_price}}</div>
27
             </div>
27
             </div>
28
           </el-card>
28
           </el-card>
29
         </div>
29
         </div>
@@ -50,6 +50,7 @@
50
         </el-table-column>
50
         </el-table-column>
51
         <el-table-column prop="payer_price"  label="实收金额"></el-table-column>
51
         <el-table-column prop="payer_price"  label="实收金额"></el-table-column>
52
         <el-table-column prop="pay_way"  label="支付方式"></el-table-column>
52
         <el-table-column prop="pay_way"  label="支付方式"></el-table-column>
53
+        <el-table-column prop="type_names"  label="类别名称"></el-table-column>
53
         <el-table-column prop="suser_names"  label="美容师"></el-table-column>
54
         <el-table-column prop="suser_names"  label="美容师"></el-table-column>
54
         <el-table-column label="操作">
55
         <el-table-column label="操作">
55
           <template slot-scope="scope">
56
           <template slot-scope="scope">
@@ -168,6 +169,13 @@ export default {
168
             font-weight: 700;
169
             font-weight: 700;
169
             margin-right: 5px;
170
             margin-right: 5px;
170
           }
171
           }
172
+          .money{
173
+            img{
174
+              width: 13px;
175
+              height: 13px;
176
+              margin-right: 4px;
177
+            }
178
+          }
171
         }
179
         }
172
       }
180
       }
173
       .createOrder {
181
       .createOrder {