Merge branch 'dev'

src/views/MatManage/_matList/index.vue

@@ -108,9 +108,11 @@ export default defineComponent({
             groupFormatter
         }
     },
-    mounted() {
+    activated() {
         this.getApi();
         this.getData();
+    },
+    mounted() {
         watch(() => (this.pagination.pageSize), () => {
             this.getData()
         });

src/views/QuestManage/_questList/index.vue

@@ -123,9 +123,13 @@ export default defineComponent({
             pagination
         }
     },
-    mounted() {
+    activated() {
         this.getApi();
         this.getData();
+    },
+    mounted() {
+        // this.getApi();
+        // this.getData();
         watch(() => (this.pagination.pageSize), () => {
             this.getData()
         });

src/views/QuestManage/_transformResult/index.vue

@@ -46,6 +46,9 @@
                 <el-form-item label="部门">
                     <el-input clearable v-model="form.departmentName" placeholder="请输入"></el-input>
                 </el-form-item>
+                <el-form-item label="时间">
+                    <el-date-picker size="small" value-format="YYYY-MM-DD HH:mm:ss" type="daterange" v-model="selTime" @change="dateRangeChange"></el-date-picker>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch">搜索</el-button>
                     <el-button @click="reset">重置</el-button>
@@ -92,9 +95,12 @@ export default defineComponent({
         const form = reactive({
             userName: undefined,
             departmentName: undefined,
+            beginTime: undefined,
+            endTime: undefined,
         });
         const transformData = ref({});
         const transformList = ref([]);
+        const selTime = ref([]);
         const { proxy } = getCurrentInstance();
         const pagination = reactive({
             total: 0,
@@ -102,7 +108,7 @@ export default defineComponent({
             pageSize: 10
         });
         return {
-            proxy,form,
+            proxy,form,selTime,
             transformData,transformList,
             activeId,pagination
         }
@@ -145,8 +151,17 @@ export default defineComponent({
         reset() {
             this.form.userName = undefined;
             this.form.departmentName = undefined;
+            this.form.beginTime = undefined;
+            this.form.endTime = undefined;
+            this.selTime = [];
             this.getApi();
         },
+        dateRangeChange(value) {
+            if(value) {
+                this.form.beginTime = value[0];
+                this.form.endTime = value[1];
+            }
+        },
         //导出
         download() {
             this.proxy.$download("/task/excel", {id: this.$route.query.id}, this.transformData.taskTitle+'传播效果.xlsx').then(res => {

src/views/ReviewManage/_accountReview/index.vue

@@ -26,8 +26,8 @@
        <div class="area-table">
            <el-table :data="tableData.data" size="default" border :header-cell-style="{background: '#EEE'}">
                <el-table-column prop="userName" label="申请人" width="200"></el-table-column>
-               <el-table-column prop="departmentName" label="部门" width="200"></el-table-column>
-               <el-table-column prop="platform" label="第三方平台" width="240" :formatter="statusFormatter"></el-table-column>
+               <el-table-column prop="departmentName" label="部门" width="280"></el-table-column>
+               <el-table-column prop="platform" label="第三方平台" width="160" :formatter="statusFormatter"></el-table-column>
                <el-table-column prop="account" label="账号" width="200"></el-table-column>
                <el-table-column prop="name" label="昵称" width="200"></el-table-column>
                <el-table-column prop="tel" label="手机号" width="200"></el-table-column>

src/views/StarwayInfo/index.vue

@@ -83,8 +83,10 @@ export default defineComponent({
             statusFormatter
         }
     },
-    mounted() {
+    activated() {
         this.getData()
+    },
+    mounted() {
         watch(() => (this.pagination.pageSize), () => {
             this.getData()
         });