bding 11 mēneši atpakaļ
vecāks
revīzija
6cf331222c

+ 1 - 1
src/views/custom_manage/customList/components/raiPermissionbox.vue

@@ -42,7 +42,7 @@
         <el-checkbox-group v-model="data.CheckList" style="height: unset;">
           <div class="rai-checkbox-upS-box" >
             <el-checkbox :label="itP.ChartPermissionId" v-for="(itP,inP) in data.ItemsPrivate" 
-            :key="itP.ChartPermissionId" :disabled="itP.disabled" :style="{'height':hasNoChild?'48px':'95px','width':itP.PermissionName.includes('研选')?'130px':'84px'}"
+            :key="itP.ChartPermissionId" :disabled="itP.disabled" :style="{'height':hasNoChild?'48px':'95px','width':itP.ChartPermissionId == 52 && data.CheckList.includes(52)? '220px' : itP.PermissionName.includes('研选')?'130px':'84px'}"
             class="rai-checkbox-item upS-item" @change="e => handlePrivateChecked(e,itP,data)">
             {{ itP.PermissionName }}
             <p v-if="itP.ChartPermissionId == 31" class="checkbox-text">(30000元/年)</p>

+ 1 - 1
src/views/custom_manage/customList/mixins/quartersMixin.js

@@ -84,7 +84,7 @@ export default {
   watch: {
     selectedQuarters(newValue, oldValue) {
       if (!newValue.length) return;
-      if (!this.isConsecutiveSelection() && this.showAlert) {
+      if (!this.isConsecutiveSelection() && this.showAlert && this.isXClassCustom) {
         this.showAlert = false;
         this.selectedQuarters.pop();
         this.$message.error("只能选择相邻的季度");