jufubao-admin-library 1.1.104 → 1.1.105

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/package.json

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