2023-3-1

src/Form/EnterpriseArchives/add.vue

@@ -67,6 +67,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否授权所有营销类别:" prop="saleclassauth" label-width="160px">
+                <el-checkbox v-model="form.saleclassauth" :true-label="0" :false-label="1"></el-checkbox>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="详细地址" prop="address">
                 <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入详细地址"></el-input>

src/Form/EnterpriseArchives/edit.vue

@@ -67,6 +67,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否授权所有营销类别:" prop="saleclassauth" label-width="160px">
+                <el-checkbox v-model="form.saleclassauth" :true-label="0" :false-label="1"></el-checkbox>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="详细地址" prop="address">
                 <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入详细地址"></el-input>

src/Form/marketing2/agent/add.vue

@@ -95,11 +95,6 @@
               <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否授权所有营销类别:" prop="isallsale" label-width="160px">
-              <el-checkbox v-model="form.isallsale" :true-label="1" :false-label="0"></el-checkbox>
-            </el-form-item>
-          </el-col>
         </el-form>
       </el-row>
       </div>
@@ -150,7 +145,6 @@ export default {
         "type": "",
         "erpagentnum": "",
         "isservice": 1, //是否服务商，0或1
-        "isallsale":1, //是否授权所有营销类别
       },
       ENlist:[],
       agent_level:[],

src/Form/marketing2/agent/edit.vue

@@ -108,11 +108,6 @@
                 <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="是否授权所有营销类别:" prop="isallsale" label-width="160px">
-                <el-checkbox v-model="form.isallsale" :true-label="1" :false-label="0"></el-checkbox>
-              </el-form-item>
-            </el-col>
           </el-form>
         </el-row>
       </div>

src/HManagement/EnterpriseArchives/modules/details.vue

@@ -90,6 +90,10 @@ export default {
           label:'税号',
           value: this.mainData.taxno
         },
+        {
+          label:'是否授权所有营销类别',
+          value: this.mainData.saleclassauth ? '否' : '是'
+        },
         /*{
           label:'免运费金额',
           value: this.mainData.freefreightamount

src/HManagement/marketing2/agent/details/index.vue

@@ -249,7 +249,7 @@ export default {
         },
         {
           label:'是否授权所有营销类别',
-          value: this.mainData.isallsale == '1' ? '是' : '否'
+          value: this.mainData.saleclassauth ? '否' : '是'
         },
         {
           label:'创建人',

src/SDrpManagement/ProductGroup/index.vue

@@ -48,7 +48,7 @@
 <script>
 import selectClass from './modules/Select.vue'
 export default {
-  name: '',
+  name: 'productgroup',
   data() {
     return {
       brandList:'',
@@ -172,6 +172,16 @@ export default {
       this.getProductGroup()
     },
   },
+  beforeRouteLeave (to, from,next) {
+    if (to.name == 'groupDetail') {
+      this.$store.commit('setPageCache',['productgroup'])
+    } else {
+      this.$store.commit('setPageCache',[])
+    }
+    console.log(this.$store.state.pageCache);
+    
+    next()
+  }
 };
 </script>
 

src/components/newLayout/index.vue

@@ -7,7 +7,9 @@
         <div>
           <menuTemp class="sticky normal-margin" ref="menu"></menuTemp>
           <div class="radius">
-            <router-view></router-view>
+            <keep-alive :include="pageCache">
+              <router-view></router-view>
+            </keep-alive>
           </div>
         </div>
       </div>
@@ -21,6 +23,7 @@ import headeTemp from './modules/header.vue'
 import asideTemp from './modules/aside.vue'
 import menuTemp from './modules/menu.vue'
 import navTemp from './modules/navRight.vue'
+import {mapGetters} from 'vuex'
 
 export default {
   components:{
@@ -30,6 +33,9 @@ export default {
     navTemp
   },
   computed: {
+    ...mapGetters({
+      pageCache: 'pageCache'
+    })
   },
   data () {
     return {

src/store/index.js

@@ -27,6 +27,7 @@ export default new Vuex.Store({
     closeDrawerTemp:false,
     DrawerShow:false,
     historyRouter:null,
+    pageCache:[]
   },
   getters: {
     siteinfo:state => state.siteinfo,
@@ -46,7 +47,8 @@ export default new Vuex.Store({
     DrawerShow:state => state.DrawerShow,
     sys_modules:state => state.sys_modules,
     historyRouter:state => state.historyRouter,
-    isRouterAlive:state => state.isRouterAlive
+    isRouterAlive:state => state.isRouterAlive,
+    pageCache: status => status.pageCache
     
   },
   mutations: {
@@ -114,6 +116,9 @@ export default new Vuex.Store({
     clearSearchValue (state) {
       state.searchValue = ''
     },
+    setPageCache(state,res) {
+      state.pageCache = res
+    },
   },
   actions: {
     // 系统选项分类查询