bug

2022-10-24 15:57:26 +08:00
parent fb0354221d
commit 84605fd1e7
3 changed files with 296 additions and 219 deletions
--- a/project/hlj/app/AppRatingTask/components/FormDetail.vue
+++ b/project/hlj/app/AppRatingTask/components/FormDetail.vue
@@ -8,10 +8,11 @@
      <ai-card title="基础信息">
        <template #content>
          <ai-wrapper>
-            <ai-info-item label="任务名称" isLine :value="info.taskTitle"></ai-info-item>
-            <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
-            <ai-info-item label="群发时间" :value="info.choiceTime"></ai-info-item>
-            <ai-info-item label="结束时间" :value="info.taskEndTime" v-if="info.sendChannel === '1'"></ai-info-item>
+            <ai-info-item label="表单名称" :value="info.templateName"></ai-info-item>
+            <ai-info-item label="参评人" :value="info.evaluatorsNames"></ai-info-item>
+            <ai-info-item label="开始时间" :value="info.beginTime"></ai-info-item>
+            <ai-info-item label="评分人" :value="info.scorerNames"></ai-info-item>
+            <ai-info-item label="结束时间" :value="info.endTime"></ai-info-item>
          </ai-wrapper>
        </template>
      </ai-card>
@@ -27,11 +28,18 @@
            <div class="bottom">
              <ai-search-bar>
                <template #left>
-                  <el-button type="primary" @click="isShow = true">导出明细</el-button>
+                  <ai-download
+                    :instance="instance"
+                    :url="`/app/appassessmentscortask/export?id=${params.formId}&type=0&name=${search1.name}&status=${search1.status}`"
+                    fileName="填写统计"
+                    :disabled="tableData1.length == 0">
+                    <el-button size="small" type="primary">导出明细</el-button>
+                  </ai-download>
                  <ai-select
-                    v-model="search1.type"
+                    v-model="search1.status"
                    clearable
-                    placeholder="请选择完成情况">
+                    placeholder="请选择完成情况"
+                    :selectList="dictList">
                  </ai-select>
                </template>
                <template #right>
@@ -54,7 +62,7 @@
                tableSize="small"
                :current.sync="search1.current"
                :size.sync="search1.size"
-                @getList="getMemberInfo">
+                @getList="getList1">
                <el-table-column slot="user" label="成员" align="left">
                  <template slot-scope="{ row }">
                    <div class="userinfo">
@@ -70,11 +78,17 @@
            <div class="bottom">
              <ai-search-bar>
                <template #left>
-                  <el-button type="primary" @click="isShow = true">导出明细</el-button>
+                  <ai-download
+                    :instance="instance"
+                    :url="`/app/appassessmentscortask/export?id=${params.formId}&type=1&name=${search1.name}`"
+                    fileName="填写统计"
+                    :disabled="tableData2.length == 0">
+                    <el-button size="small" type="primary">导出列表</el-button>
+                  </ai-download>
                </template>
                <template #right>
                  <el-input
-                    v-model="search1.name"
+                    v-model="search2.name"
                    size="small"
                    placeholder="请输入参评人姓名"
                    clearable
@@ -93,14 +107,6 @@
                :current.sync="search2.current"
                :size.sync="search2.size"
                @getList="getGroupInfo">
-                <el-table-column slot="user" label="群主" align="center">
-                  <template slot-scope="{ row }">
-                    <div class="userinfo">
-                      <span>{{ row.groupOwnerName }}</span>
-                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
-                    </div>
-                  </template>
-                </el-table-column>
              </ai-table>
            </div>
          </div>
@@ -111,7 +117,6 @@
 </template>

 <script>
