文案优化

src/views/customer/Customer_Info.vue

@@ -40,6 +40,7 @@
     </el-form>
 
     <el-table  :data="manageList">
+      <af-table-column label="油站名" align="center" prop="stationName" />
       <af-table-column label="客户姓名" align="center" prop="customerName" />
       <af-table-column label="手机号" align="center" prop="phoneNumber" />
       <af-table-column label="购买过的油品" align="center" prop="oilName" />
@@ -68,8 +69,8 @@
     />
     <el-dialog :title="titleOrderInfo" :visible.sync="openOrderInfo" width="700px" append-to-body>
       <el-table  :data="orderList" >
-        <af-table-column v-if="false" label="订单id" align="center" prop="orderId" />
-        <af-table-column label="订单号"  width="200" align="center" prop="orderNo" />
+        <af-table-column label="油站"  align="center" prop="stationName" />
+        <af-table-column label="订单号"  align="center" prop="orderNo" />
         <af-table-column label="油品名称" align="center" prop="oilName" />
         <af-table-column label="油品价格" align="center" prop="oilPirce" />
         <af-table-column label="加油升数" align="center" prop="orderLiters" />

src/views/dzk/Dzk_Bill.vue

@@ -55,6 +55,7 @@
     </el-form>
     <el-table :data="recordList">
       <af-table-column label="id" align="center" prop="id" v-if="false" />
+      <af-table-column label="油站名" align="center" prop="stationName" />
       <af-table-column label="充值/消费单号" align="center" prop="orderNo" />
       <!-- <af-table-column label="会员号ID" align="center" prop="customerNo" /> -->
       <af-table-column label="客户名" align="center" prop="customerName" />

src/views/dzk/Dzk_Rule.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form

src/views/dzk/Dzk_RuleList.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form :model="sumForm">
@@ -180,7 +180,6 @@ export default {
 
       let timeString = "";
       const discountTimeType = this.sumForm.discountTimeType;
-      console.log("time", this.sumForm.discountTime);
 
       if (discountTimeType == 1) {
         timeString += "每周的";
@@ -208,7 +207,8 @@ export default {
     init() {
       selectCustomerCardSetting().then((response) => {
         this.sumForm = response.data;
-        this.sumForm.cardOilsType = this.sumForm.cardOilsType
+        const cardOilsType = this.sumForm.cardOilsType == null ? "" : this.sumForm.cardOilsType
+        this.sumForm.cardOilsType = cardOilsType
           .split(",")
           .filter((ele) => {
             return ele != "";
@@ -222,9 +222,6 @@ export default {
         this.sumForm.cardOilsType.map((ele, index) => {
           this.sumForm.cardOilsType[index] = oilType[ele];
         });
-        console.log(this.sumForm);
-
-
 
         if (
           this.sumForm.discountTimeType == "1" ||

src/views/market/Market_Discount.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form

src/views/order/Order_NotOil.vue

@@ -46,13 +46,7 @@
       </el-form-item>
     </el-form>
     <el-table :data="orderList">
-      <af-table-column
-        v-if="false"
-        label="订单id"
-        align="center"
-        prop="orderId"
-      />
-      <af-table-column label="订单号" align="center" prop="orderNo" />
+      <af-table-column label="油站名" align="center" prop="stationName" v-if="jiBie==0||jiBie==1"/>
       <af-table-column label="应付金额" align="center" prop="receivableAmt" />
       <af-table-column label="实付金额" align="center" prop="amt" />
       <af-table-column label="客户姓名" align="center" prop="consumer" />
@@ -65,18 +59,6 @@
         :formatter="payTypeFotmat"
       />
       <af-table-column
-        label="油站名称"
-        align="center"
-        v-if="false"
-        prop="stationName"
-      />
-      <af-table-column
-        v-if="false"
-        label="用户id(消费者)"
-        align="center"
-        prop="consumerId"
-      />
-      <af-table-column
         v-if="false"
         label="油站id"
         align="center"
@@ -103,6 +85,7 @@
           }}</span>
         </template>
       </af-table-column>
+      <af-table-column label="订单号" align="center" prop="orderNo" />
     </el-table>
     <pagination
       v-show="total > 0"

src/views/order/Order_Oil.vue

@@ -87,13 +87,13 @@
       </el-form-item>
     </el-form>
     <el-table :data="orderList">
+      <af-table-column label="油站名" align="center" prop="stationName" v-if="jiBie==0||jiBie==1"/>
       <af-table-column
         v-if="false"
         label="订单id"
         align="center"
         prop="orderId"
       />
-      <af-table-column label="订单号" align="center" prop="orderNo" />
       <af-table-column label="油品名称" align="center" prop="oilName" />
       <af-table-column label="油品价格" align="center" prop="oilPirce" />
       <af-table-column label="加油升数" align="center" prop="orderLiters" />
@@ -149,6 +149,7 @@
           }}</span>
         </template>
       </af-table-column>
+      <af-table-column label="订单号" align="center" prop="orderNo" />
     </el-table>
     <pagination
       v-show="total > 0"

src/views/point/Point_Product.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form

src/views/point/Point_Rule.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4">
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">

src/views/point/Point_RuleList.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form :model="sumForm">

src/views/station/Station_Accounting.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form

src/views/station/Station_Adjustment/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div class="tabZujian" v-else-if="pageStatus == 4">
     <el-tabs v-model="activeName"  @tab-click="handleClick">

src/views/station/Station_Configuration/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="tabZujian">
     <el-tabs v-model="activeName">

src/views/station/Station_Employee.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form

src/views/station/Station_Equipment.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form

src/views/station/Station_Group.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4">
     <el-form ref="form" :model="form" :rules="rules" label-width="160px">

src/views/station/Station_OilGun.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageStatus == 0">配置加载中...</div>
   <div v-else-if="pageStatus == 1">此页面不对此账号开放</div>
-  <div v-else-if="pageStatus == 2">权限已下放到站点，请登录站点账号配置</div>
+  <div v-else-if="pageStatus == 2">没有此页内容的配置权限，请检查集团上的配置</div>
   <div v-else-if="pageStatus == 3">加载发生错误</div>
   <div v-else-if="pageStatus == 4" class="app-container">
     <el-form