Merge remote-tracking branch 'origin/master'

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

@@ -147,6 +147,7 @@ export default {
                     { required: true, message: '请输入问卷名称', trigger: 'blur' },
                 ]
             },
+            feedbackId: '',
             drawer: 0,
             Frule: [],
             Fopthion: '',
@@ -180,13 +181,17 @@ export default {
     mounted() {
         this.getDeptData()
         // let query = this.$route
-        // console.log(query.query)
-        // if (query.id) {
-        //     console.log(this.$route.query)
+        // if (query.query.id) {
+        //     this.feedbackId = query.query.id
         //     let editFeedback = JSON.parse(localStorage.getItem("editFeedback"))
         //     console.log(editFeedback)
         //     this.titleForm.title = editFeedback.title
         //     this.titleForm.remark = editFeedback.remark
+        //     this.Frule = formCreate.parseJson(editFeedback.formContent)
+        //     this.Fopthion = formCreate.parseJson(editFeedback.ruleContent)
+        //     console.log(this.Frule, '***********', this.Fopthion)
+        //     this.$refs.designer.setRule(this.Frule)
+        //     this.$refs.designer.setOption(this.Fopthion)
         // }
     },
     methods: {
@@ -283,7 +288,7 @@ export default {
                     })
                     let sub = {
                         staffList: this.checkedUser,
-                        id: '',
+                        id: this.feedbackId,
                         ...this.titleForm,
                         feedbackTimeStart: this.issueForm.time[0],
                         feedbackTimeEnd: this.issueForm.time[1],

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

@@ -45,7 +45,7 @@ export default {
         /** 重写编辑方法 */
         toEdit(row) {
             // this.$refs.drawerform.edit(row);
-            this.$router.push({ path: `/feedback/addQuestion/list?id =${row.id}` });
+            this.$router.push({ path: `/feedback/addQuestion/list?id=${row.id}` });
             localStorage.setItem('editFeedback', JSON.stringify(row))
         },
         /** 重写查看方法 */
@@ -102,8 +102,7 @@ export default {
                     //     label: "绩效反馈问题",
                     //     width: 120,
                     //     prop: "subColumns",
-                    //     formatter: (row) => {
-                    //         let widthsize = this.columnSet.reduce((pre, cur) => {
+                    //     formatter: (row) => { 
                     //             return pre + Number(cur.width);
                     //         }, 50);
                     //         return (