jufubao-admin-library 1.1.152 → 1.1.154

package/library/viewModules/viewsCycle/viewsCycle/create.vue

@@ -267,6 +267,28 @@ export default {
                 let flag = true,
                   index = null,
                   message = "";
+                let arr = value.map(item=>{
+                  return JSON.stringify([Number(item.start_number),Number(item.end_number)])
+                });
+                let cloArr = [];
+                value.map(item=>{
+                  if(Number(item.start_number)===Number(item.end_number)){
+                    cloArr.push(Number(item.start_number))
+                  }else{
+                    cloArr.push(Number(item.start_number));
+                    cloArr.push(Number(item.end_number))
+                  }
+                })
+                let arrSet = new Set(arr);
+                if (arr.length !== arrSet.size) {
+                  callback("卡号组不能重复");
+                  return;
+                }
+                let cloArrSet = new Set(cloArr);
+                if (cloArr.length !== cloArrSet.size) {
+                  callback("卡号组不能重复");
+                  return;
+                }
                 value.map((item, idx) => {
                   if (index === null) {
                     //检查卡号填写为空
@@ -280,23 +302,16 @@ export default {
 
                     //检查开始卡号不能大于等于结束卡号
                     if (index === null) {
-                      if (item["start_number"] >= item["end_number"]) {
+                      if (item["start_number"] > item["end_number"]) {
                         index = idx;
                         flag = false;
-                        message = "输入开始卡号不能大于等于结束卡号";
+                        message = "输入开始卡号不能大于结束卡号";
                       }
                     }
                   }
                 });
-
                 if (flag) callback();
                 else callback(`第【${index + 1}】条数据有误，错误：${message}`);
-
-                // let temp = false;
-                // if (!value['week_day'] || value['week_day'].length === 0) temp = true;
-                // if (!value['week_start'] || !value['week_end']) temp = true;
-                // if (temp) callback('请设置规则')
-                // else callback();
               },
               trigger: ["blur", "change"],
             },

package/library/viewModules/viewsFinance/schemas/wallet.js

@@ -125,5 +125,28 @@ module.exports = {
       disabled: true,
       "role": "FINANCE-PARTNER.WALLET_GET_CHANNEL_AMOUNT"
     },
+    {
+      title: "余额通知频次获取详情",
+      mapFn: "notifyConfigGet",
+      path: '/finance-partner/v1/wallet/notify-config/get',
+      isRule: false,
+      params: {
+      
+      },
+      disabled: true,
+      "role": ""
+    },
+    {
+      title: "余额通知频次设置",
+      mapFn: "notifyConfigSet",
+      path: '/finance-partner/v1/wallet/notify-config/set',
+      isRule: false,
+      data: {
+        config_result:["config_result", "object", "必填"],
+      },
+      disabled: true,
+      "role": "FINANCE-PARTNER.WALLET_GET_TIME_SET"
+    },
+    
   ]
 }

package/library/viewModules/viewsFinance/viewsFinance/index.vue

@@ -12,6 +12,12 @@
       </xd-search>
     </el-card> -->
     <el-card class="app-container__list">
+      <div class="app-container__list-pagination">
+        <div></div>
+        <div class="app-container__list-custom">
+          <el-button type="primary" size="small" @click="handleSet" v-if="isSet">余额通知频次设置</el-button>
+        </div>
+      </div>
       <div class="app-container__list-table">
         <xd-table
           :headers="headers"
@@ -30,6 +36,65 @@
         ></xd-pagination>
       </div>
     </el-card>
+    <xd-dialog
+      v-if="showDialog"
+      title=""
+      :show.sync="showDialog"
+      width="500px"
+    >
+      <xd-base-dynamic-field
+        :key="randomKey"
+        v-if="setFormList !== null"
+        ref="setForm"
+        v-model="setFormParams"
+        :list="setFormList"
+        size="medium"
+        @success="handleSuccess"
+        @onApiSuccessUrl="handleApiSuccessUrl"
+        @onGetParamsAndHeader="handlePrivateGetParamsAndHeader"
+      >
+      <template slot="set" slot-scope="scope">
+        <el-form
+          :label-width="scope.width"
+          :model="customForm"
+          :rules="customRules"
+          ref="customForm"
+          @submit.native.prevent
+        >
+          <el-form-item prop="frequency_type" label="通知频次:" required>
+            <el-select v-model="customForm.frequency_type" placeholder="请选择" style="margin-bottom: 5px;">
+              <el-option
+                v-for="item in optionsData['frequency_type_list']"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select multiple v-if="customForm.frequency_type&&customForm.frequency_type==='week'" v-model="customForm.frequency_val" style="margin-bottom: 5px;" placeholder="请选择">
+              <el-option
+                v-for="item in weekData"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select multiple v-model="customForm.frequency_time_val" style="margin-bottom: 5px;" placeholder="请选择">
+              <el-option
+                v-for="item in frequencyTimeData"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </template>
+    </xd-base-dynamic-field>
+      <div slot="btn">
+        <el-button type="default" @click="showDialog=false">取消</el-button>
+        <el-button type="primary" @click="handleConfirm">确定</el-button>
+      </div>
+    </xd-dialog>
   </div>
 </template>
 