-  import { mapState } from 'vuex'
  export default {
    name: 'Detail',

@@ -124,141 +129,97 @@
    data () {
      return {
        total1: 0,
-        isShowPhone: false,
        total2: 0,
-        user1: [],
-        user2: [],
        name1: '',
        name2: '',
-        radio1: '未执行',
        search1: {
          current: 1,
          size: 10,
-          deptartId: '',
-          type: 0,
-          sendStatus: '0'
+          name: '',
+          status: ''
        },
        search2: {
          current: 1,
          size: 10,
-          deptartId: '',
-          type: 1,
-          sendStatus: '0'
+          name: ''
        },
-        memberInfo: {},
-        groupInfo: {},
        tableData1: [],
-        fileList: [],
        tableData2: [],
        info: {},
-        content: '',
        currIndex: 0,
        colConfigs1: [
-          { slot: 'user', label: '成员' },
-          { prop: 'groupCount', label: '预计送达居民群', align: 'center' }
+          { slot: 'user', label: '参评人' },
+          { prop: 'groupCount', label: '评分人', align: 'center' },
+          { prop: 'groupCount', label: '提交时间', align: 'center' },
+          { prop: 'groupCount', label: '总分', align: 'center' }
        ],
        colConfigs2: [
-          { prop: 'groupName', label: '居民群' },
-          { prop: 'memberCount', label: '群人数', align: 'center' },
-          { slot: 'user', label: '群主', align: 'center' },
+          { prop: 'groupName', label: '参评人' },
+          { prop: 'memberCount', label: '评分人数', align: 'center' },
+          { slot: 'user', label: '平均分', align: 'center' },
        ],
-        groups: [],
-        timer: null,
-        min: 60,
-        isDisabled: false,
-        rejecterId: ''
+        dictList: [
+          {
+            dictName: '未填报',
+            dictValue: '0'
+          },
+          {
+            dictName: '已填报',
+            dictValue: '1'
+          }
+        ]
      }
    },

-    computed: {
-      ...mapState(['user'])
-    },
-
    created () {
-      this.getInfo(this.params.id)
+      this.getInfo(this.params.formId)
+      this.getList1()
    },

    methods: {
-      getMemberInfo () {
-        this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, {
-          params: {
-            ...this.search1,
-            taskId: this.params.id
-          }
-        }).then(res => {
-          if (res.code === 0) {
-            this.tableData1 = res.data.executedList.records
-            this.total1 = res.data.executedList.total
-            this.memberInfo = res.data
-          }
-        })
-      },
-
-      getGroupInfo () {
-        this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, {
-          params: {
-            ...this.search2,
-            taskId: this.params.id
-          }
-        }).then(res => {
-          if (res.code === 0) {
-            this.tableData2 = res.data.executedList.records.map(v => {
-              return {
-                ...v,
-                groupName: v.groupName || '未命名群聊'
-              }
-            })
-            this.total2 = res.data.executedList.total
-            this.groupInfo = res.data
-          }
-        })
-      },
-
      getInfo (id) {
-        this.instance.post(`/app/appmasssendingtask/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appassessmentscortask/taskTemplateDetail?id=${id}`).then(res => {
          if (res.code === 0) {
            this.info = res.data
-            if (res.data.status === '4' && res.data.remindTime) {
-              this.countdown()
-            }
-
-            const content = res.data.contents.filter(v => v.msgType === '0')
-
-            if (content.length) {
-              this.content = content[0].content
-            }
-
-            this.fileList = res.data.contents.filter(v => v.msgType !== '0').map(v => {
-              return {
-                ...v,
-                ...v.sysFile
-              }
-            })
-
-            this.info.wxGroups = res.data.wxGroups.map(v => {
-              this.groups.push(...v.groupIds.split(','))
-
-              return {
-                ...v,
-                groupIds: v.groupIds.split(',')
-              }
-            })
-
-            if (res.data.examines && res.data.examines.length) {
-              const user = res.data.examines.filter(v => v.examineStatus === '2')
-
-              if (user.length) {
-                this.rejecterId = user[0].examineUserId
-              }
-            }
          }
        })
      },

-      cancel (isRefresh) {
+      getList1 () {
+        this.instance.post(`/app/appassessmentscortask/assessStatistics`, null, {
+          params: {
+            id: this.params.formId,
+            ...this.search1
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.tableData1 = res.data.records
+            this.total1 = res.data.total
+          }
+        })
+      },
+
+      getList2 () {
+        this.instance.post(`/app/appassessmentscortask/fillStatistics`, null, {
+          params: {
+            id: this.params.formId,
+            ...this.search2
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.tableData2 = res.data.records
+            this.total2 = res.data.total
+          }
+        })
+      },
+
+      cancel () {
        this.$emit('change', {
-          type: 'List',
-          isRefresh: !!isRefresh
+          type: 'Detail',
+          isRefresh: false,
+          params: {
+            id: this.params.id
+          }
        })
      }
    }
@@ -266,36 +227,36 @@
 </script>

 <style scoped lang="scss">
-  .AppAnnounceDetail {
-    ::v-deep .AppAnnounceDetail-title {
-      display: flex;
-      align-items: center;
+.AppAnnounceDetail {
+  ::v-deep .AppAnnounceDetail-title {
+    display: flex;
+    align-items: center;

-      span {
-        height: 100%;
-        line-height: 56px;
-        margin-right: 32px;
-        color: #888888;
-        font-size: 16px;
-        font-weight: 600;
-        transition: all ease 0.3s;
-        border-bottom: 3px solid transparent;
-        cursor: pointer;
-        user-select: none;
+    span {
+      height: 100%;
+      line-height: 56px;
+      margin-right: 32px;
+      color: #888888;
+      font-size: 16px;
+      font-weight: 600;
+      transition: all ease 0.3s;
+      border-bottom: 3px solid transparent;
+      cursor: pointer;
+      user-select: none;

-        &:hover {
-          color: #222;
-        }
+      &:hover {
+        color: #222;
+      }

-        &:last-child {
-          margin-right: 0;
-        }
+      &:last-child {
+        margin-right: 0;
+      }

-        &.active {
-          color: #222222;
-          border-bottom: 3px solid #2266FF;
-        }
+      &.active {
+        color: #222222;
+        border-bottom: 3px solid #2266FF;
      }
    }
  }
+}
 </style>