fix

src/views/dataEntry_manage/databaseComponents/batchComputedSave.vue

@@ -37,7 +37,7 @@
             <el-table-column align="center" width="300px">
                 <template slot="header" slot-scope="scope">
                     <span style="margin-right:40px;display:inline-block">目录</span>
-                    <el-radio-group :disabled="operationForm.view" v-model="classifyType">
+                    <el-radio-group :disabled="operationForm.view" v-model="classifyType" @change="handleClassifyTypeChange">
                         <el-radio :label="0">分目录</el-radio>
                         <el-radio :label="1">同目录</el-radio>
                     </el-radio-group>
@@ -219,6 +219,10 @@ export default {
             }
         },
 
+        handleClassifyTypeChange(){
+            this.handleClassifyChange(this.list[0])
+        },
+
         // 提交计算
         async handleSubmit(){
             const edbList=this.list.map((item,index)=>{

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -27,7 +27,7 @@
                 <div style="flex:1">
                     <!-- 累计值转月/季值 -->
                     <el-form-item v-if="computedType=='toMonthSeason'">
-                        <el-radio-group v-model="subComputedType">
+                        <el-radio-group v-model="subComputedType" @change="handleComputedSubTypeChange">
                             <el-radio :label="5">转月值</el-radio>
                             <el-radio :label="61">转季值</el-radio>
                         </el-radio-group>
@@ -227,6 +227,7 @@
                         multiple
                         collapse-tags
                         @change="handleFilter"
+                        :disabled="[5,61].includes(subComputedType)"
 					>
 						<el-option
 							v-for="item in frequencyArr"
@@ -415,6 +416,13 @@ export default {
 					value:'all',
 				}
             ]
+        },
+
+        frequencyArr(){
+            if(this.computedType==75){
+                return ['周度','旬度','月度', '季度', '年度']
+            }
+            return ['日度', '周度','旬度','月度', '季度', '年度']
         }
     },
     watch: {
@@ -430,6 +438,8 @@ export default {
                 this.checkAllStatus=false
                 this.selectionReactCancel=false
                 this.isEdit=false
+                this.showSave=false
+                this.computedType=computedBatchTypesV2[0].type
                 this.filter={
                     classify:'',
                     frequency:'',
@@ -453,6 +463,7 @@ export default {
                 if([81,82].includes(this.type)){
                     this.initData()
                 }
+                this.handleFilter()
             }
         }
     },
@@ -488,7 +499,7 @@ export default {
                 keyword:''
             },
 
-            frequencyArr: ['日度', '周度','旬度','月度', '季度', '年度'],
+            // frequencyArr: ['日度', '周度','旬度','月度', '季度', '年度'],
             classifyOpt: [],
 			classifyProps: {
 				label: 'ClassifyName',
@@ -670,13 +681,26 @@ export default {
                 nullValueWay:0,
                 maxNullWay:1,
             }
+            this.filter={
+                classify:'',
+                frequency:'',
+                user:'',
+                keyword:''
+            }
             if(this.computedType=='toMonthSeason'){
                 this.subComputedType=5
+                this.filter.frequency=['月度']
             }else if(this.computedType=='accumulate'){
                 this.subComputedType=62
             }else if(this.computedType=='multipleEDB'){
                 this.subComputedType=81
             }
+            this.handleFilter()
+        },
+        handleComputedSubTypeChange(){
+            if(this.subComputedType==61){
+                this.filter.frequency=['季度']
+            }
         },
 
         /* 指标列表 */
@@ -755,6 +779,7 @@ export default {
                 ClassifyIds:this.filter.classify?this.filter.classify.join(','):'',
                 Keyword:this.filter.keyword,
                 Frequency:this.filter.frequency?this.filter.frequency.join(','):'',
+                NotFrequency:this.computedType==75?'日度':''
             })
             this.listLoading=false
             if(res.Ret===200){
@@ -788,7 +813,7 @@ export default {
         handleFilter(e){
             this.page=1
             this.list=[]
-            this.getEDBList('adjustSelection')
+            this.getEDBList()
         },
 
         // 切换列表全选按钮状态

src/views/dataEntry_manage/databaseList.vue

@@ -1744,6 +1744,14 @@ export default {
 					view
 				};
 			} else  {
+				// 多指标求和求平均
+				if([81,82].includes(type)){
+					this.operationForm={...res,view}
+					this.showBatchComputedPop=true
+					return
+				}
+
+
 				let dataInfo = res.EdbInfoDetail;
 				let old_edb = res.CalculateList;
 
@@ -1790,11 +1798,7 @@ export default {
 						view
 					}
 				}
-				// 多指标求和求平均
-				if([81,82].includes(type)){
-					this.operationForm={...res,view}
-					this.showBatchComputedPop=true
-				}
+				
 			}
 		},