Merge remote-tracking branch 'origin/master'

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

@@ -179,6 +179,15 @@ export default {
     },
     mounted() {
         this.getDeptData()
+        // let query = this.$route
+        // console.log(query.query)
+        // if (query.id) {
+        //     console.log(this.$route.query)
+        //     let editFeedback = JSON.parse(localStorage.getItem("editFeedback"))
+        //     console.log(editFeedback)
+        //     this.titleForm.title = editFeedback.title
+        //     this.titleForm.remark = editFeedback.remark
+        // }
     },
     methods: {
         subUser() {

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

@@ -44,12 +44,14 @@ export default {
         },
         /** 重写编辑方法 */
         toEdit(row) {
-            this.$refs.drawerform.edit(row);
+            // this.$refs.drawerform.edit(row);
+            this.$router.push({ path: `/feedback/addQuestion/list?id =${row.id}` });
+            localStorage.setItem('editFeedback', JSON.stringify(row))
         },
         /** 重写查看方法 */
         toView(row) {
             console.log(row)
-            localStorage.setItem('checkFeedbackId',row.id)
+            localStorage.setItem('checkFeedbackId', row.id)
             // this.$refs.drawerform.view(row);
             this.$router.push('/feedback/questionnaire/list')
         },
@@ -86,7 +88,16 @@ export default {
 
                     { label: "反馈人数", prop: "feedbackNum", formatter: this.formatter },
 
-                    { label: "创建用户", prop: "createUserId", formatter: this.formatter },
+                    // { label: "创建用户", prop: "createUserId", formatter: this.formatter },
+                    {
+                        label: "状态", prop: "processStatus", formatter: (row) => {
+                            return (
+                                <el-tag type={row.processStatus ? row.processStatus = 1 ? 'success' : 'info' : 'danger'} size="small">
+                                    {row.processStatus ? row.processStatus = 1 ? '进行中' : '已结束' : '未开始'}
+                                </el-tag>
+                            )
+                        }
+                    },
                     // {
                     //     label: "绩效反馈问题",
                     //     width: 120,