修改客户信息展示

Yijia-SaaS/yijia-ui/src/views/customer/manage/index.vue

@@ -88,7 +88,6 @@
       </el-form-item>
     </el-form>
 
-
     <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
       <el-table-column label="客户表id" align="center" prop="id" v-if="false" />
       <el-table-column label="会员id" align="center" prop="memberId" />
@@ -318,7 +317,7 @@ export default {
     stationinfo().then(response => {
       this.stationOptions = response.rows;
     });
-    this.getDicts("oil").then(response => {
+    this.getDicts("oil_name").then(response => {
       this.oilNameOptions = response.data;
     });
   },

Yijia-SaaS/yijia-ui/src/views/customer/setting/index.vue

@@ -73,7 +73,7 @@
         <el-form-item label="等级" prop="grade">
           <el-input v-model="form.grade" placeholder="请输入等级" />
         </el-form-item>
-        <el-form-item label="优惠方式" prop="discountWay">
+        <el-form-item label="优惠方式" prop="discountWay" v-show="false">
           <el-input v-model="form.discountWay" placeholder="请输入优惠方式" />
         </el-form-item>
         <el-form-item label="会员条件" >
@@ -358,7 +358,7 @@ export default {
       this.form = {
         id: null,
         grade: null,
-        discountWay: null,
+        discountWay: "直降",
         gasoilDiscountLitre: null,
         dieseloilDiscountLitre: null,
         gradeType: null,
@@ -381,6 +381,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.form.discountWay ="直降";
       this.title = "添加客户优惠等级设置";
     },
     /** 修改按钮操作 */

Yijia-SaaS/yijia-ui/src/views/dataSource/saleReport.vue

@@ -42,8 +42,8 @@
         </el-col>
         <el-col   :xs="12" :sm="12" :lg="6">
           <div class="flex qiyou">
-            <div style="font-size: 28px;">  汽油  </div>
-            <div class="flex-qy">
+            <div style="font-size: 28px;margin-top: -80px;">  汽油  </div>
+            <div class="flex-qy" style="margin-top: 30px;">
               <div class="flex-qy-sx"  style="margin-right: 25px;">
                 <div style="font-size: 36px;" >
                   {{ form.qyliters }}L
@@ -61,8 +61,8 @@
         </el-col>
         <el-col  :xs="12" :sm="12" :lg="6">
           <div class="flex chaiyou">
-            <div style="font-size: 28px;">  柴油  </div>
-            <div class="flex-qy">
+            <div style="font-size: 28px;margin-top: -80px;">  柴油  </div>
+            <div class="flex-qy" style="margin-top: 30px;">
               <div class="flex-qy-sx" style="margin-right: 25px;">
                 <div style="font-size: 36px;">{{ form.cyliters }}L</div>
                 <div style="font-size: 22px;">升数</div>
@@ -253,7 +253,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    this.monthDataSource();
   },
   methods: {
     /** 查询优惠劵管理列表 */

Yijia-SaaS/yijia-ui/src/views/station/info/index.vue

@@ -287,6 +287,7 @@ export default {
       this.msgSuccess(response.msg);
     },
     handleAvatarSuccess(res, file) {
+      console.log("res:",res);
       this.form.stationPic = res.url;
     },
     beforeAvatarUpload(file) {