文档修改

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 智慧易加管理系统/开发环境
-#VUE_APP_BASE_API = 'http://test.huijy.net/prod-api'
- VUE_APP_BASE_API = '/dev-api'
+ VUE_APP_BASE_API = 'http://test.huijy.net/prod-api'
+# VUE_APP_BASE_API = '/dev-api'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/components/PermissionContainer/index.vue

@@ -0,0 +1,133 @@
+<template>
+  <div>
+      <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">
+          你好
+        <slot></slot>
+      </div>
+  </div>
+</template>
+
+<script>
+import { scrollTo } from "@/utils/scroll-to";
+import vueQr from "vue-qr";
+import html2canvas from "html2canvas";
+
+export default {
+  name: "PermissionContainer",
+  data() {
+    return {
+      pageStatus:4,
+    };
+  },
+  props: {
+    // page: {
+    //   type: Number,
+    //   default: 1,
+    // },
+    // limit: {
+    //   type: Number,
+    //   default: 10,
+    // },
+    // pageSizes: {
+    //   type: Array,
+    //   default() {
+    //     return [10, 20, 30, 50];
+    //   },
+    // },
+    // layout: {
+    //   type: String,
+    //   default: "total, sizes, prev, pager, next, jumper",
+    // },
+    // background: {
+    //   type: Boolean,
+    //   default: true,
+    // },
+    // autoScroll: {
+    //   type: Boolean,
+    //   default: true,
+    // },
+    // hidden: {
+    //   type: Boolean,
+    //   default: false,
+    // },
+    // pagerCount: {
+    //   type: Number,
+    //   default: 7,
+    // },
+    // text: {
+    //   type: String,
+    //   required: true,
+    // },
+    // name:{
+    //   type: String,
+    //   required: true,
+    // }
+  },
+  components: {
+    vueQr,
+  },
+  computed: {
+    // currentPage: {
+    //   get() {
+    //     return this.page;
+    //   },
+    //   set(val) {
+    //     this.$emit("update:page", val);
+    //   },
+    // },
+    // pageSize: {
+    //   get() {
+    //     return this.limit;
+    //   },
+    //   set(val) {
+    //     this.$emit("update:limit", val);
+    //   },
+    // },
+  },
+  methods: {
+    downloadImg() {
+      try {
+        window.pageYoffset = 0;
+        document.documentElement.scrollTop = 0;
+        document.body.scrollTop = 0;
+
+        html2canvas(document.getElementById("qrDiv_QrCode"), {
+          allowTaint: false,
+        }).then((canvas) => {
+          const a = document.createElement("a");
+          const event = new MouseEvent("click");
+          a.download = this.name;
+          a.href = canvas.toDataURL();
+          a.dispatchEvent(event);
+          this.$emit("downloadImg")
+        });
+      } catch (error) {
+        this.msgError("导出二维码失败，请刷新重试~")
+      }
+    },
+    exportQr(text) {
+      this.text = "https://goto.huijy.net/" + this.deptId + "/" + trimEqualStr;
+      this.exportQrDialog = true;
+    },
+    handleSizeChange(val) {
+      this.$emit("pagination", { page: this.currentPage, limit: val });
+      if (this.autoScroll) {
+        scrollTo(0, 800);
+      }
+    },
+    handleCurrentChange(val) {
+      this.$emit("pagination", { page: val, limit: this.pageSize });
+      if (this.autoScroll) {
+        scrollTo(0, 800);
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>

src/views/coupon/Coupon_CreateCoupon.vue

@@ -24,7 +24,7 @@
         :inline="true"
         label-width="88px"
       >
-       <el-form-item label="优惠卷标识" prop="couponRemark">
+       <el-form-item label="优惠券标识" prop="couponRemark">
         <el-input
           v-model="queryForm.couponRemark"
           placeholder="请输入标识"
@@ -33,7 +33,7 @@
           
         />
        </el-form-item>
-      <el-form-item label="优惠卷类型" prop="couponType">
+      <el-form-item label="优惠券类型" prop="couponType">
         <el-select
           v-model="queryForm.couponType"
           clearable
@@ -44,7 +44,7 @@
           <el-option label="兑换卷" value="3" ></el-option>
         </el-select>
       </el-form-item>
-        <el-form-item label="优惠卷名称" prop="couponName">
+        <el-form-item label="优惠券名称" prop="couponName">
         <el-input
           v-model="queryForm.couponName"
           placeholder="请输入名称"
@@ -676,7 +676,7 @@ import {
 import { updateDept } from "@/api/system/dept";
 
 export default {
-  name: "Station_Equipment",
+  name: "Coupon_CreateCoupon",
   data() {
     let validateOilNameList = (rule, value, callback) => {
       console.log(value);
@@ -733,7 +733,7 @@ export default {
     //   callback()
     // };
     return {
-       //创建优惠卷的时间
+       //创建优惠券的时间
       dateRangeCreatedDate: [],
       couponEnabledFlag: "1",
       pageStatus: 4,
@@ -916,7 +916,7 @@ export default {
       return timeString;
     },
   
-   /** 查询优惠卷模板信息*/
+   /** 查询优惠券模板信息*/
     getList() {
        listInfo(this.addDateRange(this.queryForm, this.dateRangeCreatedDate))
         .then((res) => {

src/views/coupon/Coupon_CreateIssue.vue

@@ -13,7 +13,7 @@
         :inline="true"
         label-width="88px"
       >
-       <el-form-item label="优惠卷标识" prop="issueRemark">
+       <el-form-item label="发放标识" prop="issueRemark">
         <el-input
           v-model="queryForm.issueRemark"
           placeholder="请输入标识"
@@ -22,7 +22,7 @@
           
         />
        </el-form-item>
-      <el-form-item label="优惠卷类型" prop="issueType">
+      <el-form-item label="优惠券类型" prop="issueType">
         <el-select
           v-model="queryForm.issueType"
           clearable
@@ -33,7 +33,7 @@
           <el-option label="支付成功后的展示位" value="3" ></el-option>
         </el-select>
       </el-form-item>
-        <el-form-item label="优惠卷名称" prop="issueName">
+        <el-form-item label="发放名称" prop="issueName">
         <el-input
           v-model="queryForm.issueName"
           placeholder="请输入名称"

src/views/coupon/Coupon_Grant.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-  
+    <al/>
 </div>
 </template>
 
@@ -14,6 +14,8 @@ import {
 import { queryOilType } from "@/utils/oil";
 
 import { listPrice } from "@/api/station/price";
+import Qr from "@/components/PermissionContainer";
+
 export default {
   name: "Customer_Grade",
   data() {
@@ -75,6 +77,9 @@ export default {
 
     });
   },
+  components: {
+    al:Qr
+  },
   methods: {
     setPageStatus() {
       this.queryPageStatus([2]).then((res) => {

src/views/coupon/Coupon_Statistics/issue.vue

@@ -13,7 +13,7 @@
         :inline="true"
         label-width="88px"
       >
-       <el-form-item label="优惠卷标识" prop="issueRemark">
+       <el-form-item label="发放标识" prop="issueRemark">
         <el-input
           v-model="queryForm.issueRemark"
           placeholder="请输入标识"
@@ -22,7 +22,7 @@
           
         />
        </el-form-item>
-      <el-form-item label="优惠卷类型" prop="issueType">
+      <el-form-item label="发放类型" prop="issueType">
         <el-select
           v-model="queryForm.issueType"
           clearable
@@ -33,7 +33,7 @@
           <el-option label="支付成功后的展示位" value="3" ></el-option>
         </el-select>
       </el-form-item>
-        <el-form-item label="优惠卷名称" prop="issueName">
+        <el-form-item label="发放名称" prop="issueName">
         <el-input
           v-model="queryForm.issueName"
           placeholder="请输入名称"
@@ -205,7 +205,7 @@
               type="text"
               icon="el-icon-search"
               @click="handlequeryCouponUserList(scope.row.id)"
-              >查看优惠卷</el-button
+              >查看优惠券</el-button
             >
           </template>
         </af-table-column>
@@ -233,7 +233,7 @@
       <af-table-column label="油站名" align="center" prop="id" v-if="jiBie==0||jiBie==1"/>
       <af-table-column
         v-if="false"
-        label="优惠卷id"
+        label="优惠券id"
         align="center"
         prop="id"
       />
@@ -465,7 +465,7 @@ export default {
       open: false,
       // 总条数
       total: 100,
-      // 优惠卷总条数
+      // 优惠券总条数
       userTotal: 100,
       leftQuery: {},
       rightQuery: {},
@@ -473,7 +473,7 @@ export default {
       rightData: [],
       moveRightData: [],
       moveLeftData: [],
-       // 优惠卷的信息
+       // 优惠券的信息
       couponUserList: [],
       // 查询参数
       queryForm: {
@@ -893,11 +893,11 @@ export default {
     handleUpdate(row) {
       
       this.createForm = JSON.parse(JSON.stringify(row));
-      this.title = "用户优惠卷信息";
+      this.title = "用户优惠券信息";
       this.open = true;
     },
 
-     /** 查看优惠卷信息 */
+     /** 查看优惠券信息 */
     handlequeryCouponUserList(row) {
       console.log(row);
       console.log(this.queryCouponUserFrom.issueId);
@@ -908,7 +908,7 @@ export default {
       ).then((response) => {
         this.couponUserList = response.rows;
         this.userTotal = response.total;
-        this.title = "用户优惠卷信息";
+        this.title = "用户优惠券信息";
         this.open = true;
       });
       
@@ -921,7 +921,7 @@ export default {
       ).then((response) => {
         this.couponUserList = response.rows;
         this.userTotal = response.total;
-        this.title = "用户优惠卷信息";
+        this.title = "用户优惠券信息";
         this.open = true;
       });
       

src/views/coupon/Coupon_Statistics/model.vue

@@ -14,7 +14,7 @@
         :inline="true"
         label-width="88px"
       >
-       <el-form-item label="优惠卷标识" prop="couponRemark">
+       <el-form-item label="优惠券标识" prop="couponRemark">
         <el-input
           v-model="queryForm.couponRemark"
           placeholder="请输入标识"
@@ -23,7 +23,7 @@
           
         />
        </el-form-item>
-      <el-form-item label="优惠卷类型" prop="couponType">
+      <el-form-item label="优惠券类型" prop="couponType">
         <el-select
           v-model="queryForm.couponType"
           clearable
@@ -34,7 +34,7 @@
           <el-option label="兑换卷" value="3" ></el-option>
         </el-select>
       </el-form-item>
-        <el-form-item label="优惠卷名称" prop="couponName">
+        <el-form-item label="优惠券名称" prop="couponName">
         <el-input
           v-model="queryForm.couponName"
           placeholder="请输入名称"
@@ -216,7 +216,7 @@
               icon="el-icon-search"
               @click="handlequeryCouponUserList(scope.row.id)"
               v-if="scope.row.editFlag"
-              >查看优惠卷</el-button
+              >查看优惠券</el-button
             >
           </template>
         </af-table-column>
@@ -247,7 +247,7 @@
       <af-table-column label="油站名" align="center" prop="id" v-if="jiBie==0||jiBie==1"/>
       <af-table-column
         v-if="false"
-        label="优惠卷id"
+        label="优惠券id"
         align="center"
         prop="id"
       />
@@ -403,7 +403,7 @@ export default {
     //   callback()
     // };
     return {
-        //创建优惠卷的时间
+        //创建优惠券的时间
       dateRangeCreatedDate: [],
       couponEnabledFlag: "1",
       pageStatus: 4,
@@ -445,14 +445,14 @@ export default {
       open: false,
       // 总条数
       total: 100,
-      // 优惠卷总条数
+      // 优惠券总条数
       userTotal: 100,
       leftQuery: {},
       rightQuery: {},
       leftData: [],
       rightData: [],
       moveRightData: [],
-      // 优惠卷的信息
+      // 优惠券的信息
       couponUserList: [],
       moveLeftData: [],
       // 查询参数
@@ -762,7 +762,7 @@ export default {
       }
       return;
     },
-     /** 查看优惠卷信息 */
+     /** 查看优惠券信息 */
     handlequeryCouponUserList(row) {
       this.queryCouponUserFrom.couponId=row;
     
@@ -771,12 +771,12 @@ export default {
       ).then((response) => {
         this.couponUserList = response.rows;
         this.userTotal = response.total;
-        this.title = "用户优惠卷信息";
+        this.title = "用户优惠券信息";
         this.open = true;
       });
       
     },
-      /** 查看优惠卷信息 */
+      /** 查看优惠券信息 */
     queryCouponUserListByPage() {
 
     
@@ -785,7 +785,7 @@ export default {
       ).then((response) => {
         this.couponUserList = response.rows;
         this.userTotal = response.total;
-        this.title = "用户优惠卷信息";
+        this.title = "用户优惠券信息";
         this.open = true;
       });
       
@@ -829,7 +829,7 @@ export default {
       this.queryForm.pageNum = 1;
       this.getList();
     },
-     /** 查询优惠卷模板信息*/
+     /** 查询优惠券模板信息*/
     getList() {
        listInfo(this.addDateRange(this.queryForm, this.dateRangeCreatedDate))
         .then((res) => {

src/views/coupon/Coupon_Statistics/realTime.vue

@@ -84,7 +84,7 @@
       <af-table-column label="油站名" align="center" prop="id" v-if="jiBie==0||jiBie==1"/>
       <af-table-column
         v-if="false"
-        label="优惠卷id"
+        label="优惠券id"
         align="center"
         prop="id"
       />
@@ -183,7 +183,7 @@ export default {
       dateRangeCreatedDate: [],
       // 总条数
       total: 0,
-      // 优惠卷的信息
+      // 优惠券的信息
       couponUserList: [],
       oilNameOptions: [],
       // 字典