jufubao-admin-library 1.1.103 → 1.1.105

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -109,6 +109,7 @@ export default {
       },
       cookieKey: '',
       cityData:[],
+      marketTagsList:[],
     }
   },
   computed: {
@@ -162,6 +163,10 @@ export default {
     if (this.JfbParent.market_tag) this.JfbParent.market_tag = market_tag
     this.productTypeList = product_type
     this.channelStatus = true
+    let tagsOptions = await getOptions({
+      server: "product-public", fn: "product", path: "p1", params: { market_tag: 1 },
+    })
+    this.marketTagsList = tagsOptions.data.market_tag
     this.initSearchForm()
   },
   methods: {
@@ -368,6 +373,24 @@ export default {
           placeholder: "请选择品牌",
           multiple: false,
         },
+        this.channelParams&&this.channelParams.scene === 'selected'&&this.$setting.system!=='partner-gift'&&{
+          label: "营销标签:", //label
+          ele: "xd-select-list", //package 名称
+          valueKey: "market_tags", //form[valueKey]
+          value: [], //v-model
+          placeholder: "请选择",
+          multiple: true, //多选
+          list: this.marketTagsList,
+        },
+        this.pagesType === 'special'&&{
+          label: "状态:", //label
+          ele: "xd-select-list", //package 名称
+          valueKey: "site_product_status", //form[valueKey]
+          value: [], //v-model
+          placeholder: "请选择",
+          multiple: false, //多选
+          list: [{label:'已上架',value:'Y'},{label:'已下架',value:'N'}],
+        },
         (showSupplierIds && this.channelActiveName !== 'all') && {
           label: "按供应商:", //label
           ele: "xd-select-remote", //package 名称

package/library/pageComponents/modules/JfbProductSku.vue

@@ -23,6 +23,10 @@
 			<template slot="volume" slot-scope="inScope">
 				{{$xdHelper.divisionFloatNumber(inScope.row.volume, 100)}}m³
 			</template>
+      <template slot="purchase_price" slot-scope="inScope">
+        <div v-if="inScope.row.purchase_price!==-1">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_price, 100)}}</span>元</div>
+        <div v-if="inScope.row.dist_price!==-1">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_price, 100)}}</span>元</div>
+      </template>
       <template slot="jfb_price_ratio" slot-scope="inScope">
         <div v-if="inScope.row.purchase_div_jfb_discount_ratio">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_jfb_discount_ratio, 1000)}}</span>折</div>
         <div v-if="inScope.row.dist_div_jfb_discount_ratio">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_jfb_discount_ratio, 1000)}}</span>折</div>
@@ -166,7 +170,7 @@
     },
     created(){
       if(this.productSkuList && this.productSkuList.length && this.productSkuList.length > 0) {
-        this.isShowPurchasePrice = this.productSkuList[0].specs.purchase_price > 0;
+        this.isShowPurchasePrice = (this.productSkuList[0].specs.purchase_price > 0 || this.productSkuList[0].specs.dist_price > 0)?true:false;
         this.isShowJfbPriceRatio = (this.productSkuList[0].specs.purchase_div_jfb_discount_ratio || this.productSkuList[0].specs.dist_div_jfb_discount_ratio)?true:false;
         this.isShowMarketPriceRatio = (this.productSkuList[0].specs.purchase_div_market_discount_ratio || this.productSkuList[0].specs.dist_div_market_discount_ratio)?true:false;
       }

package/library/viewModules/viewStore/router/store_selection.js

@@ -78,7 +78,7 @@ const storeRouter = {
       meta: {
         title: '编辑选店规则',
         activeMenu: '/store/rule-list',
-        roles:[store_selection.selectShopRuleUpdate]
+        roles:[store_selection.selectShopRuleUpdate,store_selection.selectShopRuleGet]
       }
     },
     {

package/library/viewModules/viewStore/schemas/store_selection.js

@@ -30,6 +30,7 @@ module.exports = {
         rule_id: ['rule_id', 'String', '选填'],
       },
       disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_RULE_DETAIL',
     },
     {
       title: "创建选店规则",
@@ -464,6 +465,13 @@ module.exports = {
       disabled: true,
       role: '@@@@.@@@.SELECT_SHOP_GET_RELATED_SHOPS',
     },
+    {
+      title: "一键更新门店",
+      mapFn: "selectShopTaskListUpdate",
+      isRule: false,
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_TASK_LIST_UPDATE',
+    },
   ],
 }
 

package/library/viewModules/viewStore/viewStore/market/list.vue

