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/Detail.vue
+++ b/project/hlj/app/AppRatingTask/components/Detail.vue
@@ -9,11 +9,13 @@
        <template #content>
          <ai-wrapper
            label-width="120px">
-            <ai-info-item label="任务名称" :value="info.name"></ai-info-item>
+            <ai-info-item label="任务名称" :value="info.title"></ai-info-item>
            <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
-            <ai-info-item label="更新时间" :value="info.idNumber"></ai-info-item>
-            <ai-info-item label="创建人" :value="info.phone"></ai-info-item>
-            <ai-info-item label="任务完成度" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
+            <ai-info-item label="更新时间" :value="info.updateTime"></ai-info-item>
+            <ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
+            <ai-info-item label="任务完成度" :value="dict.getLabel('tastStatus', info.status)">
+              <span :style="{color: dict.getColor('tastStatus', info.status)}">{{ dict.getLabel('tastStatus', info.status) }}</span>
+            </ai-info-item>
          </ai-wrapper>
        </template>
      </ai-card>
@@ -24,24 +26,23 @@
              <el-button type="primary" @click="isShow = true">添加表单</el-button>
            </template>
            <template #right>
-              <el-input
-                v-model="search.name"
-                size="small"
-                placeholder="请输入参评人姓名"
-                clearable
-                v-throttle="() => {search.current = 1, getList()}"
-                @clear="search.current = 1, search.name = '', getList()"
-                suffix-icon="iconfont iconSearch">
-              </el-input>
            </template>
          </ai-search-bar>
          <ai-table
            :isShowPagination="false"
            tableSize="small"
            border
-            :tableData="info.riskDisposalList"
+            :tableData="info.templateList"
            :col-configs="colConfigs"
            @getList="() => {}">
+            <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+              <template slot-scope="{ row }">
+                <div class="table-options">
+                  <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+                  <el-button type="text" v-if="row.status === '1'" @click="changeStatus(row.id)">停止</el-button>
+                </div>
+              </template>
+            </el-table-column>
          </ai-table>
        </template>
      </ai-card>
@@ -51,37 +52,38 @@
        title="添加表单"
        @onConfirm="onConfirm">
        <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
-          <el-form-item label="选择模板" style="width: 100%" prop="type" :rules="[{required: true, message: '请选择模板', trigger: 'blur'}]">
+          <el-form-item label="选择模板" style="width: 100%" prop="templateId" :rules="[{required: true, message: '请选择模板', trigger: 'change'}]">
            <ai-select
-              v-model="form.type"
+              v-model="form.templateId"
              clearable
+              :selectList="list"
              placeholder="请选择模板">
            </ai-select>
          </el-form-item>
-          <el-form-item label="表单名称" style="width: 100%" prop="name" :rules="[{required: true, message: '请输入任务名称', trigger: 'blur'}]">
-            <el-input v-model="form.name" size="small" placeholder="请输入任务名称"></el-input>
+          <el-form-item label="表单名称" style="width: 100%" prop="templateName" :rules="[{required: true, message: '请输入任务名称', trigger: 'blur'}]">
+            <el-input v-model="form.templateName" size="small" placeholder="请输入任务名称"></el-input>
          </el-form-item>
-          <el-form-item label="参评人员" style="width: 100%" prop="examinesName1" :rules="[{required: true, message: '请选择参评人员', trigger: 'change'}]">
-            <ai-user-selecter :instance="instance" v-model="form.examines" @change="e => onUserChange(e, 'examinesName1')">
+          <el-form-item label="参评人员" style="width: 100%" prop="evaluatorsNames" :rules="[{required: true, message: '请选择参评人员', trigger: 'change'}]">
+            <ai-user-selecter :instance="instance" v-model="form.evaluatorsList" @change="e => onUserChange(e, 'evaluatorsNames')">
              <div class="AppAnnounceDetail-select">
-                <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName1"></el-input>
-                <div class="select-left" v-if="form.examines.length">
-                  <span v-for="(item, index) in form.examines" :key="index">{{ item.name }}</span>
+                <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.evaluatorsNames"></el-input>
+                <div class="select-left" v-if="form.evaluatorsList.length">
+                  <span v-for="(item, index) in form.evaluatorsList" :key="index">{{ item.name }}</span>
                </div>
-                <i v-if="!form.examines.length">请选择</i>
-                <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
+                <i v-if="!form.evaluatorsList.length">请选择</i>
+                <div class="select-right">{{ form.evaluatorsList.length ? '重新选择' : '选择' }}</div>
              </div>
            </ai-user-selecter>
          </el-form-item>
-          <el-form-item label="评分人员" style="width: 100%" prop="examinesName2" :rules="[{required: true, message: '请选择评分人员', trigger: 'change'}]">
-            <ai-user-selecter :instance="instance" v-model="form.examines1" @change="e => onUserChange(e, 'examinesName2')">
+          <el-form-item label="评分人员" style="width: 100%" prop="scorerNames" :rules="[{required: true, message: '请选择评分人员', trigger: 'change'}]">
+            <ai-user-selecter :instance="instance" v-model="form.scorerList" @change="e => onUserChange(e, 'scorerNames')">
              <div class="AppAnnounceDetail-select">
-                <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName2"></el-input>
-                <div class="select-left" v-if="form.examines1.length">
-                  <span v-for="(item, index) in form.examines1" :key="index">{{ item.name }}</span>
+                <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.scorerNames"></el-input>
+                <div class="select-left" v-if="form.scorerList.length">
+                  <span v-for="(item, index) in form.scorerList" :key="index">{{ item.name }}</span>
                </div>
