提交

src/api/thought/parliament.js

@@ -50,4 +50,11 @@ export function exportParliament(query) {
     method: 'get',
     params: query
   })
+}
+// 获取所有人员列表
+export function getAll(query) {
+  return request({
+    url: '/grassrootsregistration/common/list',
+    method: 'get',
+  })
 }

src/views/thought/getready/index.vue

@@ -644,7 +644,7 @@
             ></quill-editor>
           </el-form-item>
           <div class="jiben">附件</div>
-          <el-form-item>
+          <el-form-item class="fujian">
             <!-- <FileUpload v-model="form1.fileName" /> -->
             <span class="filename">{{ form1.fileName }}</span>
             <a
@@ -687,7 +687,11 @@ import {
   updateBdglShenPi,
 } from "@/api/grassrootsregistration/bdgldiary";
 import { allUser } from "@/api/workingArrangements/workTask";
-import { getAll, getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+ 
+  getAll
+} from "@/api/thought/parliament";
+import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 // 富文本
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
@@ -853,11 +857,11 @@ export default {
     // 获取所有人员
     getSuoYou() {
       getAll().then((response) => {
-        this.executors = response.rows;
+        this.executors = response.data;
         // 添加的人员
-        this.executor = response.rows;
+        this.executor = response.data;
         // 记录人
-        this.recodeexecutor = response.rows;
+        this.recodeexecutor = response.data;
       });
     },
     // 转义视图不加标签
@@ -1011,6 +1015,10 @@ export default {
 };
 </script>
 <style scoped>
+/* 附件 */
+::v-deep .fujian .el-form-item__content{
+  display: flex;
+}
 /* 备注 */
 .thistext {
   color: white;

src/views/thought/parliament/index.vue

@@ -506,12 +506,13 @@ import {
   addParliament,
   updateParliament,
   exportParliament,
+  getAll
 } from "@/api/thought/parliament";
 // 树形
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 // 单位
-import { getDept2, getAll } from "@/api/grassrootsregistration/bdglmeeting";
+import { getDept2} from "@/api/grassrootsregistration/bdglmeeting";
 // import { getDept2, getAll,getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Parliament",
@@ -610,6 +611,7 @@ export default {
     unit2Format(row) {
       var deptName = "";
       this.recodeexecutor.map((item) => {
+        console.log(item.name)
         row.participants.split(",").forEach((items, index) => {
           if (item.id == items) {
             deptName += item.name + "  ";
@@ -627,11 +629,13 @@ export default {
     // 获取所有人员
     getSuoYou() {
       getAll().then((response) => {
-        this.executors = response.rows;
+        console.log(response)
+        this.executors = response.data;
         // 添加的人员
-        this.executor = response.rows;
+        this.executor = response.data;
         // 记录人
-        this.recodeexecutor = response.rows;
+        this.recodeexecutor = response.data;
+        console.log( this.recodeexecutor)
       });
     },
     // 转义视图不加标签
@@ -738,6 +742,7 @@ export default {
       getParliament(id).then((response) => {
         this.form = response.data;
         this.form.participants = this.form.participants.split(",").map(Number);
+        console.log(this.form.participants)
         this.open = true;
         this.title = "修改党委议教会";
       });

src/views/thought/talk/index.vue

@@ -342,7 +342,7 @@
                 size="btk"
                 type="text"
                 @click="handlelook(scope.row)"
-                v-hasPermi="['thought:talk:edit']"
+                v-hasPermi="['thought:talk:query']"
                 >查看</el-button
               >
               <el-button
@@ -578,7 +578,7 @@
         </el-form-item>
         <div class="jiben">附件</div>
         <!-- <el-form-item> -->
-        <el-form-item>
+        <el-form-item class="fujian">
           <span class="filename">{{ form1.fileName }}</span>
           <a
             :href="form1.filePath"
@@ -956,6 +956,10 @@ export default {
 };
 </script>
 <style scoped>
+/* 附件 */
+::v-deep .fujian .el-form-item__content {
+  display: flex;
+}
 /* 备注 */
 .thistext {
   color: white;