jufubao-admin-library 1.1.185 → 1.1.187

package/library/viewModules/viewsThird/schemas/service.js

@@ -343,5 +343,15 @@ module.exports = {
     isPublic:true,
     params: {},
     disabled: true,
-  },],
+    },
+    {
+      title: '品牌选项卡',
+      mapFn: "getBrandOptions",
+      path: "/supplier-partner/v1/brand/like-options",
+      isRule: false,
+      isPublic: true,
+      params: {},
+      disabled: true,
+    },
+  ],
 }

package/library/viewModules/viewsThird/viewsThird/create.vue

@@ -56,7 +56,7 @@
         <!-- #ifdef partner -->
         <template slot="businessLines" slot-scope="scope">
           <el-form ref="businessForm" :model="form" :label-width="scope.width">
-            <el-form-item required label="业务线:">
+            <el-form-item label="业务线:">
               <el-select
                 style="margin-left: 10px"
                 v-model="form.business_codes"
@@ -231,6 +231,11 @@ export default {
           let params = res.data;
           this.form.site_id = params.site_id;
           this.form.business_codes = params.business_codes;
+          if (params.valid_data_option) {
+            let key = params['card_number_type']+'_valid_data'
+            params[key] = params.valid_data_option;
+            delete params.valid_data_option;
+          }
           params.fee_value = params.fee_value / 100;
           if (params.card_number_ranges) {
             params.card_number_ranges = JSON.parse(params.card_number_ranges);
@@ -252,6 +257,7 @@ export default {
       "getEditxSiteListm",
       "getServiceFeeRuleInfo",
       "editServiceFeeRule",
+      "getBrandOptions"
     ]),
     insertArrayAt(arr1, index, arr2) {
       return arr1.slice(0, index).concat(arr2, arr1.slice(index));
@@ -341,6 +347,10 @@ export default {
             { label: "全部号段", value: "ALL" },
             { label: "自定义号段", value: "CUSTOMIZE" },
             { label: "卡类型", value: "TYPE" },
+            // #ifdef partner
+            { label: "品牌", value: "BRAND" },
+            { label: "供货商", value: "SUPPLIER" },
+            // #endif
           ],
           rules: [
             {
@@ -441,6 +451,66 @@ export default {
             },
           ],
         },
+        // #ifdef partner
+        params.card_number_type == "BRAND" &&{
+          label: '',
+          ele: 'xd-remote-select',
+          valueKey: 'BRAND_valid_data',
+          //值必须为{value: '', label: ''}
+          value: params['BRAND_valid_data']||[],
+          mode:true, ///false => 老模式  true=>新模式
+          className: 'input40',
+          placeholder: '请选择品牌',
+          multiple: true, //是否为多选
+          collapseTags: false, //是否折叠显示
+          //搜索方法
+          remoteSearch: (query, resolve) => {
+            this.getBrandOptions({
+              page_token: '1',
+              page_size: '500',
+              keyword: query,
+            }).then(res => {
+              resolve(res.data.list)
+            })
+            .catch()
+          },
+          rules: [
+            {required: true, message: '请选择品牌', trigger: 'change'},
+          ]
+        },
+        params.card_number_type == "SUPPLIER" &&{
+          label: '',
+          ele: 'xd-remote-select',
+          valueKey: 'SUPPLIER_valid_data',
+          //值必须为{value: '', label: ''}
+          value: params['SUPPLIER_valid_data']||[],
+          mode:true, ///false => 老模式  true=>新模式
+          className: 'input40',
+          placeholder: '请选择供货商',
+          multiple: true, //是否为多选
+          collapseTags: false, //是否折叠显示
+          //搜索方法
+          remoteSearch: (query, resolve) => {
+            getOptions({
+              server: 'supplier-partner',
+              fn: 'supplier',
+              path: 'p1',
+              params: {
+                keyword: query,
+                page_token: 1,
+                page_size: 500,
+              }
+            })
+              .then(res => {
+                resolve(res.data.list)
+              })
+              .catch()
+          },
+          rules: [
+            {required: true, message: '请选择供货商', trigger: 'change'},
+          ]
+        },
+        // #endif
         {
           label: "", //label
           ele: "slot", //package 名称
@@ -610,10 +680,10 @@ export default {
       }
       // #endif
       // #ifdef partner
-      if (!this.form.business_codes || !this.form.business_codes.length) {
-        this.$message.error("请选择业务线");
-        return;
-      }
+      // if (!this.form.business_codes || !this.form.business_codes.length) {
+      //   this.$message.error("请选择业务线");
+      //   return;
+      // }
       // #endif
       this.$refs.form.submit().then((res) => {
         let loading = Loading.service({});
@@ -624,6 +694,16 @@ export default {
           channel_code: this.$channelCode,
           // #endif
         };
+        if (data.card_number_type === 'BRAND') {
+          data.valid_data = data['BRAND_valid_data'].map(item => { return item.value })
+          data.valid_data = JSON.stringify(data.valid_data)
+          delete data['BRAND_valid_data']
+        }
+        if (data.card_number_type === 'SUPPLIER') {
+          data.valid_data = data['SUPPLIER_valid_data'].map(item => { return item.value })
+          data.valid_data = JSON.stringify(data.valid_data)
+          delete data['SUPPLIER_valid_data']
+        }
         data.fee_value = this.formParams.fee_value * 100;
         data.card_number_ranges = JSON.stringify(
           this.formParams.card_number_ranges

package/library/viewModules/viewsThird/viewsThird/list.vue

@@ -964,6 +964,7 @@ export default {
     },
     handleAdd() {
       this.editId = "";
+      this.isEdit = true;
       console.log(this.searchParams.tabType, "tttt");
       // this.listValue = null;
       this.formKey = Date.now();

package/package.json

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