-                <i v-if="!form.examines1.length">请选择</i>
-                <div class="select-right">{{ form.examines1.length ? '重新选择' : '选择' }}</div>
+                <i v-if="!form.scorerList.length">请选择</i>
+                <div class="select-right">{{ form.scorerList.length ? '重新选择' : '选择' }}</div>
              </div>
            </ai-user-selecter>
          </el-form-item>
@@ -91,6 +93,7 @@
              type="daterange"
              size="small"
              range-separator="至"
+              value-format="yyyy-MM-dd"
              start-placeholder="开始日期"
              end-placeholder="结束日期">
            </el-date-picker>
@@ -116,12 +119,12 @@
        info: {},
        form: {
          date: '',
-          name: '',
-          type: '',
-          examines: [],
-          examines1: [],
-          examinesName2: '',
-          examinesName1: ''
+          templateId: '',
+          templateName: '',
+          evaluatorsList: [],
+          scorerList: [],
+          evaluatorsNames: '',
+          scorerNames: ''
        },
        search: {
          current: 1,
@@ -133,10 +136,45 @@
        isLoading: false,
        tableData: [],
        colConfigs: [
-          {prop: 'remarks', label: '异常记录', align: 'center' },
-          {prop: 'createTime', label: '创建时间', align: 'center'},
-          {prop: 'createUserName', label: '记录人', align: 'center' }
+          {prop: 'templateName', label: '表单名称', align: 'center', width: 220 },
+          {prop: 'createUserName', label: '添加人', align: 'center', width: 150 },
+          {
+            prop: 'status',
+            align: 'center',
+            label: '开始结束时间',
+            render: (h, {row}) => {
+              return h('span', {
+              }, `${row.beginTime.split(' ')[0]} - ${row.endTime.split(' ')[0]}`)
+            }
+          },
+          {
+            prop: 'status',
+            align: 'center',
+            width: 300,
+            label: '已填写/剩余份数',
+            render: (h, {row}) => {
+              return h('span', {
+                style: {
+                  width: '300px'
+                }
+              }, `${row.overPhr}/${row.totalPhr}`)
+            }
+          },
+          {
+            prop: 'status',
+            align: 'center',
+            label: '任务状态',
+            width: 100,
+            render: (h, {row}) => {
+              return h('span', {
+                style: {
+                  color: this.dict.getColor('formStatus', row.status)
+                }
+              }, this.dict.getLabel('formStatus', row.status))
+            }
+          }
        ],
+        list: [],
        tabList: ['基本信息', '风险处置']
      }
    },
@@ -144,20 +182,19 @@
    created () {
      if (this.params && this.params.id) {
        this.id = this.params.id
-        // this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => {
-        //   this.getInfo(this.params.id)
-        // })
+        this.$dict.load(['tastStatus', 'formStatus']).then(() => {
+          this.getInfo()
+        })
      }
+
+      this.getList()
    },

    methods: {
-      getInfo (id) {
-        this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
+      getInfo () {
+        this.instance.post(`/app/appassessmentscortask/queryDetailById?id=${this.params.id}`).then(res => {
          if (res.code === 0) {
            this.info = res.data
-            this.info.travelTypeNames = res.data.travelType.split(',').map(v => {
-              return this.dict.getLabel('EP_travelType', v)
-            }).join('，')
          }

          this.isLoading = false
@@ -166,6 +203,40 @@
        })
      },

+      changeStatus (id) {
+        this.$confirm(`确定停用该表单？`).then(() => {
+          this.instance.post(`/app/appassessmentscortask/stopTaskTemplate?id=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success(`停用成功！`)
+              this.getList()
+            }
+          })
+        })
+      },
+
+      getList () {
+        this.instance.post(`/app/appassessmentscoretemplate/list?size=1000`).then(res => {
+          if (res.code == 0) {
+            this.list = res.data.records.map(v => {
+              return {
+                dictValue: v.id,
+                dictName: v.title
+              }
+            })
+          }
+        })
+      },
+
+      toDetail (formId) {
+        this.$emit('change', {
+          type: 'FormDetail',
+          params: {
+            id: this.params.id,
+            formId: formId || ''
+          }
+        })
+      },
+
      onUserChange(e, type) {
        if (e.length) {
          this.form[type] = '1'
@@ -174,14 +245,34 @@
        }
      },

-      onConfirm (id) {
+      onClose () {
+        this.form.date = ''
+        this.form.name = ''
+        this.form.templateId = ''
+        this.form.templateName = ''
+        this.form.evaluatorsList = []
+        this.form.scorerList = []
+        this.form.evaluatorsNames = ''
+        this.form.scorerNames = ''
+      },
+
+      onConfirm () {
        this.$refs.form.validate((valid) => {
          if (valid) {
-            this.isShow = false
-            this.$emit('change', {
-              type: 'Detail',
-              params: {
-                id: id || ''
+            this.instance.post(`/app/appassessmentscortask/addTemplate`, {
+              ...this.form,
+              beginTime: this.form.date[0] + ' 00:00:00',
+              endTime: this.form.date[1] + ' 23:59:59',
+              taskId: this.params.id,
+              evaluatorsNames: this.form.evaluatorsList.map(v => v.name).join(','),
+              scorerNames: this.form.scorerList.map(v => v.name).join(','),
+              date: ''
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功！')
+                this.isShow = false
+
+                this.getInfo()
              }
            })
          }