@@ -42,14 +107,19 @@ import { mapActions } from "vuex"
 import { getOptions } from "@/utils/options"
 import { baseJsDateToTime } from "@/utils/xd.base.js"
 import checkPermission from "@/utils/permission"
+import permissions from "@/constant/permissions"
 import roleTRecord from "@/constant/modules/tradeRecord.js"
+import XdDialog from "@/components/XdDialog";
+import XdBaseDynamicField from "@/components/XdBaseDynamicField"
 
 export default {
   name: "PageFinanceIndex",
   components: {
     XdPagination, //翻译插件
     XdSearch, //搜查插件
-    XdTable
+    XdTable,
+    XdDialog,
+    XdBaseDynamicField,
   },
   data() {
     return {
@@ -65,9 +135,69 @@ export default {
 
       //列表对象
       tables: [],
+      //设置参数
+      showDialog:false,
+      randomKey:'randomKey',
+      setFormList:[],
+      setFormParams:null,
+
+      optionsData:[],
+      frequencyTimeData:[
+        {label:'00:00',value:'00:00'},{label:'01:00',value:'01:00'},{label:'02:00',value:'02:00'},{label:'03:00',value:'03:00'},{label:'04:00',value:'04:00'},{label:'05:00',value:'05:00'},{label:'06:00',value:'06:00'},{label:'07:00',value:'07:00'},{label:'08:00',value:'08:00'},
+        {label:'09:00',value:'09:00'},{label:'10:00',value:'10:00'},{label:'11:00',value:'11:00'},{label:'12:00',value:'12:00'},{label:'13:00',value:'13:00'},{label:'14:00',value:'14:00'},{label:'15:00',value:'15:00'},{label:'16:00',value:'16:00'},
+        {label:'17:00',value:'17:00'},{label:'18:00',value:'18:00'},{label:'19:00',value:'19:00'},{label:'20:00',value:'20:00'},{label:'21:00',value:'21:00'},{label:'22:00',value:'22:00'},{label:'23:00',value:'23:00'}
+      ],
+      customForm:{
+        frequency_type:'',
+        frequency_val:[],
+        frequency_time_val:[],
+      },
+      customRules:{},
+      weekData:[],
     }
   },
+  watch:{
+    showDialog:{
+      handler(n,o){
+        if(!n){
+          this.customForm = {
+            frequency_type:'',
+            frequency_val:[],
+            frequency_time_val:[],
+          }
+          this.setFormParams = null;
+        }
+      }
+    },
+    'setFormParams.notify_mode':{
+      handler(n,o){
+        console.log(n,o,'pppp')
+        if(n&&n!==o){
+          this.initFormList(this.setFormParams);
+        }
+      },
+      deep:true,
+      immediate:true,
+    },
+    'customForm.frequency_val':{
+      handler(n,o){
+        if(n&&JSON.stringify(n)!==JSON.stringify(o)){
+          this.customForm.frequency_val.sort()
+        }
+      }
+    },
+    'customForm.frequency_time_val':{
+      handler(n,o){
+        if(n&&JSON.stringify(n)!==JSON.stringify(o)){
+          this.customForm.frequency_time_val.sort()
+        }
+      }
+    },
+  },
   computed: {
+    isSet(){
+      return checkPermission([permissions.wallet.notifyConfigSet])
+    },
     headers(){
       return [
         { "type": "normal", "prop": "partner_id", "align": "center", "label": "ID" },
@@ -85,10 +215,18 @@ export default {
   },
   created() {
     // this.initSearchForm();
+    getOptions({
+      server: 'finance-partner',
+      fn: 'wallet/notify-config',
+      path: 'p1',
+    }).then(res => {
+      this.optionsData = res.data;
+      this.weekData = res.data['frequency_val_week_list'];
+    })
     this.getList();
   },
   methods: {
-    ...mapActions("wallet", ["listHomeWallet"]),
+    ...mapActions("wallet", ["listHomeWallet","notifyConfigGet","notifyConfigSet"]),
     //相除
     divide(price) {
       return this.$xdHelper.divisionFloatNumber(price, 100);
@@ -181,6 +319,111 @@ export default {
       this.page_token = page;
       this.getList();
     }, //todo
+    initFormList(params){
+      console.log("params", params);
+      let formList = [
+        {
+          label: '通知设置:', //label
+          ele: 'xd-radio', //package 名称
+          valueKey: 'notify_mode', //form[valueKey]
+          value: params.notify_mode || 'default', //v-model
+          list: this.optionsData['notify_mode_list'],
+          rules: [
+            { required: true, message: `请选择通知设置`, trigger: 'change' },
+          ]
+        },
+        params.notify_mode==='default'&&{
+          label: '通知频次:',
+          ele:'el-html',
+          value:this.optionsData['default_time_tip'] 
+        },
+        params.notify_mode==='custom'&&{
+          label: '通知频次:',
+          ele:'slot',
+          slot:'set'
+        },
+      ].filter(i=>i)
+      this.setFormList = formList;
+      this.randomKey = Date.now();
+    },
+    handleSet(){
+      this.notifyConfigGet({})
+      .then(res=>{
+        if(res.data.config_result.frequency_val){
+          res.data.config_result.frequency_val = JSON.parse(res.data.config_result.frequency_val);
+        }
+        if(res.data.config_result.frequency_time_val){
+          res.data.config_result.frequency_time_val = JSON.parse(res.data.config_result.frequency_time_val);
+        }
+        this.customForm = {
+          frequency_type:res.data.config_result['frequency_type']||'',
+          frequency_val:res.data.config_result['frequency_val']||[],
+          frequency_time_val:res.data.config_result['frequency_time_val']||[],
+        };
+        let params = {
+          ...res.data.config_result,
+        }
+        this.initFormList(params);
+        this.showDialog = true;
+      })
+      
+    },
+    handleConfirm(){
+      this.$refs.setForm.submit().then(() => {
+        console.log(this.setFormParams,'ppp');
+       if(this.setFormParams.notify_mode==='custom'){
+        if(!this.customForm.frequency_type){
+          this.$message({
+            type: 'error',
+            message: '通知频次不能为空',
+          });
+          return;
+        }
+        if(this.customForm.frequency_type==='day'){
+          if(!this.customForm.frequency_type||this.customForm.frequency_time_val.length===0){
+            this.$message({
+              type: 'error',
+              message: '请填写完整通知频次信息'
+            });
+            return;
+          }
+        }else if(this.customForm.frequency_type==='week'){
+          if(!this.customForm.frequency_type||this.customForm.frequency_val.length===0||this.customForm.frequency_time_val.length===0){
+            this.$message({
+              type: 'error',
+              message: '请填写完整通知频次信息'
+            });
+            return;
+          }
+        }
+       }
+        let copySetFormParams = this.$xdHelper.cloneDeep(this.setFormParams);
+        let copyCustomForm = this.$xdHelper.cloneDeep(this.customForm);
+        if(copySetFormParams.notify_mode==='default'){
+          delete copyCustomForm['frequency_type'];
+          delete copyCustomForm['frequency_val'];
+          delete copyCustomForm['frequency_time_val'];
+        }
+        if(copyCustomForm.frequency_type==='day'){
+          copyCustomForm.frequency_val = []
+        }
+        if(copyCustomForm.frequency_time_val){
+          copyCustomForm.frequency_time_val = JSON.stringify(this.customForm.frequency_time_val);
+        }
+        if(copyCustomForm.frequency_val){
+          copyCustomForm.frequency_val = JSON.stringify(this.customForm.frequency_val);
+        }
+        console.log('copySetFormParams',this.customForm, copySetFormParams)
+        this.notifyConfigSet({config_result:{...copySetFormParams,...copyCustomForm}}).then(res => {
+          this.$message({
+            type: 'success',
+            message: '设置成功'
+          });
+          this.showDialog = false;
+        }).catch(res => {});
+      }).catch(err => {});
+      
+    },
   }
 }
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.152",
+  "version": "1.1.154",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {