Merge branch 'feature_20250619_流程审批优化' into release

src/store/modules/user.js

@@ -39,6 +39,8 @@ const user = {
             localStorage.setItem('deptIds', JSON.stringify(res.data.deptIds));
             localStorage.setItem('chainUser', res.data.chainUser); //是否经销商用户 true
             localStorage.setItem('getRequestFlage', 'true');
+            // userDeptLevel用户部门等级字段，0-总部，1-公司，2-大区，3-销售部，4-业务员
+            localStorage.setItem('userDeptLevel', res.data.userDeptLevel);
             // 门店类型
             getDictOption({}, 'sfa_store_type').then((res) => {
               commit('SET_STORE_TYPE', res.data);

src/views/home/ABtarget.vue

@@ -118,7 +118,7 @@
               >
             </van-row>
           </van-collapse-item>
-          <van-collapse-item v-if="GZdata" name="41" title="公装客户开发">
+          <van-collapse-item v-if="GZdata" name="41" title="累计出货有效客户">
             <van-row>
               <!--            <van-col span="12"><span class="leftTitle">全年开户</span></van-col><van-col span="12"><span class="rightTitle">本月报备</span></van-col>-->
               <van-col span="12"

src/views/signApproval/index.vue

@@ -205,7 +205,7 @@ export default {
   name: 'MyHistoricalWeekly',
   data() {
     return {
-      isHandle: '0',
+      isHandle: '1',
       disabled: false,
       pageNum: 1,
       pageSize: 10,
@@ -225,12 +225,15 @@ export default {
       userDeptLevel: '',
     };
   },
-  created() {
+  activated() {
     // userDeptLevel用户部门等级字段，0-总部，1-公司，2-大区，3-销售部，4-业务员
-    this.userDeptLevel = localStorage.getItem('userDeptLevel');
-    if (this.userDeptLevel == '4') {
-      this.isHandle = '2';
-    }
+    this.$nextTick(() => {
+      this.userDeptLevel = localStorage.getItem('userDeptLevel');
+      if (this.userDeptLevel == '4') {
+        this.isHandle = '2';
+      }
+      this.tabChange();
+    });
     this.radio = [];
     getStoreTypeList({}).then((res) => {
       this.storeTypeList = res.data;
@@ -242,19 +245,19 @@ export default {
     // this.approveList()
   },
   watch: {
-    $route(to, from) {
-      this.powerGrade = localStorage.getItem('powerGrade');
-      this.pageNum = 1;
-      this.radio = [];
-      if (to.path == '/signApprovalList' && from.path == '/home') {
-        window.scrollTo(0, 0);
-        this.approveList();
-      }
-      if (to.path == '/signApprovalList' && from.path == '/signApproval') {
-        this.pageNum = 1;
-        this.tabChange();
-      }
-    },
+    // $route(to, from) {
+    //   this.powerGrade = localStorage.getItem('powerGrade');
+    //   this.pageNum = 1;
+    //   this.radio = [];
+    //   if (to.path == '/signApprovalList' && from.path == '/home') {
+    //     window.scrollTo(0, 0);
+    //     this.approveList();
+    //   }
+    //   if (to.path == '/signApprovalList' && from.path == '/signApproval') {
+    //     this.pageNum = 1;
+    //     this.tabChange();
+    //   }
+    // },
   },
   methods: {
     onregionConfirm(val) {

src/views/week/daily.vue

@@ -118,7 +118,7 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item v-if="GZQuota" name="41" title="公装客户开发">
+        <van-collapse-item v-if="GZQuota" name="41" title="累计出货有效客户">
           <van-row>
             <!--            <van-col span="12"><span class="leftTitle">全年开户</span></van-col><van-col span="12"><span class="rightTitle">本月报备</span></van-col>-->
             <van-col span="12"

src/views/week/dailyApproval.vue

@@ -106,7 +106,7 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item v-if="GZQuota" name="41" title="公装客户开发">
+        <van-collapse-item v-if="GZQuota" name="41" title="累计出货有效客户">
           <van-row>
             <!--            <van-col span="12"><span class="leftTitle">全年开户</span></van-col><van-col span="12"><span class="rightTitle">本月报备</span></van-col>-->
             <van-col span="12"

src/views/week/dailyDetails.vue

@@ -99,7 +99,7 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item v-if="GZQuota" name="41" title="公装客户开发">
+        <van-collapse-item v-if="GZQuota" name="41" title="累计出货有效客户">
           <van-row>
             <van-col span="12"
               ><p>

src/views/week/dailyHistoricalDetails.vue

@@ -105,7 +105,7 @@
             >
           </van-row>
         </van-collapse-item>
-        <van-collapse-item v-if="GZQuota" name="41" title="公装客户开发">
+        <van-collapse-item v-if="GZQuota" name="41" title="累计出货有效客户">
           <van-row>
             <van-col span="12"
               ><p>