bug 修改

src/routes/modules/customRoutes.js

@@ -453,6 +453,16 @@ export default [
           pathFrom: "XClassCustomPoints",
           pathName: "X类客户派点",
         }
+      },
+      {
+        path:'EditNewEntries',
+        name:"查看明细",
+        component: () => import('@/views/custom_manage/points/AddNewEntries.vue'),
+        hidden: false,
+        meta:{
+          pathFrom: "XClassCustomPoints",
+          pathName: "X类客户派点",
+        }
       }
     ],
   },

src/views/custom_manage/customList/applyTurn.vue

@@ -79,7 +79,7 @@
 							style="width:400px;">
 							</el-date-picker>
 						</el-form-item>
-						<el-form-item label="合同期限" prop="term" :rules="{ required: true, message: '合同期限不能为空2211', trigger: 'change' }" style="marginRight:60px;" v-if="companyInfo.Status =='永续'">
+						<el-form-item label="合同期限" prop="term" :rules="{ required: true, message: '合同期限不能为空', trigger: 'change' }" style="marginRight:60px;" v-if="companyInfo.Status =='永续'">
 							<i style="color:#f00;fontSize:20px;position:absolute;left:-90px;top:10%;">*</i>
 							<div class="quarters-content">
 								<el-checkbox-group v-model="selectedQuarters" @input="checkboxInputHandler">
@@ -132,13 +132,13 @@
 								<i style="color:#f00;fontSize:20px;position:absolute;left:-15px;top:10%;">*</i>
 								权限设置
 							</label>
-							<template  v-if="companyInfo.CompanyType=='权益' ||isRoleType== '权益'">
+							<template  v-if="(companyInfo.CompanyType=='权益' || isRoleType== '权益') && companyInfo.Status !='永续'" >
 								<raiPermissionbox ref="raiPermissionboxRef" v-for="item in authList" :key="item.ClassifyName" :data="item" :formData="formData"
 								:hasNoChild="hasNoChild"></raiPermissionbox>
 							</template>
 							<ul class="menu_lists" style="width:100%" v-else>
 								<li v-for="item in authList" :key="item.ClassifyName" class="menu_item">
-									<el-checkbox v-if="item.ClassifyName !== '权益'" :indeterminate="item.isIndeterminate" v-model="item.checkAll" :disabled="setSelectVarietyDisabled(item)" @change="handleCheckAll(item)" style="marginRight:30px;fontWeight:bold;minWidth:90px;">{{item.ClassifyName+':'}}</el-checkbox>
+									<el-checkbox  :indeterminate="item.isIndeterminate" v-model="item.checkAll" :disabled="setSelectVarietyDisabled(item)" @change="handleCheckAll(item)" style="marginRight:30px;fontWeight:bold;minWidth:90px;">{{item.ClassifyName+':'}}</el-checkbox>
 									<el-checkbox-group v-model="item.CheckList" @change="handleChecked(item)">
 										<el-checkbox v-for="list in item.Items" :label="list.ChartPermissionId" :key="list.ChartPermissionId" class="list_item" :disabled="list.IsPublic==1  || list.disabled">{{list.PermissionName}}</el-checkbox>
 									</el-checkbox-group>