@@ -555,14 +555,20 @@ export default {
     },
     handleCustom ({ action, data }) {
       if (action === 'btn') {
-        if ((data.btn.event==='choose'&&data.row.is_selected!=='can_selected')||!this.isChoose) {
-          return false
+        if (data.btn.event==='choose') {
+          if(data.row.is_selected!=='can_selected'||!this.isChoose){
+            return false
+          }
         }
-        if (data.btn.event==='choosed'&&data.row.is_selected==='can_selected') {
-          return false
+        if (data.btn.event==='choosed') {
+          if(data.row.is_selected==='can_selected'){
+             return false
+          }
         }
-        if (data.btn.event==='preview'&&!this.isPreview) {
-          return false
+        if (data.btn.event==='preview') {
+          if(!this.isPreview){
+            return false
+          }
         }
         return true
       }

package/library/viewModules/viewStore/viewStore/market/mc_list.vue

@@ -453,14 +453,20 @@ export default {
     },
     handleCustom ({ action, data }) {
       if (action === 'btn') {
-        if ((data.btn.event==='choose'&&data.row.is_selected!=='can_selected')||!this.isChoose) {
-          return false
+        if (data.btn.event==='choose') {
+          if(data.row.is_selected!=='can_selected'||!this.isChoose){
+            return false
+          }
         }
-        if (data.btn.event==='choosed'&&data.row.is_selected==='can_selected') {
-          return false
+        if (data.btn.event==='choosed') {
+          if(data.row.is_selected==='can_selected'){
+            return false
+          }
         }
-        if (data.btn.event==='preview'&&!this.isPreview) {
-          return false
+        if (data.btn.event==='preview') {
+          if(!this.isPreview){
+            return false
+          }
         }
         return true
       }

package/library/viewModules/viewStore/viewStore/rule/list.vue

@@ -18,7 +18,7 @@
             <div
               class="app-container__list-table-option"
             >
-            <el-button @click="handleTableClick('look',scope.row)" type="text">查看</el-button>
+            <el-button v-if="isDetail" @click="handleTableClick('look',scope.row)" type="text">查看</el-button>
             <el-button v-if="isUpdate&&scope.row.rule_type!=='SY'" @click="handleTableClick('edit',scope.row)" type="text">编辑</el-button>
             <el-button v-if="isDelete&&scope.row.rule_type!=='SY'" @click="handleTableClick('delete',scope.row)" type="text">删除</el-button>
             <el-button v-if="isLog" @click="handleTableClick('log',scope.row)" type="text">修改记录</el-button>
@@ -72,6 +72,9 @@ export default {
     }
   },
   computed:{
+    isDetail(){
+      return checkPermission([permissions.store_selection.selectShopRuleGet])
+    },
     isAdd () {
       return checkPermission([permissions.store_selection.selectShopRuleAdd])
     },

package/library/viewModules/viewStore/viewStore/selected/list.vue

@@ -296,6 +296,9 @@ export default {
     isOffConsume() {
       return checkPermission([permissions.store_selection.selectShopUpdateConsumeMode])
     },
+    isLookShops(){
+      return checkPermission([permissions.store_selection.selectShopGetRelatedShops])
+    },
     headers(){
       this.tableKey = Date.now()
       return [
@@ -778,15 +781,17 @@ export default {
           }
         }
         if (data.btn.event==='off') {
-          if(this.site_business_status==='N'||!this.isDown||(data.row.consume_mode.includes('SELF')||data.row.consume_mode.includes('STOD')||data.row.consume_mode.includes('CODE'))){
+          if(this.site_business_status==='N'||!this.isDown){
             return false
           }
         }
-        if (data.btn.event==='preview'&&!this.isPreview) {
-          return false
+        if (data.btn.event==='preview') {
+          if(!this.isPreview){
+            return false
+          }
         }
         if (data.btn.event==='delete') {
-          if(!this.isDelete||(data.row.consume_mode.includes('SELF')||data.row.consume_mode.includes('STOD')||data.row.consume_mode.includes('CODE'))){
+          if(!this.isDelete){
             return false
           }
         }
@@ -795,6 +800,11 @@ export default {
             return false
           }
         }
+        if (data.btn.event==='look_store') {
+          if(!this.isLookShops){
+            return false
+          }
+        }
         return true
       }
     },
@@ -808,6 +818,8 @@ export default {
         if (valid) {
           let params = {
             filters:this.getParams(),
+            tab:this.channelActive,
+            consume_mode:this.storeType,
             export: 1,
             file_ext: 'xlsx',
             file_name: this.exportFrom.name,

package/library/viewModules/viewStore/viewStore/task/list.vue

@@ -4,7 +4,7 @@
       <div class="app-container__list-pagination">
         <div></div>
         <div>
-          <el-button type="primary" @click="handleExecute">一键更新门店</el-button>
+          <el-button type="primary" @click="handleExecute" v-if="isBatchUpdate">一键更新门店</el-button>
           <el-button type="primary" @click="handleRefresh">刷新</el-button>
         </div>
       </div>
@@ -96,6 +96,9 @@ export default {
     isStop () {
       return checkPermission([permissions.store_selection.selectShopTaskStop])
     },
+    isBatchUpdate(){
+      return checkPermission([permissions.store_selection.selectShopTaskListUpdate])
+    },
     headers(){
       return [
         { "type": "normal", "prop": "task_id", "align": "center", "width": 200, "label": "ID" },

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

@@ -323,7 +323,7 @@ export default {
           size: "mini", //default/mini/small
         },
         {
-          label: "按号段:", //label
+          label: "限制条件:", //label
           ele: "xd-radio",
           valueKey: "card_number_type", //form[valueKey]
           value: params.card_number_type || "ALL", //v-model
@@ -331,6 +331,25 @@ export default {
           list: [
             { label: "全部号段", value: "ALL" },
             { label: "自定义号段", value: "CUSTOMIZE" },
+            { label: "卡类型", value: "TYPE" },
+          ],
+          rules: [
+            {
+              required: true,
+              message: "请选择",
+              trigger: ["blur", "change"],
+            },
+          ],
+        },
+        params.card_number_type==='TYPE'&&{
+          label: "", //label
+          ele: "xd-radio",
+          valueKey: "card_model", //form[valueKey]
+          value: params.card_model || "d", //v-model
+          placeholder: "请选择",
+          list: [
+            { label: "点卡", value: "d" },
+            { label: "次卡", value: "c" },
           ],
           rules: [
             {

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

@@ -342,6 +342,7 @@ export default {
                       : this.openInfoData
                       ? this.openInfoData.pay_url_data
                       : "",
+                      phone_collect_url_data: copyValue.phone_collect_url_data?phone_collect_url_data:this.openInfoData?this.openInfoData.phone_collect_url_data:"",
                   })
                 );
               });
@@ -757,6 +758,19 @@ export default {
             if (res.data.pay_error_url_data) {
               res.data.pay_error_url_data = JSON.parse(res.data.pay_error_url_data);
             }
+            let keys = Object.keys(res.data);
+            this.openDialogForm.map(item=>{
+              if(keys.includes(item.valueKey)) {
+                if(item.ele==='xd-select-site-path') {
+                  if(res.data[item.valueKey]) {
+                    res.data[item.valueKey]= JSON.parse(
+                      res.data[item.valueKey]
+                    );
+                  }
+                  
+                }
+              }
+            })
             this.initForm(res.data);
           })
           .catch((err) => {});
@@ -1248,6 +1262,89 @@ export default {
             // ]
             // },
           ].filter((i) => i);
+               this.openDialogForm = this.openDialogForm.map(item=>{
+            if(item.ele === "xd-select-site-path"){
+              item = {
+              label: item.label,
+              ele: "xd-select-site-path",
+              className: "input100",
+              valueKey: item.valueKey,
+              value: params[item.valueKey] || null,
+              setting: {
+                site_id: this.site_id,
+              },
+              handleCustom: ({ action, data }) => {
+                if (action === "siteList") {
+                  this.getEditxSiteListm()
+                    .then((res) => {
+                      data.cb(
+                        res.data.list.map((item) => {
+                          return {
+                            ...item,
+                            label: item["site_name"],
+                            value: item["site_id"],
+                          };
+                        })
+                      );
+                    })
+                    .catch((res) => {
+                      console.error(res);
+                      data.cb([]);
+                    });
+                }
+
+                //获取应用列表
+                if (action === "appList") {
+                  if (data.params && data.params.value) {
+                    this.getSaasSiteAppListm({ site_id: data.params.value })
+                      .then((res) => {
+                        if (!res.data.items) {
+                          this.$message({
+                            message:
+                              "您选择的站点无应用数据，请发布应用之后在进行配置！",
+                            type: "error",
+                          });
+                          data.cb([]);
+                          return;
+                        }
+
+                        //有数据
+                        let routerData = [];
+                        res.data.items.map((item) => {
+                          if (item["children"]) {
+                            routerData = routerData.concat(
+                              getEditPagesTreeToPathArr(
+                                item["children"],
+                                item["label"],
+                                item["value"],
+                                item["route"],
+                                item["aopen_app_code"]
+                              )
+                            );
+                          }
+                        });
+                        data.cb(routerData);
+                      })
+                      .catch((res) => {
+                        console.error(res);
+                        data.cb([]);
+                      });
+                  } else {
+                    data.cb([]);
+                  }
+                }
+              },
+              rules: [
+                {
+                  required: true,
+                  message: "请选择网站地址",
+                  trigger: "change",
+                },
+              ],
+            }
+            }
+            return item;
+          })
           listForm = this.insertArrayAt(listForm, 3, this.openDialogForm);
           listForm.map((item) => {
             if (item.ele === "xd-check") {
@@ -1411,6 +1508,16 @@ export default {
           this.listValue.pay_error_url_data
         );
       }
+      let keys = Object.keys(this.listValue);
+      this.openDialogForm.map(item=>{
+        if(keys.includes(item.valueKey)) {
+          if(item.ele==='xd-select-site-path') {
+            copyListValue[item.valueKey]= JSON.stringify(
+              this.listValue[item.valueKey]
+            );
+          }
+        }
+      })
       return copyListValue;
     },
     handleConfirmSave() {
@@ -1431,7 +1538,7 @@ export default {
                   }
                 )
                   .then(() => {
-                    this.funOpenAppEdit(copyListValue);
+                    this.funOpenAppEdit();
                   })
                   .catch(() => {
                     //todo

package/package.json

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