jufubao-admin-library 1.1.231 → 1.1.232

package/library/viewModules/viewsFinance/schemas/trade.record.js

@@ -16,6 +16,7 @@ module.exports = {
         trade_type: ["交易类型", "string", "必填"],
         main_order_id: ["主订单ID", "string", "非必填"],
         business_code: ["业务编码", "string", "非必填"],
+        site_id: ["站点ID", "string", "非必填"],
         supplier_name: ["供应商名称", "string", "非必填"],
         start_time: ["开始时间", "string", "非必填"],
         end_time: ["结束时间", "string", "非必填"],
@@ -78,6 +79,7 @@ module.exports = {
         trade_type: ["交易类型", "string", "必填"],
         main_order_id: ["主订单ID", "string", "非必填"],
         business_code: ["业务编码", "string", "非必填"],
+        site_id: ["站点ID", "string", "非必填"],
         supplier_name: ["供应商名称", "string", "非必填"],
         start_time: ["开始时间", "string", "非必填"],
         end_time: ["结束时间", "string", "非必填"],

package/library/viewModules/viewsFinance/viewsFinance/balance/detail_partner.vue

@@ -56,6 +56,28 @@
             </el-select>
           </div>
         </template>
+        <template slot="site_id">
+          <div>
+            <el-select v-model="site_id" filterable clearable placeholder="请选择站点">
+              <el-option
+                v-for="item in siteList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <el-select v-if="site_id" v-model="namespace" clearable placeholder="请选择业务线" :key="namespaceKey">
+              <el-option
+                v-for="item in namespaceList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </template>
       </xd-search>
     </el-card>
     <el-card class="app-container__list">
@@ -181,6 +203,9 @@
               </template>
             </div>
           </template>
+          <template slot="site_business_code_name" slot-scope="scope">
+            <span v-html="scope.row.site_business_code_name"></span>
+          </template>
           <template slot="amount" slot-scope="scope">
             <xd-table-price :price="scope.row.amount" :key="rePriceKey"></xd-table-price>
             <div v-if="isShowDeductDetail(scope.row)" style="display:flex; justify-content: center; align-items: center">
@@ -327,6 +352,13 @@ export default {
           label: "商品信息",
         },
         // { "type": "normal", "prop": "category_name", "align": "center", "minWidth": 200, "label": "公式" },
+        {
+          type: "normal",
+          prop: "site_business_code_name",
+          align: "center",
+          minWidth: 200,
+          label: "站点/业务线",
+        },
         {
           type: "price",
           prop: "amount",
@@ -401,6 +433,11 @@ export default {
       supplier_ids: null,
       supplierList: [],
       showSupplier: false,
+      siteList: [],
+      site_id: null,
+      namespaceList: [],
+      namespace: null,
+      namespaceKey: 'namespaceKey',
 
       //查看明细
       dialogTableVisible:false,
@@ -434,6 +471,24 @@ export default {
         this.showSupplier =  this.channelList.find(item => item.value === val).has_supplier==='Y';
       }
     },
+    site_id(n, o) {
+      if(n && n !== o) {
+        this.namespace = null;
+        this.namespaceList = [];
+        getOptions({
+          server: 'partner',
+          fn: 'business-line',
+          path: 'p1',
+          params: {
+            select_method: 'ALL-SITE',
+            site_id: n === '*' ? 0 : n
+          }
+        }).then(res => {
+          this.namespaceList = res.data.list
+          this.namespaceKey = Date.now()
+        })
+      }
+    },
   },
   created() {
     this.initSearchForm();
@@ -547,6 +602,12 @@ export default {
       if(other.rebate_from_partner_list&&other.rebate_from_partner_list.length){
         other.rebate_from_partner_id = other.rebate_from_partner_list[0]['value']
       }
+      if(this.site_id){
+        other.site_id = this.site_id
+      }
+      if(this.namespace){
+        other.business_code = this.namespace
+      }
       return {
         ...other,
         supplier_ids,
@@ -609,6 +670,9 @@ export default {
           loading.close();
           this.tables = res.data.list.map((item) => {
             item["created_time"] = baseJsDateToTime(item["created_time"]);
+            item["site_business_code_name"] = item["site_name"] && item["business_code_name"]
+              ? `${item["site_name"]}<br/>${item["business_code_name"]}`
+              : (item["site_name"] || item["business_code_name"] || '');
             item["product_list"] = item["product_list"].map((prod) => {
               prod["product_thumb"] = this.getImageFullPath(
                 prod["product_thumb"]
@@ -635,6 +699,8 @@ export default {
       if(action === "reset") {
         this.supplier_ids=null
         this.channel_code=null
+        this.site_id=null
+        this.namespace=null
       }
       this.page_token = 1;
       this.getList();
@@ -660,10 +726,16 @@ export default {
             params: {
               type: 'partner'
             }
+          },
+          {
+            server: 'idaas-partner',
+            fn: 'sites',
+            path: 'p1',
           }
         ]
       ).then(res=>{
           this.channelList = res[0].data.list;
+          this.siteList = res[2].data.list;
           this.searchForm = [
             {
               label: "加盟商",
@@ -672,6 +744,11 @@ export default {
               value: this.partner_name || this.partner_id,
               placeholder: "请输入名称",
             },
+            {
+              label: "业务线: ",
+              ele: "slot",
+              slot: "site_id",
+            },
             {
               label: "账户类型",
               ele: "xd-select-list",

package/package.json

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