jufubao-admin-library 1.1.94 → 1.1.96

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -10,8 +10,8 @@
       width="460px"
       @onConfirm="handleMarketTag"
     >
-      <div style="display: flex">
-        <span style="margin-right: 20px">选择标签</span>
+      <div style="display: flex; justify-content: flex-start; align-items: flex-start">
+        <span style="margin-right: 20px;flex-shrink: 0">选择标签:</span>
         <el-checkbox-group v-model="dialogRow.market_tags_value">
           <el-checkbox
             v-for="tag in marketTagList"

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -952,6 +952,24 @@ export default {
             { required: true, message: '请输入数值', trigger: 'blur' },
           ],
         },
+        {
+          label: '小数点保留位数:',
+          ele: 'xd-select-list',
+          valueKey: 'price_bit',
+          value: params.price_bit || 2,
+          placeholder: '请选择小数点保留位数',
+          multiple: false,
+          list: [
+            { "label": "零位", "value": -1 },
+            { "label": "一位", "value": 1 },
+            { "label": "两位", "value": 2 },
+          ],
+          rules: [{
+            required: true,
+            message: '请选择小数点保留位数',
+            trigger: 'blur'
+          }],
+        },
       ].filter(i => i)
     },
 
@@ -1145,6 +1163,7 @@ export default {
           }
         }
       }
+
       postData.conditions = this.$xdHelper.deleteParamEmptyKey(postData.conditions)
       if (this.channelParams.namespace) {
         postData['namespace'] = this.channelParams.namespace

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

@@ -111,6 +111,19 @@ module.exports = {
       },
       disabled: true,
       "role": "FINANCE-PARTNER.WALLET_LIST_OPENAPI_WALLET"
-    }
+    },
+    {
+      title: "渠道余额通知",
+      mapFn: "channelAmountNotice",
+      path: "/finance-partner/v1/wallet/update-wallet-threshold-amount",
+      isRule: false,
+      data: {
+        owner_id: ["供货商ID", "string", "必填"],
+        wallet_type: ["钱包类型", "string", "必填"],
+        remind_threshold_amount: ["提醒阈值", "string", "必填"],
+      },
+      disabled: true,
+      "role": "FINANCE-PARTNER.WALLET_GET_CHANNEL_AMOUNT"
+    },
   ]
 }

package/library/viewModules/viewsFinance/viewsFinance/balance/components/listChannel.vue

@@ -38,6 +38,23 @@
         ></xd-pagination>
       </div>
     </el-card>
+    <XdDialog
+      v-if="showNoticeSetting"
+      @onConfirm="handleNoticeSetting"
+      title=""
+      :show.sync="showNoticeSetting"
+    >
+      <div class="flex-start">
+        <span>低于 </span>
+        <XdInputUnit
+          v-model="remind_threshold_amount"
+          :default-value="remind_threshold_amount"
+          :setting="{ unit: '元', pos: 'append' }"
+        ></XdInputUnit>
+        <span> 触发预警报警</span>
+      </div>
+      <div class="flex-start notice">需在加盟商后台通知管理设置后才能接收到</div>
+    </XdDialog>
   </div>
 </template>
 
@@ -45,6 +62,8 @@
 <script>
 import XdSearch from "@/components/XdSearch";
 import XdPagination from "@/components/XdPagination.vue";
+import XdInputUnit from "@/components/formItem/XdInputUnit";
+import XdDialog from '@//components/XdDialog.vue'
 import XdTable from "@/components/XdTable";
 import { mapActions } from "vuex"
 import { getOptions } from "@/utils/options"
@@ -58,7 +77,9 @@ export default {
   components: {
     XdPagination, //翻译插件
     XdSearch, //搜查插件
-    XdTable
+    XdTable,
+    XdDialog,
+    XdInputUnit
   },
   data() {
     return {
@@ -74,6 +95,10 @@ export default {
 
       //列表对象
       tables: [],
+      showNoticeSetting: false,
+      remind_threshold_amount: "",
+      wallet_type: '',
+      owner_id: ''
     }
   },
   computed: {
@@ -88,6 +113,7 @@ export default {
           "type": "operate", "align": "center", "label": "操作",
           "values": [
             { "ui": "text-button", "name": "对账", "type": "text", "event": "detail" },
+            { "ui": "text-button", "name": "余额通知", "type": "text", "event": "notice" },
           ]
         }
       ].filter(i=>i)
@@ -97,7 +123,7 @@ export default {
     this.initSearchForm();
   },
   methods: {
-    ...mapActions("wallet", ["listChannelWallet", "getChannelAmount"]),
+    ...mapActions("wallet", ["listChannelWallet", "getChannelAmount",'channelAmountNotice']),
     //相除
     divide(price) {
       return this.$xdHelper.divisionFloatNumber(price, 100);
@@ -145,6 +171,20 @@ export default {
       })
     },
 
+    handleNoticeSetting() {
+      this.channelAmountNotice({
+        owner_id: this.owner_id+'',
+        wallet_type: this.wallet_type,
+        remind_threshold_amount: this.remind_threshold_amount*100+''
+      }).then(res=>{
+        this.$message.success("设置成功")
+        this.getList()
+        this.showNoticeSetting=false
+      }).catch(err=>{
+
+      })
+    },
+
     handleTableClick({value, row}){
       if(value.event === "detail"){
         if(!row.wallet_type) return this.$message.error("该渠道没有钱包");
@@ -156,6 +196,11 @@ export default {
             wallet_nnid: row.wallet_nnid,
           }
         })
+      }else if(value.event === "notice") {
+        this.wallet_type = row.wallet_type;
+        this.owner_id = row.supplier_id;
+        this.remind_threshold_amount = row.remind_threshold_amount/100;
+        this.showNoticeSetting=true
       }
     },
     getRemain(row){
@@ -216,5 +261,15 @@ export default {
     align-items: center;
     justify-content: center;
   }
+  .flex-start{
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+  }
+  .notice {
+    font-size: 12px;
+    color: #999;
+    margin-top: 10px;
+  }
 </style>
 

package/package.json

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