积分明细完成

src/views/point/Point_Order.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="90px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="90px"
+    >
       <el-form-item label="积分订单号" prop="integralOrderNo">
         <el-input
           v-model="queryParams.integralOrderNo"
@@ -32,48 +37,91 @@
       </el-form-item>
 
       <el-form-item label="兑换时间" prop="exchangeTime">
-        <el-date-picker clearable size="small" style="width: 200px"
+        <el-date-picker
+          clearable
+          size="small"
+          style="width: 200px"
           v-model="queryParams.exchangeTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择兑换时间">
+          placeholder="选择兑换时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table :data="orderList">
-      <af-table-column label="积分订单id" align="center" prop="id" v-if="false"/>
+      <af-table-column
+        label="积分订单id"
+        align="center"
+        prop="id"
+        v-if="false"
+      />
       <af-table-column label="订单号" align="center" prop="integralOrderNo" />
-      <af-table-column label="商品类型" align="center" prop="waresType" v-if="false"/>
+      <af-table-column
+        label="商品类型"
+        align="center"
+        prop="waresType"
+        v-if="false"
+      />
       <af-table-column label="商品名称" align="center" prop="waresName" />
-      <af-table-column label="微信唯一标识" align="center" prop="unionId"  v-if="false"/>
+      <af-table-column
+        label="微信唯一标识"
+        align="center"
+        prop="unionId"
+        v-if="false"
+      />
       <af-table-column label="会员名称" align="center" prop="customerName" />
       <af-table-column label="手机号" align="center" prop="mobilePhone" />bu
       <af-table-column label="兑换数量" align="center" prop="exchangeNum" />
-      <af-table-column label="兑换时间" align="center" prop="exchangeTime" width="180">
+      <af-table-column
+        label="兑换时间"
+        align="center"
+        prop="exchangeTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.exchangeTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.exchangeTime, "{y}-{m}-{d}") }}</span>
         </template>
       </af-table-column>
-      <af-table-column label="订单状态" align="center" prop="status" :formatter="statusFormat" />
+      <af-table-column
+        label="订单状态"
+        align="center"
+        prop="status"
+        :formatter="statusFormat"
+      />
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
   </div>
 </template>
 
 <script>
-import { listOrder, getOrder, delOrder, addOrder, updateOrder, exportOrder } from "@/api/integral/order";
+import {
+  listOrder,
+  getOrder,
+  delOrder,
+  addOrder,
+  updateOrder,
+  exportOrder,
+} from "@/api/integral/order";
 
 export default {
   name: "Order",
@@ -98,33 +146,33 @@ export default {
         customerName: null,
         exchangeNum: null,
         exchangeTime: null,
-        status: null
+        status: null,
       },
       // 表单参数
       form: {},
-      // 表单校验
-      rules: {
-      }
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    statusFormat(row, column){
-      if(row.status === '1'){
-        return '已兑换'
-      }else if(row.status === '2'){
-        return '兑换中'
+    statusFormat(row, column) {
+      if (row.status === "1") {
+        return "已兑换";
+      } else if (row.status === "2") {
+        return "兑换中";
       }
     },
     /** 查询积分消费订单列表 */
     getList() {
-      this.queryParams.stationId= this.$store.selectDeptId;
-      if(this.queryParams.stationId==null || this.queryParams.stationId==""){
-        this.queryParams.stationId =this.$store.state.user.deptId;
+      this.queryParams.stationId = this.$store.selectDeptId;
+      if (
+        this.queryParams.stationId == null ||
+        this.queryParams.stationId == ""
+      ) {
+        this.queryParams.stationId = this.$store.state.user.deptId;
       }
-      listOrder(this.queryParams).then(response => {
+      listOrder(this.queryParams).then((response) => {
         this.orderList = response.rows;
         this.total = response.total;
       });
@@ -145,7 +193,7 @@ export default {
         customerName: null,
         exchangeNum: null,
         exchangeTime: null,
-        status: "0"
+        status: "0",
       };
       this.resetForm("form");
     },
@@ -158,7 +206,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
-    }
-  }
+    }  
+  },
 };
 </script>

src/views/point/Point_Rule.vue

@@ -65,9 +65,9 @@
                   v-for="ele in item.gradeList || []"
                   :key="ele.id"
                   :label="ele.grade"
-                  :value="ele.id"
+                  :value="ele.id.toString()"
                 ></el-option>
-                <el-option key="0" label="所有人" :value="0"></el-option>
+                <el-option key="0" label="所有人" value="0"></el-option>
               </el-select>
             </div>
             <div>
@@ -122,13 +122,14 @@
               style="width: 200px; margin-left: 10px"
               v-model="form.integralEmptyTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
           </div>
         </el-form-item>
 
         <el-form-item
-          label="积分活动时限"
+          label="积分规则时限"
           prop="termDateManage"
           :required="form.integralFlag == 1"
         >
@@ -142,8 +143,8 @@
               size="small"
               style="width: 200px; margin-left: 10px"
               v-model="form.emptyDate"
-              type="date"
-              value-format="yyyy-MM-dd"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
           </div>
@@ -303,8 +304,9 @@ export default {
           return;
         }
         if (ele.oilType != 3) {
-          if (!ele.ruleType || ele.grade == undefined || ele.grade == "") {
+          if (!ele.ruleType || ele.grade === undefined || ele.grade === "") {
             console.log("2");
+            console.log('grade',ele.grade)
             callback(new Error("请检查规则完整性"));
             return;
           }
@@ -339,11 +341,13 @@ export default {
       callback();
     }
     let validateDatePicker =(rule, value, callback)=>{
+      if(this.form.integralActivity==0){
+        callback()
+      }
       if(!this.form.datePicker){
         callback(new Error("请选择多倍积分的周期类型"));
         return;
       }
-      console.log('列表',this.form.collectClickCalendar,this.form.datePicker)
       if(this.form.datePicker == 1 || this.form.datePicker == 2){
         if(this.form.collectClickCalendar.length<= 0){
           callback(new Error("请选择多倍积分的时间"));
@@ -368,7 +372,7 @@ export default {
         itemsDetail: [{}],
         imgFileList: [],
         collectClickCalendar: [], // 收集固定日期选择的日子
-        collectClickDay: "",
+        collectClickDay: [],
       },
       rules: {
         integralFlag: [
@@ -444,13 +448,18 @@ export default {
       if (!this.form.itemsDetail || this.form.itemsDetail.length == 0) {
         this.form.itemsDetail = [{}];
       }
-      if (this.form.datepicker == "1" || this.form.datepicker == "2") {
-        this.collectClickCalendar = this.form.datePickerTime
+      if (this.form.datePicker == "1" || this.form.datePicker == "2") {
+        this.form.collectClickCalendar = this.form.datePickerTime
           .split(",")
           .map(parseFloat);
       } else {
-        console.log(this.form.datePickerTime);
-        this.form.collectClickDay = "";
+        if(this.form.datePickerTime.length == 0){
+          this.form.collectClickDay = []
+        }else{
+          this.form.collectClickDay = this.form.datePickerTime
+          .split(",");
+        }
+        
       }
       this.form = { ...this.form };
     });
@@ -548,12 +557,12 @@ export default {
           if (this.form.datePicker == "1" || this.form.datePicker == "2") {
             this.form.datePickerTime = this.form.collectClickCalendar.toString();
           } else {
-            this.form.datePickerTime = this.form.collectClickDay;
+            this.form.datePickerTime = this.form.collectClickDay.toString();
           }
 
           if (this.form.id != null) {
             updateRule(this.form).then((response) => {
-              this.msgSuccess("修改成功");
+              this.msgSuccess("更新成功");
             });
           } else {
             this.form.datePickerTime = "";

src/views/point/Point_RuleList.vue

@@ -1,54 +1,80 @@
 <template>
   <div class="app-container">
-     <el-form :model="queryParams" ref="queryForm" :inline="true"  label-width="68px">
-      <el-form-item style="float:right">
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">刷新</el-button>
+
+
+
+    <el-form
+      :model="sumForm"
+    >
+      <el-form-item 
+        label="开始积分功能"
+      >
+      {{sumForm.integralFlag  == 0 ? '未关闭':'已开启'}}
+      </el-form-item>
+      <el-form-item 
+        label="积分清空的日期"
+        v-if="sumForm.integralTermSetting==2"
+      >
+        {{ sumForm.integralFlag  == 0 ? '积分永久有效':sumForm.integralEmptyTime }}
+      </el-form-item>
+      <el-form-item 
+        label="所有积分规则的失效时间"
+        v-if="sumForm.termDateManage==2"
+      >
+        {{ sumForm.termDateManage  == 0 ? '积分规则永久有效':sumForm.emptyDate}}
+      </el-form-item>
+      <el-form-item 
+        label="多倍积分活动的状态"
+      >
+        {{ sumForm.integralActivity  == 0 ? '未开启' : integralActivityDatePicker}}
+      </el-form-item>
+    </el-form>
+
+
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item style="float: right">
+        <el-button
+          type="cyan"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >刷新</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table :data="ruleList">
-      <el-table-column label="油站id" align="center" prop="stationId" v-if="false"/>
-      <el-table-column label="规则" align="center" >
+      <af-table-column
+        label="油站id"
+        align="center"
+        prop="stationId"
+        v-if="false"
+      />
+      <af-table-column
+        label="油品"
+        align="center"
+        prop="oilName"
+      />
+      <af-table-column
+        label="会员等级"
+        align="center"
+        >
           <template slot-scope="scope">
-            <div v-show="scope.row.oilType==1">
-              <span v-show="scope.row.ruleType==3">以加油升数累计</span>
-                <span v-show="scope.row.ruleType==1">以订单实付金额累计</span>
-                  <span v-show="scope.row.ruleType==2">以订单应付金额累计</span>
-              <span>满{{scope.row.ruleTerms}}</span>
-              <span v-show="scope.row.ruleType==3">L起累计</span>
-              <span v-show="scope.row.ruleType!=3">元起累计</span>
-              <span>{{ scope.row.oilName}}油</span>
-              <span v-show="scope.row.gread=='所有人'">{{ scope.row.gread}}每消费</span>
-              <span v-show="scope.row.gread!='所有人'">{{ scope.row.gread}}会员每消费</span>
-              <span>{{ scope.row.saleAmt}}</span>
-              <span v-show="scope.row.ruleType==3">L</span>
-               <span v-show="scope.row.ruleType!=3">元</span>
-              <span>{{scope.row.integral}}积分</span>
-            </div>
-            <div v-show="scope.row.oilType==2">
-              <span>非油品满{{scope.row.ruleTerms}}元起累计每消费</span>
-              <span>{{ scope.row.saleAmt}}元兑换{{scope.row.integral}}积分</span>
-            </div>
-          </template>
-      </el-table-column>
-      <el-table-column label="积分规则是否开启" align="center" prop="integralFlag" width="100px;">
-         <template slot-scope="scope2">
-            <span v-show="scope2.row.integralFlag==1">开启</span>
-            <span v-show="scope2.row.integralFlag==2">关闭</span>
-         </template>  
-      </el-table-column>
-      <el-table-column label="油站名称" align="center" prop="stationName" width="100px;" />
-      <el-table-column label="积分活动时限" align="center" prop="termDateManage" :formatter="termDateManageFormat" width="120px;"/>    
-      <el-table-column label="多倍积分活动" align="center" prop="integralActivity"  :formatter="integralActivityFormat" width="100px;"/>
-      <el-table-column label="周期类型" align="center" prop="datePicker" :formatter="datePickerFormat" width="100px;"/>
-      <el-table-column label="积分比例" align="center" prop="integralProportion" width="100px;">
-            <template slot-scope="scope1">
-               <span>{{ scope1.row.integralProportion}}</span>
-               <span v-show="scope1.row.integralProportion!=''">倍</span>
-            </template>
-      </el-table-column>
+          <span>{{scope.row.gradeName === null ? '所有人' : scope.row.gradeName}}</span>
+        </template>
+      </af-table-column>
+      <af-table-column label="规则" align="center">
+        <template slot-scope="scope">
+          <span>{{(!scope.row.ruleType? '' : ruleTypeFormat[scope.row.ruleType]+"---") + '满' + scope.row.ruleTerms + (!scope.row.ruleType? '元开始积分' : ruleTermsFormat[scope.row.ruleType]+"---") + '---每消费' + scope.row.saleAmt + '元获得' + scope.row.integral + '积分'}}</span>
+        </template>
+      </af-table-column>
     </el-table>
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -58,86 +84,186 @@
 </template>
 
 <script>
-import {listRuleInfo} from "@/api/integral/rule";
+import { listRuleInfo, listRuleOne } from "@/api/integral/rule";
 export default {
-  name: "Rule",
+  name: "RuleList",
   data() {
     return {
       // 弹出层标题
       title: "",
-      total:0,
+      total: 0,
       // 是否显示弹出层
       open: false,
-      ruleList:[],
+      ruleList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
       },
-      queryInfo:{},
+      queryInfo: {},
       // 表单参数
       form: {
         itemsDetail: [{}],
         notOilList: [{}],
-        imgFileList:[]
+        imgFileList: [],
       },
       // 表单校验
-      rules: {}
+      rules: {},
+      ruleTypeFormat:[,'以订单实付累计','以订单应付累计','以加油升数累计'],
+      ruleTermsFormat:[,'元开始积分','元开始积分','L开始积分'], 
+      datePickerFormat:['','每周指定日','每月指定日','固定活动日'],
+      sumForm:{},
+      
+      timeSelect: [
+        ,
+        ["周天", "周一", "周二", "周三", "周四", "周五", "周六"],
+        [
+          "1号",
+          "2号",
+          "3号",
+          "4号",
+          "5号",
+          "6号",
+          "7号",
+          "8号",
+          "9号",
+          "10号",
+          "11号",
+          "12号",
+          "13号",
+          "14号",
+          "15号",
+          "16号",
+          "17号",
+          "18号",
+          "19号",
+          "20号",
+          "21号",
+          "22号",
+          "23号",
+          "24号",
+          "25号",
+          "26号",
+          "27号",
+          "28号",
+          "29号",
+          "30号",
+          "31号",
+        ],
+      ]
     };
   },
+  computed: {
+    integralActivityDatePicker(){
+      if(!this.sumForm.datePickerTime){
+        return ''
+      }
+      if(this.sumForm.integralActivity == 0){
+        return ''
+      }
+
+      let timeString = ''
+      const datePicker = this.sumForm.datePicker 
+      console.log('time',this.sumForm.datePickerTime);
+
+      if(datePicker == 1){
+        timeString += "每周的"
+      }
+      if(datePicker == 2){
+        timeString += "每月的"
+      }
+      if(datePicker == 3){
+        timeString += "指定的日期 "
+      }
+      if(datePicker == 1 || datePicker == 2){
+        this.sumForm.datePickerTime.forEach((ele)=>{
+          timeString += this.timeSelect[datePicker][ele] + '、'
+        })
+      }else if(datePicker == 3){
+        console.log(this.sumForm.datePickerTime);
+        timeString += this.sumForm.datePickerTime.toString()
+      }
+
+      timeString = timeString.replace(/(、)$/g,'') + " 启动双倍积分"
+      return timeString
+    },
+  
+  
+  },
   created() {
+    // 5.20
+    listRuleOne({
+      pageNum: 1,
+      pageSize: 100,
+    }).then((response) => {
+      this.sumForm = response.data;
+      if (this.sumForm.datePicker == "1" || this.sumForm.datePicker == "2") {
+        if(this.sumForm.datePickerTime.indexOf(',') == -1) {
+          const temp = [parseFloat(this.sumForm.datePickerTime)]
+          this.sumForm.datePickerTime = temp
+          return;
+        }
+        this.sumForm.datePickerTime = this.sumForm.datePickerTime
+          .split(",")
+          .map(parseFloat).sort((a,b)=>{return a-b});
+      } else if (this.sumForm.datePicker == '3'){
+        this.sumForm.datePickerTime = this.sumForm.datePickerTime
+          .split(",");
+      }
+    });
+
     this.getList();
-    this.getDicts("term_date").then(response => {
+    this.getDicts("term_date").then((response) => {
       this.termDateManageOptions = response.data;
     });
-    this.getDicts("expiration").then(response => {
+    this.getDicts("expiration").then((response) => {
       this.expirationOptions = response.data;
     });
-    this.getDicts("integral_deduction_oil").then(response => {
+    this.getDicts("integral_deduction_oil").then((response) => {
       this.integralDeductionOilOptions = response.data;
     });
-    this.getDicts("integral_manage").then(response => {
+    this.getDicts("integral_manage").then((response) => {
       this.integralActivityOptions = response.data;
     });
-        
   },
   methods: {
     /** 查询列表 */
     getList() {
       //积分规则信息
-      listRuleInfo(this.queryParams).then(response => {
+      listRuleInfo(this.queryParams).then((response) => {
+        console.log('getList',response)
         this.ruleList = response.rows;
         this.total = response.total;
       });
     },
-    termDateManageFormat(row, column){
-      if(row.termDateManage === '1'){
-        return '不指定结束时间'
-      }else if(row.termDateManage === '2'){
-        return '指定结束时间'
-      }
-    },
-    integralActivityFormat(row, column){
-      if(row.integralActivity === '1'){
-        return '开启'
-      }else if(row.integralActivity === '0'){
-        return '关闭'
-      }
-    },
-    datePickerFormat(row, column){
-      if(row.datePicker === '1'){
-        return '每周指定日'
-      }else if(row.datePicker === '2'){
-        return '每月指定日'
-      }else if(row.datePicker === '3'){
-        return '固定活动日'
+    // termDateManageFormat(row, column) {
+    //   if (row.termDateManage === "1") {
+    //     return "永久";
+    //   } else if (row.termDateManage === "2") {
+    //     return "指定结束时间";
+    //   }
+    // },
+    integralActivityFormat(row, column) {
+      if (row.integralActivity === "1") {
+        return "开启";
+      } else if (row.integralActivity === "0") {
+        return "关闭";
       }
     },
+    // datePickerFormat(row, column) {
+    //   if (row.datePicker === "1") {
+    //     return "每周指定日";
+    //   } else if (row.datePicker === "2") {
+    //     return "每月指定日";
+    //   } else if (row.datePicker === "3") {
+    //     return "固定活动日";
+    //   }
+    // },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-  }
+  },
 };
 </script>