提交首页修改

1

src/views/main/abnormal/index.vue

@@ -24,7 +24,7 @@
       </el-form-item>
       <el-button native-type="submit" type="primary">搜索</el-button>
       <el-button native-type="reset" type="danger">重置</el-button>
-      <el-button type="primary" @click="exportAbnormal">导出</el-button>
+
     </save-form>
     <div class="tags">
       <el-badge
@@ -184,8 +184,10 @@ export default {
     },
   },
   async mounted() {
-    this.FetchList();
+
     await this.$store.dispatch("setBranchs");
+  this.$set(this.search,'organId',this.selects.branchs[0].id)
+    this.FetchList();
   },
   methods: {
     permission,

src/views/main/baseinfo/index.vue

@@ -172,9 +172,10 @@ export default {
     },
   },
   created() {},
-  mounted() {
+ async mounted() {
     this.$set(this.search, "dates", this.getInitDate());
-    this.$store.dispatch("setBranchs");
+  await  this.$store.dispatch("setBranchs");
+  this.$set(this.search,'organId',this.selects.branchs[0].id)
     this.FetchDetail();
   },
   methods: {

src/views/main/reminders/index.vue

@@ -38,7 +38,12 @@
         <title-item
           type="warning"
           :data="[
-            { name: item.desc, num: item.num, errorType: item.errorType,  num2: item.num2, },
+            {
+              name: item.desc,
+              num: item.num,
+              errorType: item.errorType,
+              num2: item.num2,
+            },
           ]"
         >
           <span
@@ -78,9 +83,10 @@ export default {
       listByType: {},
     };
   },
-  mounted() {
+  async mounted() {
+    await this.$store.dispatch("setBranchs");
+    this.$set(this.search, "organId", this.selects.branchs[0].id);
     this.FetchList();
-    this.$store.dispatch("setBranchs");
   },
   methods: {
     permission,
@@ -120,7 +126,7 @@ export default {
         const res = await getRemindMatterData({
           ...this.search,
         });
-        this.list = this.formatData(res.data||[])
+        this.list = this.formatData(res.data || []);
       } catch (error) {
         console.log(error);
       }
@@ -130,14 +136,14 @@ export default {
       this.FetchList();
     },
     formatData(data) {
-    let list =  data.map(item=>{
+      let list = data.map((item) => {
         return {
           ...item,
-          ...errorType[item.errorType] || {}
-        }
-      })
+          ...(errorType[item.errorType] || {}),
+        };
+      });
 
-      return list
+      return list;
     },
   },
 };

src/views/main/teamSchedule/index.vue

@@ -9,10 +9,10 @@
       @reset="onReSet"
       saveKey="/main/main/teamSchedule"
     >
-      <el-form-item prop="organId">
+      <el-form-item prop="organIds">
         <el-select
           class="multiple"
-          v-model.trim="searchForm.organId"
+          v-model.trim="searchForm.organIds"
           filterable
           placeholder="请选择分部"
         >
@@ -166,7 +166,7 @@ export default {
     return {
       searchForm: {
         userId: "",
-        organId: "",
+        organIds: "",
         month: [],
         searchType: "",
       },

src/views/reportForm/index.vue

@@ -491,6 +491,27 @@
           >
         </div>
       </div>
+      <el-divider></el-divider>
+      <div class="m-core">
+        <div class="m-wrap">
+        <div class="title">异常处理数据导出：</div>
+        <el-select
+          clearable
+          filterable
+          v-model="Abnormal.organId"
+          placeholder="请选择分部"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+
+        <el-button type="primary"  style="margin-left: 10px"  v-permission="'export/exportIndexErrData'" @click="exportAbnormal">导出</el-button>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -529,7 +550,10 @@ export default {
       questionActiveType: "CLOUD_TEACHER_FEEDBACK",
       vipOrganId: [],
       serviceOrganId: [], // 服务报表
-      serviceTimer: []
+      serviceTimer: [],
+      Abnormal: {
+        organId: null,
+      },
     };
   },
   mounted() {
@@ -548,7 +572,7 @@ export default {
         method: "POST",
         headers: {
           Authorization: getToken(),
-          tenantId: getTenantId()
+          tenantId: getTenantId(),
         },
         data: qs.stringify(cleanDeep(data)),
         url,
@@ -612,7 +636,7 @@ export default {
         method: "POST",
         headers: {
           Authorization: getToken(),
-          tenantId: getTenantId()
+          tenantId: getTenantId(),
         },
         data: qs.stringify(cleanDeep(data)),
         url,
@@ -673,7 +697,7 @@ export default {
         method: "POST",
         headers: {
           Authorization: getToken(),
-          tenantId: getTenantId()
+          tenantId: getTenantId(),
         },
         data: qs.stringify(cleanDeep(data)),
         url,
@@ -734,7 +758,7 @@ export default {
         method: "POST",
         headers: {
           Authorization: getToken(),
-          tenantId: getTenantId()
+          tenantId: getTenantId(),
         },
         data: qs.stringify(cleanDeep(data)),
         url,
@@ -799,7 +823,7 @@ export default {
         method: "POST",
         headers: {
           Authorization: getToken(),
-          tenantId: getTenantId()
+          tenantId: getTenantId(),
         },
         data: qs.stringify(cleanDeep(data)),
         url,
@@ -986,12 +1010,12 @@ export default {
       let data = {
         organId: this.vipOrganId.join(","),
       };
-       let url = "/api-web/export/studentVipPractice";
+      let url = "/api-web/export/studentVipPractice";
       const options = {
         method: "get",
         headers: {
           Authorization: getToken(),
-          tenantId: getTenantId()
+          tenantId: getTenantId(),
         },
         params: cleanDeep(data),
         url,
@@ -1124,6 +1148,20 @@ export default {
         this.serviceTimer.splice(1, 1, end);
       }
     },
+    exportAbnormal() {
+      let params = this.Abnormal;
+      Export(
+        this,
+        {
+          method: "post",
+          url: "/api-web/export/exportIndexErrData",
+          params: this.$helpers.qs.stringify({
+            ...params,
+          }),
+        },
+        "是否确认导出报表？"
+      );
+    },
   },
   // AccountDetailTimer
 };

src/views/teamDetail/teamClassList.vue

@@ -306,7 +306,7 @@ export default {
         let obj = {
           ...result,
           lessThenThreeHighOnline: this.$route.query.lessThenThreeHighOnline,
-          organIdList: this.searchForm.organIdList.join(","),
+          organIds: this.searchForm.organIdList.join(","),
           page: this.rules.page,
           rows: this.rules.limit,
         };
@@ -408,7 +408,7 @@ export default {
           url: "/api-web/export/classGroup",
           params: qs.stringify({
             ...params,
-            organIdList: this.searchForm.organIdList.join(","),
+            organIds: this.searchForm.organIdList.join(","),
             lessThenThreeHighOnline: this.$route.query.lessThenThreeHighOnline,
           }),
         },