@@ -311,7 +311,7 @@ export default {
 			}).then(res => {
 				let newArr = [];
 				if(res.Ret === 200) {
-					if(this.companyInfo.CompanyType == '权益' || this.isRoleType== '权益') {
+					if((this.companyInfo.CompanyType == '权益' || this.isRoleType== '权益') && this.companyInfo.Status !='永续') {
 						res.Data.List[0].Items.map(item => {
 							item.disabled=item.isIndeterminate=false								
 							if(item.ChartPermissionId==22 && (!item.Child)) this.hasNoChild=true
@@ -367,7 +367,7 @@ export default {
 					let checkArr = [];
 					let checkArrName = [];
 					let hasMinusSignVal = 0
-					if(this.companyInfo.CompanyType==='权益' || this.isRoleType== '权益'){
+					if((this.companyInfo.CompanyType==='权益' || this.isRoleType== '权益') && this.companyInfo.Status !='永续'){
 					 	hasMinusSignVal = this.$refs.raiPermissionboxRef[0].minus_sign_val;		
 						this.authList.forEach(item => {
 								if(item.CheckList.length) {

src/views/custom_manage/customList/components/raiPermissionbox.vue

@@ -85,7 +85,7 @@
       }
     },
     created(){
-      console.log(this.data);
+      console.log(this.data,'----');
       // 回显
       if(this.data.CheckList && this.data.CheckList.length>0){
         this.data.Items.map(item =>{

src/views/custom_manage/points/AddNewEntries.vue

@@ -88,8 +88,8 @@
         <span v-if="tabsPitchon == 2">%</span>
       </p>
       <div style="display: flex; justify-content: center">
-        <el-button type="primary" style="margin-right: 20px" @click="preserveHandler">保存</el-button>
-        <el-button type="primary" plain>取消</el-button>
+        <el-button type="primary" style="margin-right: 20px" @click="preserveHandler">{{ $route.query.id ? "修改并保存" : "保存" }}</el-button>
+        <el-button type="primary" plain @click="goBackHandler">取消</el-button>
       </div>
     </div>
   </div>
@@ -313,6 +313,10 @@ export default {
     selectCompanyChange(value) {
       this.companyId = value.CompanyId;
     },
+    // 返回事件
+    goBackHandler() {
+      this.$router.back();
+    },
   },
 };
 </script>

src/views/custom_manage/points/EntryRecords.vue

@@ -160,7 +160,7 @@ export default {
     // 查看
     lookHandler(item) {
       this.$router.push({
-        path: "/AddNewEntries",
+        path: "/EditNewEntries",
         query: { id: item.EnterScoreId },
       });
     },

src/views/custom_manage/points/RankingOverview.vue

@@ -11,7 +11,7 @@
         collapse-tags
         clearable
         filterable
-        @change="changeSales"
+        @change="changeHandle"
       >
       </el-cascader>
       <el-cascader
@@ -22,6 +22,7 @@
         clearable
         :options="locationOptions"
         placeholder="请选择城市"
+        @change="changeHandle"
       >
       </el-cascader>
       <a :href="exportUser" download>
@@ -30,7 +31,7 @@
     </div>
     <div class="table-cont">
       <template v-if="tableTheadColumns.length">
-        <table>
+        <table class="thead-sticky thead-box">
           <thead>
             <tr>
               <td class="'head-column'"></td>
@@ -39,18 +40,13 @@
               </td>
             </tr>
           </thead>
+          <tbody v-for="(item, index) in datalist" :key="index">
+            <tr>
+              <td class="thead-rs">{{ item.Quarter }}</td>
+              <td v-for="key in item.ProportionListText" :key="key">{{ key }}</td>
+            </tr>
+          </tbody>
         </table>
-
-        <div class="table-body-wrapper">
-          <table>
-            <tbody v-for="(item, index) in datalist" :key="index">
-              <tr>
-                <td class="thead-rs">{{ item.Quarter }}</td>
-                <td v-for="key in item.ProportionListText" :key="key">{{ key }}</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
         <template v-if="!datalist.length"> <div class="not-text">暂无数据</div> </template>
       </template>
       <template v-else> <div class="not-text">暂无数据</div> </template>
@@ -145,6 +141,9 @@ export default {
       };
       return params;
     },
+    changeHandle() {
+      this.getDataList();
+    },
   },
 };
 </script>
@@ -164,12 +163,7 @@ export default {
   }
   .table-cont {
     overflow: auto;
-    .table-body-wrapper {
-      max-height: calc(100vh - 400px);
-      margin-right: -6px;
-      border-bottom: 1px solid #dcdfe6;
-      border-top: 1px solid #dcdfe6;
-    }
+    max-height: calc(100vh - 400px);
     table {
       font-size: 14px;
       color: #666;
@@ -214,9 +208,6 @@ export default {
       }
     }
     .content-ul {
-      td {
-        // width: 15%;
-      }
       .association {
         color: #409eff;
         cursor: pointer;
@@ -228,5 +219,10 @@ export default {
     line-height: 300px;
     text-align: center;
   }
+  .thead-box {
+    position: sticky;
+    top: 0;
+    z-index: 9;
+  }
 }
 </style>

src/views/custom_manage/points/RatingOverview.vue

@@ -29,7 +29,7 @@
 
     <div class="table-cont">
       <template v-if="tableTheadColumns.length">
-        <table>
+        <table class="thead-sticky thead-box">
           <thead>
             <tr>
               <td class="'head-column'"></td>
@@ -38,29 +38,23 @@
               </td>
             </tr>
           </thead>
+          <tbody v-for="(item, index) in datalist" :key="index">
+            <tr>
+              <td class="thead-rs">{{ item.ChartPermissionName }}</td>
+              <td v-for="item in tableTheadColumns.length" :key="item"></td>
+            </tr>
+            <tr v-for="rs in item.List" :key="rs.RealName" class="content-ul">
+              <td>{{ rs.RealName }}</td>
+              <td v-for="pr in rs.ProportionListText" :key="pr">{{ pr }}</td>
+            </tr>
+          </tbody>
+          <tbody v-for="(item, index) in listGroup" :key="index">
+            <tr>
+              <td class="thead-rs">{{ item.GroupName }}</td>
+              <td v-for="key in item.ProportionListText" :key="key">{{ key }}</td>
+            </tr>
+          </tbody>
         </table>
-
-        <div class="table-body-wrapper">
-          <table>
-            <tbody v-for="(item, index) in datalist" :key="index">
-              <tr>
-                <td class="thead-rs">{{ item.ChartPermissionName }}</td>
-                <td v-for="item in tableTheadColumns.length" :key="item"></td>
-              </tr>
-              <tr v-for="rs in item.List" :key="rs.RealName" class="content-ul">
-                <td>{{ rs.RealName }}</td>
-                <td v-for="pr in rs.ProportionListText" :key="pr">{{ pr }}</td>
-              </tr>
-            </tbody>
-            <tbody v-for="(item, index) in listGroup" :key="index">
-              <tr>
-                <td class="thead-rs">{{ item.GroupName }}</td>
-                <td v-for="key in item.ProportionListText" :key="key">{{ key }}</td>
-              </tr>
-            </tbody>
-            <tfoot></tfoot>
-          </table>
-        </div>
         <template v-if="!datalist.length && !listGroup.length"> <div class="not-text">暂无数据</div> </template>
       </template>
       <template v-else> <div class="not-text">暂无数据</div> </template>
@@ -215,13 +209,8 @@ export default {
     margin-bottom: 30px;
   }
   .table-cont {
+    max-height: calc(100vh - 400px);
     overflow: auto;
-    .table-body-wrapper {
-      max-height: calc(100vh - 400px);
-      margin-right: -6px;
-      border-bottom: 1px solid #dcdfe6;
-      border-top: 1px solid #dcdfe6;
-    }
     table {
       font-size: 14px;
       color: #666;
@@ -266,9 +255,6 @@ export default {
       }
     }
     .content-ul {
-      td {
-        // width: 15%;
-      }
       .association {
         color: #409eff;
         cursor: pointer;
@@ -280,5 +266,10 @@ export default {
     line-height: 300px;
     text-align: center;
   }
+  .thead-box {
+    position: sticky;
+    top: 0;
+    z-index: 9;
+  }
 }
 </style>