Explorar o código

分级查看的接口调整

Joe %!s(int64=3) %!d(string=hai) anos
pai
achega
8054d54e21

+ 6 - 2
src/views/customer/Customer_Info.vue

@@ -130,14 +130,16 @@ export default {
         commendMan: null,
         memberGrade: null,
         phoneNumber: null,
-        oilName: null
+        oilName: null,
+        levelId: this.levelId,
       },
       queryOrder:{
         pageNum: 1,
         pageSize: 10,
         oilName: null,
         stationId: null,
-        consumerId: null
+        consumerId: null,
+        levelId: this.levelId
       }
     };
   },
@@ -170,6 +172,7 @@ export default {
     },
     /** 查询客户管理列表 */
     getList() {
+      this.queryParams.levelId = this.levelId
       listManage(this.queryParams).then(response => {
         this.manageList = response.rows;
         this.total = response.total;
@@ -186,6 +189,7 @@ export default {
       this.handleQuery();
     },
     detail(row){
+      this.queryOrder.levelId = this.levelId;
       this.queryOrder.consumerId = row.minaUserId;
       this.listPage();
     },

+ 2 - 0
src/views/dzk/Dzk_Bill.vue

@@ -118,6 +118,7 @@ export default {
         usageType: null,
         payType: null,
         cardOilsType: null,
+        levelId: this.levelId
       },
     };
   },
@@ -147,6 +148,7 @@ export default {
     },
     /** 查询客户电子会员卡充值消费记录列表 */
     getList() {
+      this.queryParams.levelId = this.levelId;
       listRecord(this.queryParams).then((response) => {
         this.recordList = response.rows;
         this.total = response.total;

+ 6 - 2
src/views/dzk/Dzk_Report.vue

@@ -45,7 +45,8 @@ export default {
       // 查询参数
       queryParams: {
         pageSetting: 10,
-        pageNo: 1
+        pageNo: 1,
+        levelId: this.levelId
       },
       dayReportList: [],
       sumForm:{}
@@ -61,13 +62,16 @@ export default {
       this.getList();
     },
     getList() {
+      this.queryParams.levelId = this.levelId;
       selectCard(this.queryParams).then((response) => {
         this.dayReportList = response.rows;
         this.total = response.total;
       });
     },
     getHZlist() {
-      listSum().then((response) => {
+      listSum({
+        levelId: this.levelId
+      }).then((response) => {
         if (response.hasOwnProperty("data")) {
           this.cardNum = response.data.num;
           this.hzAmt = response.data.amt;

+ 2 - 2
src/views/label/Label_AddUser.vue

@@ -81,7 +81,7 @@
                     prop="phone"
                     label="手机号"
                   ></el-table-column>
-                  <el-table-column label="添加" width="60px">
+                  <el-table-column label="添加" width="60px" align="center">
                     <template slot-scope="scope">
                       <el-button
                         type="text"
@@ -167,7 +167,7 @@
                     prop="phone"
                     label="手机号"
                   ></el-table-column>
-                  <el-table-column label="移除" width="60px">
+                  <el-table-column label="移除" width="60px" align="center">
                     <template slot-scope="scope">
                       <el-button
                         type="text"

+ 123 - 857
src/views/label/Label_Batch.vue

@@ -1,912 +1,178 @@
 <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 == 3">加载发生错误</div>
-  <div v-else-if="pageStatus == 4" class="app-container">
+  <div class="app-container">
     <el-form
-      ref="ruleForm"
-      :model="ruleForm"
-      :rules="rules"
-      label-width="130px"
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="68px"
     >
-      <el-form-item label="当前执行优惠方案">
-        {{ currentDiscountName }}
+      <el-form-item label="标签状态" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          placeholder="请输入客户名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item label="优惠方案">
+      <el-form-item label="会员名" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          placeholder="请输入客户名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="油品" prop="cardOilsType">
         <el-select
-          v-model="ruleForm.discountSetting"
-          placeholder="请选择优惠方案"
+          v-model="queryParams.cardOilsType"
+          placeholder="请选择油品"
           clearable
           size="small"
-          @change="discountSettingChang"
         >
-          <el-option label="无" value="0"></el-option>
-          <el-option label="满减" value="1"></el-option>
-          <el-option label="立减" value="2"></el-option>
-          <el-option label="直降" value="3"></el-option>
-          <el-option label="阶梯直降" value="4"></el-option>
+          <el-option label="汽油卡" value="1"></el-option>
+          <el-option label="柴油卡" value="2"></el-option>
+          <el-option label="非油品卡" value="3"></el-option>
+          <el-option label="LNG卡" value="4"></el-option>
+          <el-option label="CNG卡" value="5"></el-option>
         </el-select>
-        <el-button size="mini" @click="save" type="primary"
-          >确定执行该优惠方案</el-button
-        >
       </el-form-item>
-    </el-form>
-
-    <hr />
-    <el-dialog
-      :visible.sync="openDialog"
-      width="520px"
-      append-to-body
-      :title="
-        ['', '满减方案', '立减方案', '直降方案', '阶梯直降'][discountSetting]
-      "
-    >
-      <el-form
-        ref="updateForm"
-        :model="updateForm"
-        :rules="rules"
-        label-width="120px"
-      >
-        <el-form-item label="方案名称" prop="grade" class="input-group-sm">
-          <!-- <el-input v-model="updateForm.grade" placeholder="请输入方案名称" /> -->
-          <input v-model="updateForm.grade" placeholder="请输入方案名称" class="form-control form-control-sm w-50"/>
-        </el-form-item>
-        <el-form-item label="油品名称" prop="oilName">
-          <el-select
-            v-model="updateForm.oilName"
-            placeholder="油品名称"
-            clearable
-            size="small"
-            class=" w-50"
-          >
-            <el-option
-              v-for="dict in filterOilNameOptions"
-              :key="dict.oilName"
-              :label="dict.oilName"
-              :value="dict.oilName"
-            />
-          </el-select>
-        </el-form-item>
-
-        <!-- 阶梯直降没有此条目 -->
-        <el-form-item
-          label="优惠条件"
-          prop="gasoilDiscountAmt"
-          :rules="{
-            required: discountSetting != 4,
-            message: '请填写优惠条件',
-            trigger: 'change',
-          }"
-          v-if="discountSetting != 4"
-        >
-          <el-radio-group
-            v-model="updateForm.discountTerm"
-            v-if="discountSetting == 3"
-          >
-            <el-radio :label="2">按加油金额</el-radio>
-            <el-radio :label="1">按加油升数</el-radio>
-          </el-radio-group>
-          <div
-            v-show="
-              updateForm.discountTerm == 2 ||
-              updateForm.discountTerm == 1 ||
-              discountSetting == 1 ||
-              discountSetting == 2
-            "
-          >
-            {{ ["", "每满", "满", "满"][discountSetting] }}
-            <el-input-number
-              v-model="updateForm.discountAmt"
-              size="mini"
-              :min="0"
-            />
-
-            <span>{{
-              updateForm.discountTerm == 1 && discountSetting == 3 ? "L" : "元"
-            }}</span>
-            ,{{ ["", "减", "减", "每升优惠"][discountSetting] }}
-            <el-input-number
-              v-model="updateForm.gasoilDiscountAmt"
-              size="mini"
-              :min="0"
-            />元
-          </div>
-        </el-form-item>
-
-        <!-- 阶梯直降没有此条目 -->
-        <el-form-item
-          label="会员日"
-          prop="discountSettingFlag"
-          :rules="{
-            required: discountSetting != 4,
-            message: '请选择是否开启会员日',
-            trigger: 'change',
-          }"
-          v-if="discountSetting != 4"
-        >
-          <el-radio-group v-model="updateForm.discountSettingFlag">
-            <el-radio label="0">关闭</el-radio>
-            <el-radio label="1">开启</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item
-          label="会员日周期类型"
-          prop="discountType"
-          v-show="updateForm.discountSettingFlag == 1"
-          :rules="{
-            required: updateForm.discountSettingFlag == 1,
-            message: '请选择会员日的周期类型',
-            trigger: 'change',
-          }"
-        >
-          <el-select
-            v-model="updateForm.discountType"
-            clearable
-            size="small"
-            @change="timeClear"
-          >
-            <el-option label="每周指定日" value="1"></el-option>
-            <el-option label="每月指定日" value="2"></el-option>
-            <el-option label="固定活动日" value="3"></el-option>
-          </el-select>
-          <div
-            v-show="updateForm.discountType != 3"
-            style="
-              display: flex;
-              flex-wrap: wrap;
-              border-style: solid;
-              border-color: #f5f7fa;
-            "
-          >
-            <div
-              v-for="(item, index) in timeSelect[updateForm.discountType]"
-              :key="index"
-              style="margin: 3px"
-            >
-              <div
-                class="hover-style"
-                style="
-                  border-radius: 5px;
-                  font-weight: bold;
-                  font-size: 12px;
-                  cursor: pointer;
-                "
-                @click="clickCalendar(index)"
-              >
-                <div>{{ item }}</div>
-                <div
-                  v-if="updateForm.collectClickCalendar.indexOf(index) > -1"
-                  style="
-                    width: 4px;
-                    height: 4px;
-                    border-radius: 50%;
-                    background-color: red;
-                    position: relative;
-                    left: calc(50% - 2px);
-                  "
-                ></div>
-                <div v-else style="width: 4px; height: 4px"></div>
-              </div>
-            </div>
-          </div>
-          <div v-show="updateForm.discountType == 3">
-            <el-date-picker
-              clearable
-              size="small"
-              style="margin-left: 10px; width: 200px"
-              v-model="updateForm.collectClickDay"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择提醒时间设置"
-            >
-            </el-date-picker>
-          </div>
-        </el-form-item>
-        <el-form-item
-          label="会员日优惠条件"
-          prop="discountActivityAmt"
-          v-show="updateForm.discountSettingFlag == 1"
-          :rules="{
-            required: updateForm.discountSettingFlag == 1,
-            message: '请填写会员日的优惠金额',
-            trigger: 'change',
-          }"
-        >
-          <div>
-            {{ ["", "每满", "满", "满"][discountSetting] }}
-            <el-input-number
-              v-model="updateForm.discountAmt"
-              size="mini"
-              :min="0"
-              disabled
-            />
-
-            <span>{{
-              updateForm.discountTerm == 1 && discountSetting == 3 ? "L" : "元"
-            }}</span>
-            ,{{ ["", "减", "减", "每升优惠"][discountSetting] }}
-            <el-input-number
-              v-model="updateForm.discountActivityAmt"
-              size="mini"
-              :min="0"
-            />元
-          </div>
-          <!-- <el-input-number
-            v-model="updateForm.integralProportion"
-            :min="1"
-            placeholder="请输入加倍比例"
-            size="small"
-          />
-          <span>倍</span> -->
-          <!-- 满
-          <el-input-number
-            v-model="updateForm.discountAmt"
-            size="mini"
-            :min="0"
-            disabled
-          /><span>{{
-            updateForm.discountTerm == 1 && discountSetting == 3 ? "L" : "元"
-          }}</span
-          >,每升优惠<el-input-number
-            v-model="updateForm.discountActivityAmt"
-            size="mini"
-            :min="0"
-          />元 -->
-        </el-form-item>
-        <el-form-item label="叠加等级优惠" prop="vipDiscountyPlus">
-          <el-radio-group v-model="updateForm.vipDiscountyPlus">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-          <div style="margin-left: 20px; color: red; font-size:12px">
-            注:"否" 客户只享受 {{ discountName }} 优惠
-          </div>
-        </el-form-item>
-        <el-form-item label="可否叠加劵" prop="couponPlus">
-          <el-radio-group v-model="updateForm.couponPlus">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-          <div style="margin-left: 20px; color: red;font-size:12px">
-            注:"否" 客户只享受 {{ discountName }} 优惠
-          </div>
-        </el-form-item>
-        
-        <!-- 只有阶梯直降有此条目 -->
-        <el-form-item
-          label="优惠条件"
-          prop="discountTerm"
-          :rules="{
-            required: discountSetting == 4,
-            message: '请填写优惠条件',
-            trigger: 'change',
-          }"
-          v-if="discountSetting == 4"
-        >
-          <el-radio-group v-model="updateForm.discountTerm">
-            <el-radio :label="2">按加油金额</el-radio>
-            <el-radio :label="1">按加油升数</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 只有阶梯直降有此条目 -->
-        <el-form-item
-          label="阶梯设置"
-          prop="discountType"
-          :rules="{
-            required: discountSetting == 4,
-            message: '请选择会员日的周期类型',
-            trigger: 'change',
-          }"
-          v-if="discountSetting == 4"
+      <el-form-item label="类型" prop="usageType">
+        <el-select
+          v-model="queryParams.usageType"
+          placeholder="请选择消费充值类型"
+          clearable
+          size="small"
         >
+          <el-option label="充值" value="+" />
+          <el-option label="消费" value="-" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
         <el-button
-          icon="el-icon-plus"
+          type="cyan"
+          icon="el-icon-search"
           size="mini"
-          class="mb-3 mr-4"
-          @click="handleUpdateClick"
-          type="secondary"
+          @click="handleQuery"
+          >搜索</el-button
         >
-          添加条目
-        </el-button>
-        </el-form-item>
-
-        <div class="mx-auto mb-4 shadow-lg bg-white pt-4 pb-2 px-1 rounded" style="width: 450px;">
-          <div class="input-group input-group-sm mb-4 mt-1">
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Dollar amount (with dot and two decimal places)"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text"> &lt;= 加油金额 &lt;= </span>
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Dollar amount (with dot and two decimal places)"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text">元,每升优惠</span>
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Dollar amount (with dot and two decimal places)"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text">元</span>
-            </div>
-            <div class="input-group-append" id="button-addon4">
-              <button class="btn btn-danger" type="button">删除</button>
-            </div>
-          </div>
-          <div class="input-group input-group-sm mb-4 mt-1">
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Dollar amount (with dot and two decimal places)"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text"> &lt;= 加油金额 &lt;= </span>
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Dollar amount (with dot and two decimal places)"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text">元,每升优惠</span>
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Dollar amount (with dot and two decimal places)"
-            />
-            <div class="input-group-append">
-              <span class="input-group-text">元</span>
-            </div>
-            <div class="input-group-append" id="button-addon4">
-              <button class="btn btn-danger" type="button">删除</button>
-            </div>
-          </div>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleSubmit">确 定</el-button>
-        <el-button @click="cancelSubmit">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      label-width="68px"
-      v-show="discountSetting != 0"
-    >
-      <div>
-        <el-button
-          icon="el-icon-plus"
-          size="small"
-          class="mb-3 mr-4"
-          @click="handleUpdateClick"
-          style="float: right"
-          type="warning"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
         >
-          {{
-            this.discountSetting == 1
-              ? "添加满减方案条目"
-              : this.discountSetting == 2
-              ? "添加立减方案条目"
-              : this.discountSetting == 3
-              ? "添加直降方案条目"
-              : this.discountSetting == 4
-              ? "添加阶梯直降条目"
-              : "无"
-          }}
-        </el-button>
-      </div>
+      </el-form-item>
     </el-form>
-    <el-table :data="discountList" v-show="discountSetting != 0">
-      <af-table-column label="id" align="center" prop="id" v-if="false" />
-      <af-table-column label="方案名称" align="center" prop="grade" />
-      <af-table-column label="油品名称" align="center" prop="oilName" />
-      <af-table-column
-        label="优惠条件"
-        align="center"
-        v-if="discountSetting == 3"
-      >
+    <el-table :data="labelList">
+      <af-table-column align="center" prop="id"  type="selection"/>
+      <af-table-column label="姓名" align="center" prop="id" />
+      <af-table-column label="当前归属的标签" align="center" prop="id" />
+      <af-table-column label="手机号" align="center" prop="stationName" />
+      <af-table-column label="最后一笔消费时间" align="center" prop="stationName" />
+      <af-table-column label="近期详细消费" align="center" prop="stationName" width="160px">
         <template slot-scope="scope">
-          满 {{ scope.row.discountAmt }}
-          {{ scope.row.discountTerm == 2 ? "元" : "L" }},每升优惠
-          {{ scope.row.gasoilDiscountAmt }} 元
-        </template>
-      </af-table-column>
-      <af-table-column
-        label="优惠条件"
-        align="center"
-        v-if="discountSetting == 1"
-      >
-        <template slot-scope="scope">
-          每满 {{ scope.row.discountAmt }} 元,减
-          {{ scope.row.gasoilDiscountAmt }} 元
-        </template>
-      </af-table-column>
-      <af-table-column
-        label="优惠条件"
-        align="center"
-        v-if="discountSetting == 2"
-      >
-        <template slot-scope="scope">
-          满 {{ scope.row.discountAmt }} 元,减
-          {{ scope.row.gasoilDiscountAmt }} 元
-        </template>
-      </af-table-column>
-      <af-table-column label="会员日" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.discountSettingFlag == 0"> 无活动 </span>
-          <span v-else-if="scope.row.discountSettingFlag == 1">
-            {{ discountSettingTranslate(scope.row) }}
-          </span>
+          <el-button
+            type="text"
+            icon="el-icon-search"
+            class="underline btn24"
+            size="mini"
+            @click="handleMoveLabel('right', 1, scope.row)"
+          >查询</el-button>
         </template>
       </af-table-column>
-      <af-table-column
-        label="叠加等级优惠"
-        align="center"
-        prop="vipDiscountyPlus"
-        :formatter="vipDiscountyPlusFotmat"
-      />
-      <af-table-column
-        label="叠加劵"
-        align="center"
-        prop="couponPlus"
-        :formatter="couponPlusFotmat"
-      />
-      <af-table-column
-        label="优惠方案类型"
-        v-if="false"
-        align="center"
-        prop="discountPlanType"
-      />
-      <af-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <af-table-column label="操作" align="center" width="160px">
         <template slot-scope="scope">
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            >修改</el-button
-          > -->
           <el-button
+            type="text"
+            icon="el-icon-circle-plus-outline"
+            class="underline btn24"
             size="mini"
+            @click="handleMoveLabel('right', 1, scope.row)"
+          >打标签</el-button>
+          <el-button
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            >删除</el-button
-          >
+            icon="el-icon-circle-plus-outline"
+            class="underline btn24"
+            size="mini"
+            @click="handleMoveLabel('right', 1, scope.row)"
+          >删除当前标签</el-button>
         </template>
       </af-table-column>
     </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
 <script>
-import {
-  listPlan,
-  getPlan,
-  delPlan,
-  addPlan,
-  updatePlan,
-  exportPlan,
-} from "@/api/market/plan";
-import { getStationPay, updatePay } from "@/api/station/pay";
-import { getDept } from "@/api/system/dept";
-import { listPrice } from "@/api/station/price";
+import { listRecord } from "@/api/customer/record";
+
 export default {
-  name: "Label_Batch",
+  name: "Dzk_Bill",
   data() {
-    const validatorGasoilDiscountAmt = (rule, value, callback) => {
-      if (this.discountSetting == 3) {
-        if (
-          this.updateForm.discountTerm === undefined ||
-          this.updateForm.discountTerm === ""
-        ) {
-          callback(new Error("请选择优惠方式"));
-          return;
-        }
-      }
-      const start = +this.updateForm.discountAmt;
-      const end = +this.updateForm.gasoilDiscountAmt;
-      if (isNaN(start) || isNaN(end)) {
-        callback(new Error("检查优惠方式完整性"));
-        return;
-      }
-      callback();
-    };
-
     return {
-      pageStatus: 0,
-      discountList: [],
+      // 总条数
       total: 0,
-      oilNameOptions: [],
-      title: "",
-      openDialog: false,
+      // 客户电子会员卡充值消费记录表格数据
+      labelList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        grade: null,
-        discountWay: null,
-        gasoilDiscountLitre: null,
-        dieseloilDiscountLitre: null,
-        gradeType: null,
-        gasoilConsume: null,
-        gasoilGrowthValue: null,
-        dieseloilConsume: null,
-        dieseloilGrowthValue: null,
-        growthValue: null,
-        date: null,
-        deductionGrowthValue: null,
-      },
-      updateFormDynamic1: ["", "满", "每满", "满"],
-      updateFormDynamic2: ["", "减", "减", "每升优惠"],
-      ruleForm: {},
-      // 表单校验
-      rules: {
-        grade: [{ required: true, message: "请输入方案名称", trigger: "blur" }],
-        oilName: [
-          { required: true, message: "请选择油品名称", trigger: "change" },
-        ],
-        discountTerm: [
-          { required: true, message: "选择油品名称", trigger: "change" },
-        ],
-        gasoilDiscountAmt: [
-          { validator: validatorGasoilDiscountAmt, trigger: "change" },
-        ],
-        discountAmt: [
-          { required: true, message: "请填写优惠金额", trigger: "blur" },
-        ],
-        vipDiscountyPlus: [
-          {
-            required: true,
-            message: "选择等级优惠是否叠加",
-            trigger: "change",
-          },
-        ],
-        couponPlus: [
-          { required: true, message: "选择可否叠加券", trigger: "change" },
-        ],
-      },
-      dtrules: {},
-      discountSetting: 0,
-      updateForm: {
-        collectClickCalendar: [],
-        collectClickDay: "",
+        orderNo: null,
+        customerNo: null,
+        customerName: null,
+        usageType: null,
+        payType: null,
+        cardOilsType: null,
       },
-      currentDiscountName: "",
-      timeSelect: [
-        ,
-        ["周天", "周一", "周二", "周三", "周四", "周五", "周六"],
-        [
-          "01",
-          "02",
-          "03",
-          "04",
-          "05",
-          "06",
-          "07",
-          "08",
-          "09",
-          "10",
-          "11",
-          "12",
-          "13",
-          "14",
-          "15",
-          "16",
-          "17",
-          "18",
-          "19",
-          "20",
-          "21",
-          "22",
-          "23",
-          "24",
-          "25",
-          "26",
-          "27",
-          "28",
-          "29",
-          "30",
-          "31",
-        ],
-      ],
     };
   },
-  computed: {
-    discountName() {
-      return this.discountSetting == 1
-        ? "满减"
-        : this.discountSetting == 2
-        ? "立减"
-        : this.discountSetting == 3
-        ? "直降"
-        : "无";
-    },
-    filterOilNameOptions() {
-      return this.oilNameOptions.filter((ele) => {
-        let flag = true;
-        this.discountList.forEach((item) => {
-          if (ele.oilName == item.oilName) {
-            flag = false;
-          }
-        });
-        return flag;
-      });
-    },
-  },
   created() {
-    this.setPageStatus();
-    this.init();
+    this.getList();
   },
   methods: {
-    init() {
-      listPrice().then((response) => {
-        this.oilNameOptions = response.rows;
-      });
-      this.getPay().then(() => {
-        this.getList();
-      });
-    },
-    setPageStatus() {
-      this.queryPageStatus([2]).then((res) => {
-        this.pageStatus = res;
-      });
-    },
-    timeClear() {
-      this.updateForm.collectClickCalendar = [];
-      this.updateForm.collectClickDay = [];
-    },
-    getPay() {
-      return getStationPay().then((response) => {
-        this.ruleForm = response.data;
-        this.discountSetting = response.data.discountSetting;
-        this.currentDiscountName = this.discountName;
-      });
-    },
-    save() {
-      this.$refs["ruleForm"].validate((valid) => {
-        if (valid) {
-          if (this.ruleForm.deptId != null) {
-            let upPromise = null;
-            let e = this.ruleForm.discountSetting;
-            if (e == "0") {
-              upPromise = updatePay(this.ruleForm).then((response) => {
-                this.msgSuccess("优惠方案设置成功");
-              });
-            } else if (e == "1") {
-              if (this.discountList.length > 0) {
-                upPromise = updatePay(this.ruleForm).then((response) => {
-                  this.msgSuccess("优惠方案设置成功");
-                });
-              } else {
-                this.msgError("满减规则下无方案");
-                return;
-              }
-            } else if (e == "2") {
-              if (this.discountList.length > 0) {
-                upPromise = updatePay(this.ruleForm).then((response) => {
-                  this.msgSuccess("优惠方案设置成功");
-                });
-              } else {
-                this.msgError("立减规则下无方案");
-                return;
-              }
-            } else if (e == "3") {
-              if (this.discountList.length > 0) {
-                upPromise = updatePay(this.ruleForm).then((response) => {
-                  this.msgSuccess("优惠方案设置成功");
-                });
-              } else {
-                this.msgError("直降规则下无方案");
-                return;
-              }
-            }
-            upPromise
-              .catch((err) => {
-                this.msgError("设置时出错,请刷新后重试~");
-              })
-              .then((res) => {
-                this.getPay();
-              });
-          } else {
-            this.getPay();
-          }
-        }
-      });
-    },
-    discountSettingChang(e) {
-      console.log(e);
-      this.discountSetting = e;
-      this.getList();
-    },
-    getList() {
-      const query = {
-        pageNum: 1,
-        pageSize: 100,
-        discountPlanType: this.discountSetting,
-      };
-      listPlan(query).then((response) => {
-        this.discountList = response.rows;
-        this.total = response.total;
-      });
-    },
-    vipDiscountyPlusFotmat(row, column) {
-      if (row.vipDiscountyPlus === "1") {
-        return "是";
-      } else if (row.vipDiscountyPlus === "0") {
-        return "否";
+    usageTypeFotmat(row, column) {
+      if (row.usageType === "+") {
+        return "充值";
+      } else if (row.usageType === "-") {
+        return "消费";
       }
     },
-    couponPlusFotmat(row, column) {
-      if (row.couponPlus === "1") {
-        return "是";
-      } else if (row.couponPlus === "0") {
-        return "否";
+    cardOilsTypeFotmat(row, column) {
+      if (row.cardOilsType === "1") {
+        return "汽油";
+      } else if (row.cardOilsType === "2") {
+        return "柴油";
+      } else if (row.cardOilsType === "3") {
+        return "非油品";
+      } else if (row.cardOilsType === "4") {
+        return "LNG";
+      } else if (row.cardOilsType === "5") {
+        return "CNG";
       }
     },
-    handleUpdateClick() {
-      this.openDialog = true;
-      this.updateForm = {
-        discountPlanType: this.discountSetting,
-      };
-    },
-    handleSubmit() {
-      this.$refs["updateForm"].validate((valid) => {
-        if (valid) {
-          if (this.updateForm.discountSettingFlag == "1") {
-            if (
-              this.updateForm.discountType == "1" ||
-              this.updateForm.discountType == "2"
-            ) {
-              this.updateForm.discountDate =
-                this.updateForm.collectClickCalendar.toString();
-            } else {
-              this.updateForm.discountDate =
-                this.updateForm.collectClickDay.toString();
-            }
-          }
-          if (this.updateForm.id != null) {
-            updatePlan(this.updateForm).then((response) => {
-              this.msgSuccess("修改成功");
-              this.openDialog = false;
-              this.getList();
-            });
-          } else {
-            addPlan(this.updateForm).then((response) => {
-              this.msgSuccess("新增成功");
-              this.openDialog = false;
-              this.getList();
-            });
-          }
-        }
+    /** 查询客户电子会员卡充值消费记录列表 */
+    getList() {
+      listRecord(this.queryParams).then((response) => {
+        this.labelList = response.rows;
+        this.total = response.total;
       });
     },
-    clickCalendar(index) {
-      if (this.updateForm.collectClickCalendar.indexOf(index) === -1) {
-        this.updateForm.collectClickCalendar.push(index);
-      } else if (this.updateForm.collectClickCalendar.indexOf(index) > -1) {
-        const temp = this.updateForm.collectClickCalendar.findIndex((ele) => {
-          return ele == index;
-        });
-        this.updateForm.collectClickCalendar.splice(temp, 1);
-      }
-      this.$refs.updateForm.validateField("discountType");
-      this.updateForm = { ...this.updateForm };
-    },
-    cancelSubmit() {
-      this.openDialog = false;
-    },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      const id = row.id;
-      this.title = "修改满减优惠";
-      this.openDialog = true;
-      this.updateForm = row;
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id;
-      this.$confirm("是否确认删除满减优惠方案?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return delPlan(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        });
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
-    // /** 导出按钮操作 */
-    // handleExport() {
-    //   const queryParams = this.queryParams;
-    //   this.$confirm("是否确认导出所有优惠设置数据项?", "警告", {
-    //     confirmButtonText: "确定",
-    //     cancelButtonText: "取消",
-    //     type: "warning",
-    //   })
-    //     .then(function () {
-    //       return exportPlan(queryParams);
-    //     })
-    //     .then((response) => {
-    //       this.download(response.msg);
-    //     });
-    // },
-    discountSettingTranslate(row) {
-      if (row.discountSettingFlag == 0) {
-        return "未设置";
-      }
-      // if (this.discountList.integralActivity == 0) {
-      //   return "";
-      // }
-
-      let timeString = "";
-      const discountType = row.discountType;
-
-      if (discountType == 1) {
-        timeString += "每周的";
-      }
-      if (discountType == 2) {
-        timeString += "每月的";
-      }
-      if (discountType == 3) {
-        timeString += "指定的日期 ";
-      }
-      if (discountType == 1 || discountType == 2) {
-        (row.discountDate || "")
-          .split(",")
-          .filter((ele) => {
-            return ele !== "";
-          })
-          .forEach((ele) => {
-            timeString += this.timeSelect[discountType][ele] + "、";
-          });
-      } else if (discountType == 3) {
-        timeString += row.discountDate.toString();
-      }
-
-      timeString = timeString.replace(/(、)$/g, "") + " 优惠:";
-      if (this.discountSetting == 3) {
-        timeString +=
-          "满" +
-          row.discountAmt +
-          (row.discountTerm == 2 ? "元" : "L") +
-          ",每升优惠" +
-          row.discountActivityAmt +
-          "元";
-      } else if (this.discountSetting == 1) {
-        timeString +=
-          "每满" + row.discountAmt + "元,减" + row.discountActivityAmt + "元";
-      } else if (this.discountSetting == 2) {
-        timeString +=
-          "满" + row.discountAmt + "元,减" + row.discountActivityAmt + "元";
-      }
-      return timeString;
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
   },
 };
 </script>
-<style>
-</style>

+ 2 - 0
src/views/order/Order_NotOil.vue

@@ -118,6 +118,7 @@ export default {
         createdDate: null,
         orderType: 2,
         likeConsumer: null,
+        levelId: this.levelId
       },
       // 表单参数
       form: {},
@@ -157,6 +158,7 @@ export default {
     },
     /** 查询订单支付列表 */
     getList() {
+      this.queryParams.levelId = this.levelId
       listOrder(
         this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
       ).then((response) => {

+ 2 - 0
src/views/overview/Overview_AccountingReport.vue

@@ -285,6 +285,7 @@ export default {
   methods: {
     /** 查询【请填写功能名称】列表 */
     getList() {
+      this.queryParams.levelId = this.levelId;
       listSummary(
         this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
       ).then((response) => {
@@ -314,6 +315,7 @@ export default {
         zfbAmt: null,
         dzkAmt: null,
         classesMan: null,
+        levelId: this.levelId
       };
       this.resetForm("form");
     },

+ 10 - 3
src/views/overview/Overview_Daily.vue

@@ -192,7 +192,8 @@ export default {
         payDate: null,
         pageNum: 1,
         pageSize: 10,
-        status:"1"
+        status:"1",
+        levelId: this.levelId
       },
       // 查询参数
       queryInfo: {
@@ -204,7 +205,8 @@ export default {
         beginTime: null,
         endTime: null,
         orderType: null,
-        stationId:null
+        stationId:null,
+        levelId: this.levelId
       },
       //日报数据
       dayReportList: [],
@@ -221,6 +223,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
+      this.queryParams.levelId = this.levelId
       this.queryParams.beginTime = this.getMonthDate();
       this.queryParams.endTime = this.getEndFormatDate(new Date());
       setTimeout(() => {
@@ -461,6 +464,8 @@ export default {
 
     //获取折线图用到的数据
     getDatas() {
+      console.log('levelId',this.levelId)
+      this.queryParams.levelId = this.levelId;
       Promise.all([
         this.getXData(),
         this.getQyData92(),
@@ -646,7 +651,8 @@ export default {
         stationId: null,
         stationName: null,
         beginTime:null,
-        endTime:null
+        endTime:null,
+        levelId: this.levelId
       };
       this.form = {
         zongAmt: 0,
@@ -665,6 +671,7 @@ export default {
     },
     getLookOrder(row) {
       const createdDate = this.row.createdDate;
+      this.queryInfo.levelId = this.levelId
       this.queryInfo.beginTime =createdDate.substring(0,10) +" 00:00:00";
       this.queryInfo.endTime =createdDate.substring(0,10) +" 23:59:59";
       this.queryInfo.status = "1";

+ 1 - 0
src/views/overview/Overview_Summary.vue

@@ -389,6 +389,7 @@ export default {
         stationName: null,
         beginTime: null,
         endTime: null,
+        levelId: this.levelId
       };
       switch (type) {
         case 0: // 今日

+ 6 - 2
src/views/point/Point_Bill.vue

@@ -111,7 +111,8 @@ export default {
         invalidPoints: null,
         recentConsumptionDate: null,
         stationId: null,
-        stationName: null
+        stationName: null,
+        levelId: this.levelId
       },
       //积分明细 查询参数
       query: {
@@ -122,7 +123,8 @@ export default {
         recordType: null,
         integral: null,
         stationId: null,
-        stationName: null
+        stationName: null,
+        levelId: this.levelId
       },
     };
   },
@@ -142,6 +144,7 @@ export default {
     },
     /** 查询用户积分列表 */
     getList() {
+      this.queryParams.levelId = this.levelId;
       listPoints(this.queryParams).then(response => {
         this.pointsList = response.rows;
         this.total = response.total;
@@ -149,6 +152,7 @@ export default {
     },
      /** 查询用户积分明细列表 */
     getInfoList() {
+      this.query.levelId = this.levelId;
       listRecord(this.query).then(response => {
         this.recordList = response.rows;
         this.totalInfo = response.total;

+ 2 - 0
src/views/point/Point_Order.vue

@@ -149,6 +149,7 @@ export default {
         exchangeNum: null,
         exchangeTime: null,
         status: null,
+        levelId: this.levelId
       },
       // 表单参数
       form: {},
@@ -168,6 +169,7 @@ export default {
     /** 查询积分消费订单列表 */
     getList() {
       this.queryParams.stationId = this.deptId;
+      this.queryParams.levelId = this.levelId; 
       listOrder(this.queryParams).then((response) => {
         this.orderList = response.rows;
         this.total = response.total;