Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue

@@ -59,14 +59,14 @@
 
                 <el-dialog title="问卷发布" :visible.sync="issueDialog" width="30%" top="25vh">
                     <el-form :model="issueForm" :rules="issueRules" ref="issueForm">
-                        <el-form-item label="问卷封面：" label-width="125px">
+                        <!-- <el-form-item label="问卷封面：" label-width="125px">
                             <div style="display: flex;align-items: center;">
                                 <img style="width:80px; height: 50px; margin-right: 10px;cursor: pointer;"
                                     v-for="(i, j) in issueForm.cover" :key="j" :src="i" alt=""
                                     :class="selImg == j ? 'selImg' : ''" @click="selImg = j">
                             </div>
-                            <!-- <el-input v-model="issueForm.cover" autocomplete="off"></el-input> -->
-                        </el-form-item>
+                            <el-input v-model="issueForm.cover" autocomplete="off"></el-input>
+                        </el-form-item> -->
                         <el-form-item label="反馈期限：" label-width="125px" prop="time">
                             <el-date-picker v-model="issueForm.time" type="datetimerange" range-separator="至"
                                 start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">

attendance-performance-manager-ui/admin/src/views/feedback/list.vue

@@ -80,6 +80,8 @@ export default {
 
                     { label: "问卷标题", prop: "title" },
 
+                    { label: "更新时间", prop: "createTime", formatter: this.formatterDate },
+                    
                     { label: "反馈开始时间", prop: "feedbackTimeStart", formatter: this.formatterDate },
 
                     { label: "反馈结束时间", prop: "feedbackTimeEnd", formatter: this.formatterDate },
@@ -91,7 +93,6 @@ export default {
                     // { label: "创建用户", prop: "createUserId", formatter: this.formatter },
                     {
                         label: "状态", prop: "processStatus", formatter: (row) => {
-
                             let str = "未开始"
                             if (row.processStatus == 1) {
                                 str = "进行中"
@@ -133,7 +134,7 @@ export default {
                                     <table-buttons noAdd noEdit row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
                                 );
                             }
-
+                            // return <table-buttons noAdd noEdit row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
                         }
                     }
                 ]