显示调整

src/views/market/Market_Discount.vue

@@ -68,12 +68,12 @@
             v-model="updateForm.discountTerm"
             v-if="discountSetting == 3"
           >
-            <el-radio :label="0">按加油金额优惠</el-radio>
+            <el-radio :label="2">按加油金额优惠</el-radio>
             <el-radio :label="1">按加油升数优惠</el-radio>
           </el-radio-group>
           <div
             v-show="
-              updateForm.discountTerm == 0 ||
+              updateForm.discountTerm == 2 ||
               updateForm.discountTerm == 1 ||
               discountSetting == 1 ||
               discountSetting == 2
@@ -86,7 +86,7 @@
               :min="0"
             />
 
-            <span>{{ updateForm.discountTerm == 0 ? "元" : "L" }}</span>
+            <span>{{ updateForm.discountTerm == 1 && discountSetting == 3 ? "L" : "元" }}</span>
             ，{{ ["", "减", "减", "每升优惠"][discountSetting] }}
             <el-input-number
               v-model="updateForm.gasoilDiscountAmt"
@@ -170,7 +170,7 @@
       >
         <template slot-scope="scope">
           满 {{ scope.row.discountAmt }}
-          {{ scope.row.discountTerm == 0 ? "元" : "L" }}，每升优惠
+          {{ scope.row.discountTerm == 2 ? "元" : "L" }}，每升优惠
           {{ scope.row.gasoilDiscountAmt }} 元
         </template>
       </af-table-column>

src/views/overview/Overview_Daily.vue

@@ -496,9 +496,9 @@ export default {
       listOilType(this.queryParams).then(response => {
         if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
-            if (response.rows[i].oilType === "2") {
+            if (response.rows[i].oilType === "1") {
               this.form.qyamt = response.rows[i].amt;
-            } else if (response.rows[i].oilType === "1") {
+            } else if (response.rows[i].oilType === "2") {
               this.form.cyamt = response.rows[i].amt;
             }
           }

src/views/overview/Overview_Summary.vue

@@ -281,10 +281,10 @@ export default {
       listOilType(query).then((response) => {
         if (response.hasOwnProperty("rows")) {
           for (let i in response.rows) {
-            if (response.rows[i].oilType === "2") {
+            if (response.rows[i].oilType === "1") {
               this.form.qyamt = response.rows[i].amt;
               this.form.qyliters = response.rows[i].orderLiters;
-            } else if (response.rows[i].oilType === "1") {
+            } else if (response.rows[i].oilType === "2") {
               this.form.cyamt = response.rows[i].amt;
               this.form.cyliters = response.rows[i].orderLiters;
             }

src/views/point/Point_RuleList.vue

@@ -212,6 +212,7 @@ export default {
       listRuleInfo(this.queryParams).then((response) => {
         console.log("getList", response);
         this.ruleList = response.rows;
+        console.log(this.ruleList);
         this.total = response.total;
       });
     },