更改要是日记

src/api/grassrootsregistration/personnelRoster.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询领导本查看
+export function getPersonnelRosterList(year) {
+    return request({
+        url: `/grassrootsregistration/personnelRoster/getPersonnelRosterList`,
+        method: 'get',
+        params: { year: year }
+    })
+}
+//  查询领导本列表
+export function getPersonnelRosterOnUnitList(query) {
+    return request({
+        url: '/grassrootsregistration/personnelRoster/getPersonnelRosterOnUnitList',
+        method: 'get',
+        params: query
+    })
+}

src/components/FileUpload/index.vue

@@ -78,12 +78,11 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 50,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+      default: () => ["doc", "xls", "ppt", "txt", "pdf","mp4"],
     },
     // 是否显示提示
     isShowTip: {

src/views/bdglregular/regularinfo/index.vue

@@ -638,10 +638,10 @@
           >确 定</el-button
         >
         <el-button type="primary" @click="tongguofun" v-if="btnnum == 0"
-          >通 过</el-button
+          >通 过1</el-button
         >
         <el-button type="primary" @click="zhenggaifun" v-if="btnnum == 0"
-          >重新整改</el-button
+          >重新整改1</el-button
         >
         <el-button type="primary" @click="weitongguofun" v-if="btnnum == 1"
           >确 定</el-button
@@ -780,6 +780,7 @@
         <el-button @click="open1 = false" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+
     <el-dialog
       :title="title"
       :visible.sync="open3"
@@ -1106,6 +1107,18 @@ export default {
         chargePeople: [
           { required: true, message: "负责人不能为空", trigger: "change" },
         ],
+        question: [
+          { required: true, message: "存在问题或加分事由不能为空", trigger: "change" },
+        ],
+        correctiveAction: [
+          { required: true, message: "整改措施不能为空", trigger: "change" },
+        ],
+        pictureProof: [
+          { required: true, message: "图片举证不能为空", trigger: "change" },
+        ],
+        documentProof: [
+          { required: true, message: "文件举证不能为空", trigger: "change" },
+        ],
       },
       //单位
       unitId: [],
@@ -1371,7 +1384,7 @@ export default {
         this.form = response.data;
         this.disabled = true;
         this.open = true;
-        this.title = "修改经常性检查";
+        this.title = "修改经常性检查1";
         this.jiannum = 1;
         this.btnnum = null;
         this.zg = 3;
@@ -1450,6 +1463,8 @@ export default {
       });
     },
     submitForm2() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
       if (this.form.documentProof) {
         if (typeof this.form.documentProof != "string") {
           let documentProofs = this.form.documentProof;
@@ -1465,6 +1480,8 @@ export default {
         // this.open3=false;
         this.getList();
       });
+    }
+    });
     },
     /** 提交按钮 */
     submitForm() {
@@ -1714,4 +1731,8 @@ hr {
   width: 600px !important;
   height: 33px;
 }
+
+::v-deep .el-link.el-link--default {
+  color: #fff;
+}
 </style>

src/views/bdglregular/specialinfo/index.vue

@@ -979,6 +979,23 @@ export default {
         chargePeople: [
           { required: true, message: "整改负责人不能为空", trigger: "change" },
         ],
+        question: [
+          {
+            required: true,
+            message: "加分事由或存在问题不能为空",
+            trigger: "change",
+          },
+        ],
+        score: [{ required: true, message: "分值不能为空", trigger: "change" }],
+        correctiveAction: [
+          { required: true, message: "整改措施不能为空", trigger: "change" },
+        ],
+        pictureProof: [
+          { required: true, message: "图片举证不能为空", trigger: "change" },
+        ],
+        documentProof: [
+          { required: true, message: "文件举证不能为空", trigger: "change" },
+        ],
       },
       //单位
       unitId: [],
@@ -1177,7 +1194,9 @@ export default {
       this.open = true;
       this.title = "专项检查";
       this.jiannum = 0;
-      this.btnnum = null;
+      this.btnnum = 4;
+      this.disabled = false;
+      this.zg=3;
       var today = new Date();
       var y = today.getFullYear();
       var M = today.getMonth() + 1;
@@ -1214,7 +1233,6 @@ export default {
         this.title = "修改专项检查";
         this.jiannum = 1;
         this.btnnum = null;
-
         this.disabled = true;
         this.zg = 3;
         if (this.form.currentState == "未通过") {
@@ -1285,20 +1303,24 @@ export default {
       });
     },
     submitForm2() {
-      if (this.form.documentProof) {
-        if (typeof this.form.documentProof != "string") {
-          let documentProofs = this.form.documentProof;
-          this.form.documentProof = documentProofs[0].url;
-          this.form.wenjianname = documentProofs[0].name;
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.documentProof) {
+            if (typeof this.form.documentProof != "string") {
+              let documentProofs = this.form.documentProof;
+              this.form.documentProof = documentProofs[0].url;
+              this.form.wenjianname = documentProofs[0].name;
+            }
+          }
+          this.form.caoZuoType = this.queryParams.caoZuoType;
+          editquestion(this.form).then((response) => {
+            this.$modal.msgSuccess("整改成功");
+            this.open = false;
+            this.open3 = false;
+            // this.open3=false;
+            this.getList();
+          });
         }
-      }
-      this.form.caoZuoType = this.queryParams.caoZuoType;
-      editquestion(this.form).then((response) => {
-        this.$modal.msgSuccess("整改成功");
-        this.open = false;
-        this.open3 = false;
-        // this.open3=false;
-        this.getList();
       });
     },
     /** 提交按钮 */
@@ -1536,4 +1558,8 @@ hr {
   width: 600px !important;
   height: 33px;
 }
+
+::v-deep .el-link.el-link--default {
+  color: #fff;
+}
 </style>

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -136,6 +136,16 @@
         <el-table-column label="编制干部" align="center" prop="orgcadre" />
         <el-table-column label="编制战士" align="center" prop="orgsoldier" />
         <el-table-column label="编制文职" align="center" prop="orgcivilian" />
+        <el-table-column label="查铺查哨" align="center" prop="inspect">
+          <template slot-scope="scope">
+            <span style="color: #67c23a" v-if="scope.row.bdglDailyInspectLen != 0"
+              >登记</span
+            >
+            <span style="color: #ff4949" v-if="scope.row.bdglDailyInspectLen == 0"
+              >未登记</span
+            >
+          </template>
+        </el-table-column>
         <el-table-column label="审批" align="center" prop="examine">
           <template slot-scope="scope">
             <span v-if="scope.row.examine == '1'" style="color: #67c23a"
@@ -144,6 +154,11 @@
             <span v-else style="color: #ff4949">未审批</span>
           </template>
         </el-table-column>
+        <el-table-column label="完整度" align="center" prop="completionRatio">
+          <template slot-scope="scope">
+            <span>{{scope.row.completionRatio}}%</span>
+          </template>
+        </el-table-column>
         <el-table-column
           width="250"
           label="操作"

src/views/grassrootsregistration/bdgleven/index.vue

@@ -115,7 +115,12 @@
         </template>
       </el-table-column>
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="出席人" align="center" prop="joinId"  show-overflow-tooltip/>
+      <el-table-column
+        label="出席人"
+        align="center"
+        prop="joinId"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="记录人" align="center" prop="peopleJiLu" /> -->
       <!-- <el-table-column label="会议议题" align="center" prop="title" /> -->
       <el-table-column label="召开地点" align="center" prop="address" />
@@ -274,12 +279,13 @@
           ></quill-editor>
 
           <div class="jiben">会议内容</div>
-          <quill-editor
+          <!-- <quill-editor
             class="quill-editor"
             ref="myTextEditor"
             v-model="form.contents"
             style="height: 150px; width: 920px; margin-left: 0px"
-          ></quill-editor>
+          ></quill-editor> -->
+          <ImageUpload v-model="form.fileUrl"></ImageUpload>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer" v-if="opens">
@@ -287,7 +293,7 @@
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
-    <div class="fff">
+    <!-- <div class="fff">
       <el-dialog
         :visible.sync="menuRoleVisible"
         :title="title"
@@ -301,6 +307,21 @@
           :message="wordInfo"
         ></bdgleven>
       </el-dialog>
+    </div> -->
+
+    <!-- 查看显示图片 -->
+    <div class="fff">
+      <el-dialog
+        :visible.sync="menuRoleVisible"
+        :title="title"
+        append-to-body
+        id="chakan"
+        :close-on-click-modal="false"
+      >
+        <div v-for="item in arr" :key="item" class="divbox">
+          <img :src="baseUrl + item" alt="" />
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -342,6 +363,7 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       //查看页面
       menuRoleVisible: false,
       wordInfo: {},
@@ -429,6 +451,7 @@ export default {
       renYuans: [],
       // 文本显示数字
       str: "",
+      arr: [],
     };
   },
   created() {
@@ -622,9 +645,14 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdgleven(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看连务会记录本";
-        this.menuRoleVisible = true;
+        // this.wordInfo = response.data;
+        if (response.data.fileUrl != null) {
+          if (response.data.fileUrl != "") {
+            this.arr = response.data.fileUrl.split(",");
+            this.title = "查看连务会记录本";
+            this.menuRoleVisible = true;
+          }
+        }
       });
     },
 
@@ -698,8 +726,9 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .chakan .el-dialog {
-  background: red !important;
+#chakan ::v-deep .el-dialog {
+  min-height: 700px;
+  background: #fff !important;
 }
 /* 对话框背景颜色 */
 ::v-deep .el-dialog {
@@ -869,9 +898,29 @@ export default {
   color: #bdbdbd4f !important;
 }
 #chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 0px;
+  padding: 30px 30px 30px 153px;
 }
 ::v-deep .el-select__input {
   color: #fff !important;
 }
+
+/* 图片上传 */
+::v-deep .el-upload--picture-card {
+  background-color: transparent;
+}
+::v-deep .el-upload__tip {
+  color: #fff;
+}
+::v-deep img {
+  object-fit: cover;
+}
+.divbox {
+  width: 1016px !important;
+  min-height: 540px;
+}
+.divbox img {
+  width: 700px;
+  height: 500px;
+  border-radius: 10px;
+}
 </style>

src/views/grassrootsregistration/bdglevens/index.vue

@@ -23,29 +23,29 @@
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-     <div v-if="status ==1">
+    <div v-if="status == 1">
       <ul v-for="(item, i) in lieList" :key="i + ' '">
-          <li v-for="(item1, i1) in item" :key="i1">
-            <div class="names">{{ item1.deptName }}</div>
-            <div class="btn">
-              <el-button size="btJS" @click="chaKan(item1.deptId)"
-                >查看</el-button
-              >
-            </div>
-          </li>
+        <li v-for="(item1, i1) in item" :key="i1">
+          <div class="names">{{ item1.deptName }}</div>
+          <div class="btn">
+            <el-button size="btJS" @click="chaKan(item1.deptId)"
+              >查看</el-button
+            >
+          </div>
+        </li>
       </ul>
-     </div>
-     <!-- 搜索的时候列表 -->
-     <div v-if="status ==0">
+    </div>
+    <!-- 搜索的时候列表 -->
+    <div v-if="status == 0">
       <ul>
-      <li v-for="(item, i) in lieList" :key="i">
-        <div class="names">{{ item.deptName }}</div>
-        <div class="btn">
-          <el-button size="btJS" @click="chaKan(item.deptId)">查看</el-button>
-        </div>
-      </li>
+        <li v-for="(item, i) in lieList" :key="i">
+          <div class="names">{{ item.deptName }}</div>
+          <div class="btn">
+            <el-button size="btJS" @click="chaKan(item.deptId)">查看</el-button>
+          </div>
+        </li>
       </ul>
-     </div>
+    </div>
 
     <!-- 查看第一次 -->
     <el-dialog
@@ -107,7 +107,7 @@
       />
     </el-dialog>
 
-    <!-- 查看第二次 -->
+    <!-- 查看第二次
     <el-dialog
       :visible.sync="menuRoleVisible"
       :title="title"
@@ -121,6 +121,19 @@
         ref="menuRole"
         :message="wordInfo"
       ></bdgleven>
+    </el-dialog> -->
+    <!-- 查看第二次 -->
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+      :before-close="closes"
+    >
+      <div v-for="item in arr" :key="item" class="divbox">
+        <img :src="baseUrl + item" alt="" />
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -135,8 +148,7 @@ import bdgleven from "@/components/look_word/bdgleven.vue";
 export default {
   data() {
     return {
-      lieList: [
-      ],
+      lieList: [],
       //查看页面
       menuRoleVisible: false,
       title: null,
@@ -152,7 +164,9 @@ export default {
       unitId: undefined,
       form: {},
       year: null,
-      status:null
+      status: null,
+      arr: [],
+      baseUrl: process.env.VUE_APP_BASE_API,
     };
   },
 
@@ -161,27 +175,27 @@ export default {
   },
   methods: {
     resetQuery() {
-      this.form.year=null;
+      this.form.year = null;
       getMeetRecordList().then((res) => {
-          res.rows.forEach((item) => {
-           this.status =1
-          });
-          this.lieList = res.rows;
+        res.rows.forEach((item) => {
+          this.status = 1;
         });
+        this.lieList = res.rows;
+      });
     },
     getSoulist() {
       if (this.form.year == null || this.form.year == "") {
         getMeetRecordList().then((res) => {
           res.rows.forEach((item) => {
-           this.status =1
+            this.status = 1;
           });
           this.lieList = res.rows;
         });
       } else {
         getMeetRecordList(this.form.year).then((res) => {
-          res.rows.forEach(item=>{
-            this.status=0
-          })
+          res.rows.forEach((item) => {
+            this.status = 0;
+          });
           this.lieList = res.rows;
         });
       }
@@ -205,13 +219,16 @@ export default {
       });
     },
     handleChakan(row) {
-      this.tableStatus = false;
-      // console.log(row);
       const id = row.id || this.ids;
       getBdgleven(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看连务会记录本";
-        this.menuRoleVisible = true;
+        if (response.data.fileUrl != null) {
+          if (response.data.fileUrl != "") {
+            this.arr = response.data.fileUrl.split(",");
+            this.title = "查看连务会记录本";
+            this.menuRoleVisible = true;
+            this.tableStatus = false;
+          }
+        } 
       });
     },
     // 转义视图不加标签
@@ -359,4 +376,24 @@ li {
   height: 38px;
   line-height: 37px;
 }
+#chakan ::v-deep .el-dialog {
+  min-height: 700px;
+  background: #fff !important;
+}
+
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 30px 30px 153px;
+}
+.divbox {
+  width: 1016px !important;
+  min-height: 540px;
+}
+.divbox img {
+  width: 700px;
+  height: 500px;
+  border-radius: 10px;
+}
+img {
+  object-fit: cover;
+}
 </style>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -1,13 +1,33 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item prop="deptName">
-        <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery" />
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.deptName"
+          @input="handleQuery"
+        />
       </el-form-item>
 
       <el-form-item label="" prop="compereId">
-        <el-select v-model="queryParams.compereId" placeholder="请输入主持人" @change="Renyuan">
-          <el-option v-for="item in renYuans" :key="item.id" :label="item.name" :value="item.id" class="input_xiala">
+        <el-select
+          v-model="queryParams.compereId"
+          placeholder="请输入主持人"
+          @change="Renyuan"
+        >
+          <el-option
+            v-for="item in renYuans"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+            class="input_xiala"
+          >
           </el-option>
         </el-select>
       </el-form-item>
@@ -17,8 +37,15 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['grassrootsregistration:bdglmeeting:add']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['grassrootsregistration:bdglmeeting:add']"
+          >新增</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -58,27 +85,51 @@
       </el-col> -->
     </el-row>
 
-    <el-table v-loading="loading" :data="bdglmeetingList" @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }">
+    <el-table
+      v-loading="loading"
+      :data="bdglmeetingList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center">
         <template scope="scope">
           <span>{{
-          (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
           }}</span>
         </template>
       </el-table-column>
       <el-table-column label="单位" align="center" prop="deptName" />
-      <el-table-column label="召开时间" align="center" prop="convokeTime" width="180">
+      <el-table-column
+        label="召开时间"
+        align="center"
+        prop="convokeTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.convokeTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="召开地点" align="center" prop="address" />
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
-      <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip />
-      <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip />
+      <el-table-column
+        label="参加人"
+        align="center"
+        prop="joinId"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="列席人"
+        align="center"
+        prop="peopleIds"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="缺席人"
+        align="center"
+        prop="absentIds"
+        show-overflow-tooltip
+      />
       <el-table-column label="记录人" align="center" prop="peopleJiLu" />
       <!-- <el-table-column
         label="会议议题"
@@ -91,51 +142,117 @@
           <span>{{ onEditor(scope.row.title) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template slot-scope="scope">
-          <el-button size="btk" type="text" @click="handleChakan(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdgldiary:edit']"><span class="chakan">查看</span></el-button>
-          <el-button size="btu" type="text" @click="handleUpdate(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglmeeting:edit']"><span class="edit">修改</span></el-button>
-          <el-button size="btd" type="text" @click="handleDelete(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglmeeting:remove']"><span class="delete">删除</span></el-button>
+          <el-button
+            size="btk"
+            type="text"
+            @click="handleChakan(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+            ><span class="chakan">查看</span></el-button
+          >
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdglmeeting:edit']"
+            ><span class="edit">修改</span></el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdglmeeting:remove']"
+            ><span class="delete">删除</span></el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改团支部会议登记本对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <div class="userAgree">
         <div class="jiben">基本信息</div>
 
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          :inline="true"
+        >
           <el-form-item label="单位" prop="unitId">
-            <treeselect v-model="form.unitId" :options="deptOptions" placeholder="请选择单位" @select="selectPeo"
-              @open="blurSelect" />
+            <treeselect
+              v-model="form.unitId"
+              :options="deptOptions"
+              placeholder="请选择单位"
+              @select="selectPeo"
+              @open="blurSelect"
+            />
           </el-form-item>
           <el-form-item label="召开时间" prop="convokeTime">
-            <el-date-picker clearable size="small" v-model="form.convokeTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="选择召开时间" :editable="false">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.convokeTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择召开时间"
+              :editable="false"
+            >
             </el-date-picker>
           </el-form-item>
           <el-form-item label="召开地点" prop="address" class="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
           <el-form-item label="主持人" prop="compereId">
-            <el-select v-model="form.compereId" placeholder="请选择主持人" ref="headerSearchSelect">
-              <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"
-                :disabled="item.status == 1" @click.native="compere(item.name)" class="input_xiala">
+            <el-select
+              v-model="form.compereId"
+              placeholder="请选择主持人"
+              ref="headerSearchSelect"
+            >
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.status == 1"
+                @click.native="compere(item.name)"
+                class="input_xiala"
+              >
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="记录人" prop="peopleId">
             <el-select v-model="form.peopleId" placeholder="请选择记录人">
-              <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"
-                @click.native="people(item.name)" class="input_xiala">
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                @click.native="people(item.name)"
+                class="input_xiala"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -144,37 +261,93 @@
         </el-form-item> -->
 
           <el-form-item label="参加人" prop="joinId" class="joinId">
-            <el-select ref="abc" v-model="form1.joinId" multiple placeholder="请选择参加人" class="input_xiala" filterable
-              @remove-tag="removeSelect" @change="changeSelect">
-              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :value="item.name"
-                class="input_xiala" :disabled="item.disabled" :class="item.disabled == true ? 'colors' : ''">
+            <el-select
+              ref="abc"
+              v-model="form1.joinId"
+              multiple
+              placeholder="请选择参加人"
+              class="input_xiala"
+              filterable
+              @remove-tag="removeSelect"
+              @change="changeSelect"
+            >
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+                :disabled="item.disabled"
+                :class="item.disabled == true ? 'colors' : ''"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="列席人" class="joinId">
-            <el-select ref="abcd" v-model="form1.peopleIds" multiple placeholder="请选择列席人" class="input_xiala" filterable
-              @remove-tag="removeSelect" @change="changeSelect">
-              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :disabled="item.disabled"
-                :value="item.name" class="input_xiala" :class="item.disabled == true ? 'colors' : ''">
+            <el-select
+              ref="abcd"
+              v-model="form1.peopleIds"
+              multiple
+              placeholder="请选择列席人"
+              class="input_xiala"
+              filterable
+              @remove-tag="removeSelect"
+              @change="changeSelect"
+            >
+              <el-option
+                v-for="item in renYuans"
+                :key="item.id"
+                :label="item.name"
+                :disabled="item.disabled"
+                :value="item.name"
+                class="input_xiala"
+                :class="item.disabled == true ? 'colors' : ''"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="缺席人" class="joinId">
-            <el-select ref="abcde" v-model="form1.absentIds" multiple placeholder="请选择缺席人" class="input_xiala"
-              filterable @remove-tag="removeSelect" @change="changeSelect">
-              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :value="item.name"
-                :disabled="item.disabled" class="input_xiala" :class="item.disabled == true ? 'colors' : ''">
+            <el-select
+              ref="abcde"
+              v-model="form1.absentIds"
+              multiple
+              placeholder="请选择缺席人"
+              class="input_xiala"
+              filterable
+              @remove-tag="removeSelect"
+              @change="changeSelect"
+            >
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                :disabled="item.disabled"
+                class="input_xiala"
+                :class="item.disabled == true ? 'colors' : ''"
+              >
               </el-option>
             </el-select>
           </el-form-item>
 
           <div class="jiben">会议议题</div>
-          <quill-editor class="quill-editor" ref="myTextEditor" v-model="form.title" style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"></quill-editor>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.title"
+            style=" height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
+          ></quill-editor>
 
           <div class="jiben">会议内容</div>
-          <quill-editor class="quill-editor" ref="myTextEditor" v-model="form.contents" style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"></quill-editor>
+          <ImageUpload v-model="form.fileUrl"></ImageUpload>
+          <!-- <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.contents"
+            style="height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
+          ></quill-editor> -->
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -182,8 +355,30 @@
         <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false">
-      <bdglmeeting v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglmeeting>
+    <!-- 查看 -->
+    <!-- <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+    >
+      <bdglmeeting
+        v-if="menuRoleVisible"
+        ref="menuRole"
+        :message="wordInfo"
+      ></bdglmeeting>
+    </el-dialog> -->
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+    >
+      <div v-for="item in arr" :key="item" class="divbox">
+        <img :src="baseUrl + item" alt="" />
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -323,6 +518,8 @@ export default {
         peopleIds: "",
         absentIds: "",
       },
+      baseUrl: process.env.VUE_APP_BASE_API,
+      arr: [],
     };
   },
   created() {
@@ -372,7 +569,7 @@ export default {
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
-        this.renYuans = res.rows;
+        this.renYuans = res.data;
       });
     },
     // 转义视图不加标签
@@ -393,9 +590,9 @@ export default {
     // 重置表单人员
     ChongZhiRen() {
       // 主持人
-      this.form.compereId = null
+      this.form.compereId = null;
       // 记录人
-      this.form.peopleId = null
+      this.form.peopleId = null;
       // 参加人
       this.form1.joinId = [];
       // 列席人
@@ -547,7 +744,7 @@ export default {
         if (this.result.absentIds !== "" && this.result.absentIds != null) {
           this.form1.absentIds = response.data.absentIds.split(",");
         }
-        this.changeSelect()
+        this.changeSelect();
         this.form = this.result;
         this.open = true;
         this.title = "修改团支部会议登记本";
@@ -560,9 +757,15 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdglmeeting(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看团支部会议登记本";
-        this.menuRoleVisible = true;
+        if (response.data.fileUrl != null) {
+          if (response.data.fileUrl != "") {
+            this.arr = response.data.fileUrl.split(",");
+            this.title = "查看团支部会议登记本";
+            this.menuRoleVisible = true;
+            this.tableStatus = false;
+          }
+        }
+        // this.wordInfo = response.data;
       });
     },
 
@@ -641,7 +844,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -656,7 +859,7 @@ export default {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => { });
+        .catch(() => {});
     },
   },
 };
@@ -857,7 +1060,11 @@ export default {
 }
 
 #chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 0px;
+  padding: 30px 30px 30px 112px;
+}
+#chakan ::v-deep .el-dialog {
+  min-height: 700px;
+  background: #fff !important;
 }
 
 ::v-deep .el-select__input {
@@ -867,4 +1074,23 @@ export default {
 .colors {
   color: #ccc !important;
 }
+/* 图片上传 */
+::v-deep .el-upload--picture-card {
+  background-color: transparent;
+}
+::v-deep .el-upload__tip {
+  color: #fff;
+}
+::v-deep img {
+  object-fit: cover;
+}
+.divbox {
+  width: 1016px !important;
+  min-height: 540px;
+}
+.divbox img {
+  width: 700px;
+  height: 500px;
+  border-radius: 10px;
+}
 </style>

src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -2,94 +2,162 @@
 <template>
   <div class="arr_conten">
     <el-form
-    :model="form"
-    ref="form"
-    :inline="true"
-    label-width="68px"
-    style="padding-left: 30px"
-  >
-    <el-form-item prop="year">
-      <el-date-picker
-        v-model="form.year"
-        type="year"
-        placeholder="选择年"
-        @change="getSoulist"
-        value-format="yyyy"
-        :editable="false"
-      >
-      </el-date-picker>
-    </el-form-item>
-    <el-form-item>
-      <el-button size="btr" @click="resetQuery">重置</el-button>
-    </el-form-item>
-  </el-form>
-  <div v-if="status==1">
-    <ul v-for="(item,i) in lieList" :key="i">
-      <li v-for="(item1, i) in item" :key="i+' '">
-        <div class="names">{{ item1.deptName }}</div>
-        <div class="btn">
-          <el-button size="btJS" @click="chaKan(item1)">查看</el-button>
-        </div>
-      </li>
-    </ul>
-  </div>
-  <div v-if="status==0">
-    <ul>
-      <li v-for="(item, i) in lieList" :key="i">
-        <div class="names">{{ item.deptName }}</div>
-        <div class="btn">
-          <el-button size="btJS" @click="chaKan(item)">查看</el-button>
-        </div>
-      </li>
-    </ul>
-  </div>
+      :model="form"
+      ref="form"
+      :inline="true"
+      label-width="68px"
+      style="padding-left: 30px"
+    >
+      <el-form-item prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年"
+          @change="getSoulist"
+          value-format="yyyy"
+          :editable="false"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div v-if="status == 1">
+      <ul v-for="(item, i) in lieList" :key="i">
+        <li v-for="(item1, i) in item" :key="i + ' '">
+          <div class="names">{{ item1.deptName }}</div>
+          <div class="btn">
+            <el-button size="btJS" @click="chaKan(item1)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div v-if="status == 0">
+      <ul>
+        <li v-for="(item, i) in lieList" :key="i">
+          <div class="names">{{ item.deptName }}</div>
+          <div class="btn">
+            <el-button size="btJS" @click="chaKan(item)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+    </div>
 
     <!-- 查看第一次 -->
-    <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
-      custom-class="lieBiao">
-      <el-table v-loading="loading" :data="bdglpartyList"
-        :header-cell-style="{ background: '#003C69', color: 'white' }">
+    <el-dialog
+      :visible.sync="tableStatus"
+      :title="title"
+      append-to-body
+      id="list"
+      :close-on-click-modal="false"
+      custom-class="lieBiao"
+    >
+      <el-table
+        v-loading="loading"
+        :data="bdglpartyList"
+        :header-cell-style="{ background: '#003C69', color: 'white' }"
+      >
         <el-table-column label="序号" type="index" width="50" align="center">
           <template scope="scope">
             <span>{{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              scope.$index +
+              1
             }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单位" align="center" prop="deptName" />
-        <el-table-column label="召开时间" align="center" prop="convokeTime" width="120">
+        <el-table-column
+          label="召开时间"
+          align="center"
+          prop="convokeTime"
+          width="120"
+        >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.convokeTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
         <el-table-column label="召开地点" align="center" prop="address" />
         <el-table-column label="主持人" align="center" prop="compereRen" />
-        <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
-        <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip />
-        <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip />
+        <el-table-column
+          label="参加人"
+          align="center"
+          prop="joinId"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="列席人"
+          align="center"
+          prop="peopleIds"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="缺席人"
+          align="center"
+          prop="absentIds"
+          show-overflow-tooltip
+        />
         <el-table-column label="记录人" align="center" prop="peopleJiLu" />
         <el-table-column label="会议议题" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>{{ onEditor(scope.row.title) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="100"
+        >
           <template slot-scope="scope">
-            <el-button size="btk" type="text" @click="handleChakan(scope.row)"
-              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"><span class="chakan">查看</span></el-button>
+            <el-button
+              size="btk"
+              type="text"
+              @click="handleChakan(scope.row)"
+              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+              ><span class="chakan">查看</span></el-button
+            >
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="chaKan1" />
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="chaKan1"
+      />
     </el-dialog>
 
     <!-- 查看 -->
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false"
-      :before-close="closes">
-      <bdglmeeting v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglmeeting>
-    </el-dialog>
+    <!-- <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+      :before-close="closes"
+    >
+      <bdglmeeting
+        v-if="menuRoleVisible"
+        ref="menuRole"
+        :message="wordInfo"
+      ></bdglmeeting>
+    </el-dialog> -->
+     <el-dialog
+     :visible.sync="menuRoleVisible"
+     :title="title"
+     append-to-body
+     id="chakan"
+     :close-on-click-modal="false"
+     :before-close="closes"
+   >
+   <div v-for="item in arr" :key="item" class="divbox">
+    <img :src="baseUrl + item" alt="" />
+  </div>
+   </el-dialog>
   </div>
 </template>
 
@@ -97,7 +165,7 @@
 import {
   getMeetingList,
   getBdglmeeting,
-  getMeetingOnUnitList
+  getMeetingOnUnitList,
 } from "@/api/grassrootsregistration/bdglmeeting";
 //引入查看表格
 import bdglmeeting from "@/components/look_word/bdglmeeting.vue";
@@ -118,9 +186,11 @@ export default {
       loading: false,
       total: 0,
       unitId: undefined,
-      form:{},
-      year:null,
-      status:null
+      form: {},
+      year: null,
+      status: null,
+      baseUrl: process.env.VUE_APP_BASE_API,
+      arr: [],
     };
   },
 
@@ -129,26 +199,26 @@ export default {
   },
   methods: {
     resetQuery() {
-      this.form.year=null;
+      this.form.year = null;
       getMeetingList().then((res) => {
         res.rows.forEach((item) => {
-           this.status =1
-          });
-          this.lieList = res.rows;
+          this.status = 1;
         });
+        this.lieList = res.rows;
+      });
     },
     getSoulist() {
-      if (this.form.year == null||this.form.year=="") {
+      if (this.form.year == null || this.form.year == "") {
         getMeetingList().then((res) => {
           res.rows.forEach((item) => {
-           this.status =1
+            this.status = 1;
           });
           this.lieList = res.rows;
         });
       } else {
         getMeetingList(this.form.year).then((res) => {
           res.rows.forEach((item) => {
-           this.status =0
+            this.status = 0;
           });
           this.lieList = res.rows;
         });
@@ -156,7 +226,7 @@ export default {
     },
     chaKan(row) {
       this.queryParams.unitId = row.deptId;
-      this.unitId = row.deptId
+      this.unitId = row.deptId;
       getMeetingOnUnitList(this.queryParams).then((response) => {
         this.bdglpartyList = response.rows;
         this.title = "查看团支部记录本";
@@ -173,12 +243,17 @@ export default {
       });
     },
     handleChakan(row) {
-      this.tableStatus = false;
       const id = row.id || this.ids;
       getBdglmeeting(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看团支部记录本";
-        this.menuRoleVisible = true;
+        if (response.data.fileUrl != null) {
+          if (response.data.fileUrl != "") {
+            this.arr = response.data.fileUrl.split(",");
+            this.title = "查看团支部会议登记本";
+            this.menuRoleVisible = true;
+            this.tableStatus = false;
+          }
+        }
+        // this.wordInfo = response.data;
       });
     },
     // 转义视图不加标签
@@ -193,7 +268,7 @@ export default {
     closes() {
       this.menuRoleVisible = false;
       this.tableStatus = true;
-    }
+    },
   },
   components: {
     bdglmeeting,
@@ -201,7 +276,7 @@ export default {
 
   computed: {},
 
-  mounted() { },
+  mounted() {},
   watch: {},
 };
 </script>
@@ -255,8 +330,6 @@ li {
   text-align: center;
 }
 
-
-
 ::v-deep .lieBiao {
   background: #004d86 !important;
   min-height: 42vh !important;
@@ -282,31 +355,31 @@ li {
 }
 
 ::v-deep .el-pagination .el-select .el-input .el-input__inner {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .btn-prev,
 .el-pagination.is-background .btn-next {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination__editor.el-input .el-input__inner {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .btn-next {
-  background: #00365F !important;
+  background: #00365f !important;
 }
 
 ::v-deep .el-pagination.is-background .el-pager li {
-  background: #00365F;
+  background: #00365f;
 }
 
-::v-deep .el-table__body tr:hover>td{
+::v-deep .el-table__body tr:hover > td {
   background-color: #3c749d !important;
 }
-::v-deep .el-table tr:nth-child(even){
-  background: #00365F;
+::v-deep .el-table tr:nth-child(even) {
+  background: #00365f;
 }
 
 ::v-deep .el-input__inner {
@@ -324,4 +397,25 @@ li {
   height: 38px;
   line-height: 37px;
 }
+#chakan ::v-deep  .el-dialog{
+  min-height: 700px;
+  background: #fff !important;
+}
+
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 30px 30px 132px;
+}
+::v-deep img {
+  object-fit: cover;
+}
+
+.divbox {
+  width: 1016px !important;
+  min-height: 540px;
+}
+.divbox img {
+  width: 700px;
+  height: 500px;
+  border-radius: 10px;
+}
 </style>

src/views/grassrootsregistration/bdglparty/index.vue

@@ -1,13 +1,34 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item prop="unitName">
-        <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery" />
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.unitName"
+          @input="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="" prop="compereId">
-        <el-select v-model="queryParams.compereId" placeholder="请选择主持人" @change="compere" filterable
-          class="input_xiala">
-          <el-option v-for="item in personnel" :key="item.id" :label="item.name" :value="item.id" class="input_xiala">
+        <el-select
+          v-model="queryParams.compereId"
+          placeholder="请选择主持人"
+          @change="compere"
+          filterable
+          class="input_xiala"
+        >
+          <el-option
+            v-for="item in personnel"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+            class="input_xiala"
+          >
           </el-option>
         </el-select>
       </el-form-item>
@@ -17,8 +38,15 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['grassrootsregistration:bdglparty:add']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['grassrootsregistration:bdglparty:add']"
+          >新增</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -57,14 +85,18 @@
         >
       </el-col> -->
     </el-row>
-    <el-table v-loading="loading" :data="bdglpartyList" @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }">
+    <el-table
+      v-loading="loading"
+      :data="bdglpartyList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
         <template scope="scope">
           <span>{{
-          (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
           }}</span>
         </template>
       </el-table-column>
@@ -81,52 +113,127 @@
         </template>
       </el-table-column>
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
+      <el-table-column
+        label="参加人"
+        align="center"
+        prop="joinId"
+        show-overflow-tooltip
+      />
       <el-table-column label="召开地点" align="center" prop="address" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template slot-scope="scope">
-          <el-button size="btk" type="text" @click="handleChakan(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdgldiary:edit']"><span class="chakan">查看</span></el-button>
-          <el-button size="btu" type="text" @click="handleUpdate(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglparty:edit']"><span class="edit">修改</span></el-button>
-          <el-button size="btd" type="text" @click="handleDelete(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglparty:remove']"><span class="delete">删除</span></el-button>
+          <el-button
+            size="btk"
+            type="text"
+            @click="handleChakan(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+            ><span class="chakan">查看</span></el-button
+          >
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdglparty:edit']"
+            ><span class="edit">修改</span></el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdglparty:remove']"
+            ><span class="delete">删除</span></el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改党支部会议登记本对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <div class="userAgree">
         <div class="jiben">基本信息</div>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          :inline="true"
+        >
           <el-form-item label="单位" prop="unitId">
-            <treeselect v-model="form.unitId" :options="deptOptions" placeholder="请选择单位" @select="selectPeo"
-              @open="blurSelect" />
+            <treeselect
+              v-model="form.unitId"
+              :options="deptOptions"
+              placeholder="请选择单位"
+              @select="selectPeo"
+              @open="blurSelect"
+            />
           </el-form-item>
           <el-form-item label="召开时间" prop="convokeTime">
-            <el-date-picker clearable size="small" v-model="form.convokeTime" type="date" :editable="false"
-              value-format="yyyy-MM-dd" placeholder="请选择召开时间">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.convokeTime"
+              type="date"
+              :editable="false"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择召开时间"
+            >
             </el-date-picker>
           </el-form-item>
           <el-form-item label="召开地点" prop="address" class="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
           <el-form-item label="主持人" prop="compereId">
-            <el-select ref="headerSearchSelect" v-model="form.compereId" placeholder="请选择主持人" class="input_xiala">
-              <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"
-                @click.native="ZhuChiRen(item.name)" class="input_xiala">
+            <el-select
+              ref="headerSearchSelect"
+              v-model="form.compereId"
+              placeholder="请选择主持人"
+              class="input_xiala"
+            >
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                @click.native="ZhuChiRen(item.name)"
+                class="input_xiala"
+              >
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="记录人" prop="peopleId">
-            <el-select v-model="form.peopleId" placeholder="请选择记录人" class="input_xiala">
-              <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"
-                @click.native="peoples(item.name)" class="input_xiala">
+            <el-select
+              v-model="form.peopleId"
+              placeholder="请选择记录人"
+              class="input_xiala"
+            >
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                @click.native="peoples(item.name)"
+                class="input_xiala"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -135,37 +242,91 @@
         </el-form-item> -->
 
           <el-form-item label="参加人" prop="joinId" class="joinId">
-            <el-select ref="abc" v-model="form1.joinId" multiple placeholder="请选择参加人" class="input_xiala" filterable
-              @remove-tag="removeSelect" @change="changeSelect">
-              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :value="item.name"
-                class="input_xiala" :disabled="item.disabled" :class="item.disabled == true ? 'colors' : ''">
+            <el-select
+              ref="abc"
+              v-model="form1.joinId"
+              multiple
+              placeholder="请选择参加人"
+              class="input_xiala"
+              filterable
+              @remove-tag="removeSelect"
+              @change="changeSelect"
+            >
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+                :disabled="item.disabled"
+                :class="item.disabled == true ? 'colors' : ''"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="列席人" class="joinId">
-            <el-select ref="abcd" v-model="form1.peopleIds" multiple placeholder="请选择列席人" class="input_xiala" filterable
-              @remove-tag="removeSelect" @change="changeSelect">
-              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :disabled="item.disabled"
-                :value="item.name" class="input_xiala" :class="item.disabled == true ? 'colors' : ''">
+            <el-select
+              ref="abcd"
+              v-model="form1.peopleIds"
+              multiple
+              placeholder="请选择列席人"
+              class="input_xiala"
+              filterable
+              @remove-tag="removeSelect"
+              @change="changeSelect"
+            >
+              <el-option
+                v-for="item in personnel"
+                :key="item.id"
+                :label="item.name"
+                :disabled="item.disabled"
+                :value="item.name"
+                class="input_xiala"
+                :class="item.disabled == true ? 'colors' : ''"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="缺席人" class="joinId">
-            <el-select ref="abcde" v-model="form1.absentIds" multiple placeholder="请选择缺席人" class="input_xiala"
-              filterable @remove-tag="removeSelect" @change="changeSelect">
-              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :value="item.name"
-                :disabled="item.disabled" class="input_xiala" :class="item.disabled == true ? 'colors' : ''">
+            <el-select
+              ref="abcde"
+              v-model="form1.absentIds"
+              multiple
+              placeholder="请选择缺席人"
+              class="input_xiala"
+              filterable
+              @remove-tag="removeSelect"
+              @change="changeSelect"
+            >
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                :disabled="item.disabled"
+                class="input_xiala"
+                :class="item.disabled == true ? 'colors' : ''"
+              >
               </el-option>
             </el-select>
           </el-form-item>
 
           <div class="jiben">会议议题</div>
-          <quill-editor class="quill-editor" ref="myTextEditor" style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;" v-model="form.title"></quill-editor>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            style="height: 150px; width: 920px;margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
+            v-model="form.title"
+          ></quill-editor>
 
           <div class="jiben">会议内容</div>
-          <quill-editor class="quill-editor" ref="myTextEditor" style="height: 150px; width: 920px; margin-left: 0px"
-            v-model="form.contents"></quill-editor>
+          <ImageUpload v-model="form.fileUrl"></ImageUpload>
+          <!-- <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            style="height: 150px; width: 920px; margin-left: 0px"
+            v-model="form.contents"
+          ></quill-editor> -->
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -173,8 +334,31 @@
         <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false">
-      <bdglparty v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglparty>
+    <!-- 查看原来的Word表格 -->
+    <!-- <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+    >
+      <bdglparty
+        v-if="menuRoleVisible"
+        ref="menuRole"
+        :message="wordInfo"
+      ></bdglparty>
+    </el-dialog> -->
+    <!-- 查看图片 -->
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+    >
+      <div v-for="item in arr" :key="item" class="divbox">
+        <img :src="baseUrl + item" alt="" />
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -214,6 +398,8 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      arr: [],
       //查看页面
       menuRoleVisible: false,
       wordInfo: {},
@@ -359,7 +545,8 @@ export default {
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
-        this.personnel = res.rows;
+        console.log(res);
+        this.personnel = res.data;
       });
     },
     // 获取搜索下拉部门
@@ -382,7 +569,7 @@ export default {
       this.form.compereId = null;
       this.form.peopleId = null;
       this.form1.joinId = [];
-      this.form1.peopleIds = []; 
+      this.form1.peopleIds = [];
       this.form1.absentIds = [];
     },
     // 获取主持人
@@ -518,7 +705,7 @@ export default {
         if (this.result.absentIds !== "" && this.result.absentIds != null) {
           this.form1.absentIds = response.data.absentIds.split(",");
         }
-        this.changeSelect()
+        this.changeSelect();
         this.form = this.result;
         this.open = true;
         this.title = "修改党支部会议登记本";
@@ -530,9 +717,14 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdglparty(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看党支部会议登记本";
-        this.menuRoleVisible = true;
+        // this.wordInfo = response.data;
+        if (response.data.fileUrl != null) {
+          if (response.data.fileUrl != "") {
+            this.arr = response.data.fileUrl.split(",");
+            this.title = "查看党支部会议登记本";
+            this.menuRoleVisible = true;
+          }
+        }
       });
     },
 
@@ -612,7 +804,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -627,7 +819,7 @@ export default {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -850,9 +1042,8 @@ export default {
 ::v-deep .el-form-item__error {
   left: 0;
 }
-
 #chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 0px;
+  padding: 30px 30px 30px 112px;
 }
 
 ::v-deep .el-select__input {
@@ -862,4 +1053,28 @@ export default {
 .colors {
   color: #ccc !important;
 }
+#chakan ::v-deep .el-dialog {
+  min-height: 700px;
+  background: #fff !important;
+}
+/* 图片上传 */
+::v-deep .el-upload--picture-card {
+  background-color: transparent;
+}
+::v-deep .el-upload__tip {
+  color: #fff;
+}
+::v-deep img {
+  object-fit: cover;
+}
+
+.divbox {
+  width: 1016px !important;
+  min-height: 540px;
+}
+.divbox img {
+  width: 700px;
+  height: 500px;
+  border-radius: 10px;
+}
 </style>

src/views/grassrootsregistration/bdglpartys/index.vue

@@ -2,47 +2,47 @@
 <template>
   <div class="arr_conten">
     <el-form
-    :model="form"
-    ref="form"
-    :inline="true"
-    label-width="68px"
-    style="padding-left: 30px"
-  >
-    <el-form-item prop="year">
-      <el-date-picker
-        v-model="form.year"
-        type="year"
-        placeholder="选择年"
-        @change="getSoulist"
-        value-format="yyyy"
-        :editable="false"
-      >
-      </el-date-picker>
-    </el-form-item>
-    <el-form-item>
-      <el-button size="btr" @click="resetQuery">重置</el-button>
-    </el-form-item>
-  </el-form>
-   <div v-if="status ==1">
-    <ul v-for="(item, i) in lieList" :key="i + ' '">
-      <li v-for="(item1, i) in item" :key="i">
-        <div class="names">{{ item1.deptName }}</div>
-        <div class="btn">
-          <el-button size="btJS" @click="chaKan(item1)">查看</el-button>
-        </div>
-      </li>
-  </ul>
-   </div>
-   <div v-if="status ==0">
-    <ul>
-      <li v-for="(item, i) in lieList" :key="i">
-        <div class="names">{{ item.deptName }}</div>
-        <div class="btn">
-          <el-button size="btJS" @click="chaKan(item)">查看</el-button>
-        </div>
-      </li>
-  </ul>
-   </div>
+      :model="form"
+      ref="form"
+      :inline="true"
+      label-width="68px"
+      style="padding-left: 30px"
+    >
+      <el-form-item prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年"
+          @change="getSoulist"
+          value-format="yyyy"
+          :editable="false"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div v-if="status == 1">
+      <ul v-for="(item, i) in lieList" :key="i + ' '">
+        <li v-for="(item1, i) in item" :key="i">
+          <div class="names">{{ item1.deptName }}</div>
+          <div class="btn">
+            <el-button size="btJS" @click="chaKan(item1)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div v-if="status == 0">
+      <ul>
+        <li v-for="(item, i) in lieList" :key="i">
+          <div class="names">{{ item.deptName }}</div>
+          <div class="btn">
+            <el-button size="btJS" @click="chaKan(item)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+    </div>
 
     <!-- 查看第一次 -->
     <el-dialog
@@ -58,15 +58,6 @@
         :data="bdglpartyList"
         :header-cell-style="{ background: '#003C69', color: 'white' }"
       >
-        <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{
-              (queryParams.pageNum - 1) * queryParams.pageSize +
-              scope.$index +
-              1
-            }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="序号" type="index" width="50" align="center">
           <template scope="scope">
             <span>{{
@@ -118,7 +109,7 @@
     </el-dialog>
 
     <!-- 查看二次 -->
-    <el-dialog
+    <!-- <el-dialog
       :visible.sync="menuRoleVisible"
       :title="title"
       append-to-body
@@ -131,6 +122,19 @@
         ref="menuRole"
         :message="wordInfo"
       ></bdglparty>
+    </el-dialog> -->
+
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+      :before-close="closes"
+    >
+    <div v-for="item in arr" :key="item" class="divbox">
+      <img :src="baseUrl + item" alt="" />
+    </div>
     </el-dialog>
   </div>
 </template>
@@ -160,9 +164,11 @@ export default {
       loading: false,
       total: 0,
       unitId: undefined,
-      form:{},
-      year:null,
-      status:null
+      form: {},
+      year: null,
+      status: null,
+      baseUrl: process.env.VUE_APP_BASE_API,
+      arr: [],
     };
   },
 
@@ -171,26 +177,26 @@ export default {
   },
   methods: {
     resetQuery() {
-      this.form.year=null;
+      this.form.year = null;
       getPartyList().then((res) => {
         res.rows.forEach((item) => {
-           this.status =1
-          });
-          this.lieList = res.rows;
+          this.status = 1;
         });
+        this.lieList = res.rows;
+      });
     },
     getSoulist() {
-      if (this.form.year == null ||this.form.year=="") {
+      if (this.form.year == null || this.form.year == "") {
         getPartyList().then((res) => {
           res.rows.forEach((item) => {
-           this.status =1
+            this.status = 1;
           });
           this.lieList = res.rows;
         });
       } else {
         getPartyList(this.form.year).then((res) => {
           res.rows.forEach((item) => {
-           this.status =0
+            this.status = 0;
           });
           this.lieList = res.rows;
         });
@@ -215,13 +221,18 @@ export default {
       });
     },
     handleChakan(row) {
-      this.tableStatus = false;
       // console.log(row);
       const id = row.id || this.ids;
       getBdglparty(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看党支部记录本";
-        this.menuRoleVisible = true;
+        if (response.data.fileUrl != null) {
+          if (response.data.fileUrl != "") {
+            this.arr = response.data.fileUrl.split(",");
+            this.title = "查看党支部记录本";
+            this.menuRoleVisible = true;
+            this.tableStatus = false;
+          }
+        }
+        // this.wordInfo = response.data;
       });
     },
     // 转义视图不加标签
@@ -350,8 +361,6 @@ li {
   background: #00365f;
 }
 
-
-
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }
@@ -367,4 +376,24 @@ li {
   height: 38px;
   line-height: 37px;
 }
+#chakan ::v-deep  .el-dialog{
+  min-height: 700px;
+  background: #fff !important;
+}
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 30px 30px 132px;
+}
+::v-deep img {
+  object-fit: cover;
+}
+
+.divbox {
+  width: 1016px !important;
+  min-height: 540px;
+}
+.divbox img {
+  width: 700px;
+  height: 500px;
+  border-radius: 10px;
+}
 </style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -263,7 +263,7 @@
               @change="changeSelect"
             >
               <el-option
-                v-for="item in renYuan"
+                v-for="item in renYuans"
                 :key="item.id"
                 :label="item.name"
                 :disabled="item.disabled"
@@ -307,12 +307,13 @@
           ></quill-editor>
 
           <div class="jiben">会议内容</div>
-          <quill-editor
+          <ImageUpload v-model="form.fileUrl"></ImageUpload>
+          <!-- <quill-editor
             class="quill-editor"
             v-model="form.contents"
             style="height: 150px; width: 920px; 
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          ></quill-editor>
+          ></quill-editor> -->
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -328,7 +329,10 @@
       id="chakan"
       :close-on-click-modal="false"
     >
-      <bdglsoldier v-show="menuRoleVisible" :message="wordInfo"></bdglsoldier>
+      <!-- <bdglsoldier v-show="menuRoleVisible" :message="wordInfo"></bdglsoldier> -->
+      <div v-for="item in arr" :key="item" class="divbox">
+        <img :src="baseUrl + item" alt="" />
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -458,6 +462,8 @@ export default {
         absentIds: "",
       },
       changeArr: [], //存放选中选项的数组
+      baseUrl: process.env.VUE_APP_BASE_API,
+      arr: [],
     };
   },
   created() {
@@ -507,7 +513,7 @@ export default {
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
-        this.renYuans = res.rows;
+        this.renYuans = res.data;
       });
     },
     // 转义视图不加标签
@@ -681,9 +687,14 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdglsoldier(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看军人委员会会议登记本";
-        this.menuRoleVisible = true;
+        if (response.data.fileUrl != null) {
+          if (response.data.fileUrl != "") {
+            this.arr = response.data.fileUrl.split(",");
+            this.title = "查看军人委员会会议登记本";
+            this.menuRoleVisible = true;
+            this.tableStatus = false;
+          }}
+        // this.wordInfo = response.data;
       });
     },
 
@@ -955,8 +966,13 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+
 #chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 0px;
+  padding: 30px 30px 30px 112px;
+}
+#chakan ::v-deep  .el-dialog{
+  min-height: 700px;
+  background: #fff !important;
 }
 ::v-deep .el-select__input {
   color: #fff !important;
@@ -964,4 +980,24 @@ export default {
 .colors {
   color: #ccc !important;
 }
+/* 图片上传 */
+::v-deep .el-upload--picture-card {
+  background-color: transparent;
+}
+::v-deep .el-upload__tip {
+  color: #fff;
+}
+::v-deep img {
+  object-fit: cover;
+}
+
+.divbox {
+  width: 1016px !important;
+  min-height: 540px;
+}
+.divbox img {
+  width: 700px;
+  height: 500px;
+  border-radius: 10px;
+}
 </style>

src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -123,7 +123,7 @@
       />
     </el-dialog>
     <!-- 查看二次-->
-    <el-dialog
+    <!-- <el-dialog
       :visible.sync="menuRoleVisible"
       :title="title"
       append-to-body
@@ -136,7 +136,19 @@
         ref="menuRole"
         :message="wordInfo"
       ></bdglsoldier>
-    </el-dialog>
+    </el-dialog> -->
+    <el-dialog
+    :visible.sync="menuRoleVisible"
+    :title="title"
+    append-to-body
+    id="chakan"
+    :close-on-click-modal="false"
+    :before-close="closes"
+  >
+  <div v-for="item in arr" :key="item" class="divbox">
+    <img :src="baseUrl + item" alt="" />
+  </div>
+  </el-dialog>
   </div>
 </template>
 
@@ -169,6 +181,8 @@ export default {
       form: {},
       year: null,
       status: null,
+      baseUrl: process.env.VUE_APP_BASE_API,
+      arr: [],
     };
   },
 
@@ -228,13 +242,17 @@ export default {
       });
     },
     handleChakan(row) {
-      this.tableStatus = false;
       // console.log(row);
       const id = row.id || this.ids;
       getBdglsoldier(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看军人委员会工作记录本";
-        this.menuRoleVisible = true;
+        if (response.data.fileUrl != null) {
+          if (response.data.fileUrl != "") {
+            this.arr = response.data.fileUrl.split(",");
+            this.title = "查看军人委员会会议登记本";
+            this.menuRoleVisible = true;
+            this.tableStatus = false;
+          }
+        }
       });
     },
     // 转义视图不加标签
@@ -378,4 +396,25 @@ li {
   height: 38px;
   line-height: 37px;
 }
+
+#chakan ::v-deep  .el-dialog{
+  min-height: 700px;
+  background: #fff !important;
+}
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 30px 30px 132px;
+}
+::v-deep img {
+  object-fit: cover;
+}
+
+.divbox {
+  width: 1016px !important;
+  min-height: 540px;
+}
+.divbox img {
+  width: 700px;
+  height: 500px;
+  border-radius: 10px;
+}
 </style>

src/views/peopleManage/people/index.vue

@@ -1446,6 +1446,15 @@ export default {
         deptId: [
           { required: true, message: "单位不能为空", trigger: "change" },
         ],
+        rankId:[
+          { required: true, message: "军衔不能为空", trigger: "change" },
+        ],
+        nowMilitaryRank:[
+          { required: true, message: "现军衔不能为空", trigger: "change" },
+        ],
+        postId:[
+          { required: true, message: "职务层级不能为空", trigger: "change" },
+        ],
         // name: [{ required: true, message: "亲属姓名不能为空", trigger: "blur" }]
         // jtname:[{ validator: jtnameblur, trigger: "blur" }],
         // characterRelationship: [

src/views/pt.vue

@@ -365,7 +365,7 @@
                 <a href="#" class="a">营房管理</a>
               </div>
             </li>
-            <li v-if="str.includes('营具管理') || str.includes('admin')">
+            <li v-if="str.includes('库房管理') || str.includes('admin')">
               <div class="demo-box">
                 <div
                   class="demo active"
@@ -376,7 +376,7 @@
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">营具管理</a>
+                <a href="#" class="a">库房管理</a>
               </div>
             </li>
             <li v-if="str.includes('医疗卫生') || str.includes('admin')">

src/views/regulations/fileinfo/index.vue

@@ -877,6 +877,7 @@ export default {
     },
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
+      console.log(row);
       if (row.parentId == 0) {
         this.parentId = row.id;
       } else {
@@ -887,23 +888,14 @@ export default {
       this.form.directoryId = row.id;
       // 文件
       listFileinfo({
-        directoryId: this.form.directoryId,
+        parentId: this.form.directoryId,
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,
       }).then((res) => {
+        console.log(res.rows);
         this.fileinfoList = res.rows;
-        // this.fileinfoList.map(item=>{
-        //   item.parentDirName='http://localhost:8089'+item.parentDirName;
-
-        // })
         this.total = res.total;
       });
-
-      // if (row.subclassification == 0) {
-      //   this.parentId = "";
-      //   return;
-      // }
-      // this.queryParams1.pageNum=1;
       // 目录
       listDirectoryinfo({
         parentId: this.parentId,

src/views/thought/getready/index.vue

@@ -66,10 +66,6 @@
           >导出</el-button
         > -->
       <!-- </el-col> -->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
       <!-- </el-row> -->
       <el-col :span="20" :xs="24">
         <el-table
@@ -150,17 +146,16 @@
             label="操作"
             align="center"
             class-name="small-padding fixed-width"
-            width="200px"
+            width="300px"
+            fixed="right"
           >
             <template slot-scope="scope">
               <el-button
-                size="read"
+                size="btk"
                 type="text"
                 @click.native="ViewRead(scope.row)"
               >
-                <span>
-                  <a target="_blank">查看资料</a>
-                </span>
+                <a target="_blank">预览</a>
               </el-button>
               <el-button
                 size="btk"
@@ -797,16 +792,23 @@ export default {
       var path = row.filePath;
       var index = path.lastIndexOf(".");
       var str = path.substring(index + 1, path.length);
-      console.log(str);
-      this.open33 = true;
-      axios({
-        method: "get",
-        responseType: "blob", // 设置响应文件格式
-        url: process.env.VUE_APP_BASE_API + row.filePath,
-      }).then(({ data }) => {
-        $(".docx").attr("id", "printArea");
-        docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
-      });
+      if (str == "docx" || str == "doc") {
+        this.open33 = true;
+        axios({
+          method: "get",
+          responseType: "blob", // 设置响应文件格式
+          url: process.env.VUE_APP_BASE_API + row.filePath,
+        }).then(({ data }) => {
+          $(".docx").attr("id", "printArea");
+          docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
+        });
+      } else if (str == "pdf") {
+        this.previewDialog = true;
+        this.pdfurl = process.env.VUE_APP_BASE_API + row.filePath;
+        this.pageNum = 1;
+      } else {
+        this.$message.error("只能预览Doc,Docx,Pdf格式的文件！");
+      }
     },
     // 获取执行人
     unit2Format(row) {
@@ -1407,4 +1409,29 @@ export default {
 ::v-deep .yuedu .el-dialog__body {
   padding-left: 126px !important;
 }
+
+/* 上一页样式 */
+.gopage {
+  width: 60px;
+  height: 28px;
+  background: #f4f4f4;
+  color: #60627d;
+  border-radius: 14px 0px 0px 14px;
+}
+/* 下一页样式 */
+.downpage {
+  width: 60px;
+  height: 28px;
+  background: #f4f4f4;
+  border-radius: 0px 14px 14px 0px;
+}
+.bg {
+  background: #1d96ff;
+  color: white;
+}
+::v-deep 
+.el-table .el-table__fixed-header-wrapper th {
+  background-color: #004d86 ;
+  color: #fff;
+}
 </style>

src/views/thought/parliament/index.vue

@@ -47,10 +47,6 @@
           v-hasPermi="['thought:parliament:export']"
         >导出</el-button> -->
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
     </el-row>
 
     <el-table
@@ -127,17 +123,17 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="300px"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
-            size="read"
-            type="text"
-            @click.native="ViewRead(scope.row)"
-          >
-            <span>
-              <a target="_blank">查看资料</a>
-            </span>
-          </el-button>
+          size="btk"
+          type="text"
+          @click.native="ViewRead(scope.row)"
+        >
+          <a target="_blank">预览</a>
+        </el-button>
           <el-button
             size="btk"
             type="text"
@@ -1247,4 +1243,28 @@ export default {
 ::v-deep .docx {
   width: 100% !important;
 }
+/* 上一页样式 */
+.gopage {
+  width: 60px;
+  height: 28px;
+  background: #f4f4f4;
+  color: #60627d;
+  border-radius: 14px 0px 0px 14px;
+}
+/* 下一页样式 */
+.downpage {
+  width: 60px;
+  height: 28px;
+  background: #f4f4f4;
+  border-radius: 0px 14px 14px 0px;
+}
+.bg {
+  background: #1d96ff;
+  color: white;
+}
+::v-deep 
+.el-table .el-table__fixed-header-wrapper th {
+  background-color: #004d86 ;
+  color: #fff;
+}
 </style>

src/views/thought/teacherFile/index.vue

@@ -127,6 +127,7 @@
               size="read"
               type="text"
               @click.native="ViewRead(scope.row)"
+              v-if="scope.row.parentDirId != '.mp4'"
             >
               <span>
                 <!-- <iframe :src="'http://192.168.5.177:8080'+scope.row.parentDirName" target="_blank">阅读</iframe> -->
@@ -134,6 +135,16 @@
                 <a target="_blank">阅读</a>
               </span>
             </el-button>
+            <el-button
+              size="read"
+              type="text"
+              @click.native="vivdeo(scope.row)"
+              v-if="scope.row.parentDirId == '.mp4'"
+            >
+              <span>
+                <a target="_blank">播放</a>
+              </span>
+            </el-button>
             <el-button size="read" type="text" @click="handleupLoad(scope.row)">
               <span class="chakan1">
                 <a
@@ -438,9 +449,27 @@
               >取 消</el-button
             > -->
           </div>
-          <!-- </div> -->
         </template>
       </el-dialog>
+      <!-- 视频播放 -->
+      <el-dialog
+        :title="title"
+        :visible.sync="vivdeos"
+        width="850px"
+        append-to-body
+        custom-class="video"
+        :close-on-click-modal="false"
+        @close="vueVideo"
+      >
+        <video width="700" height="500" controls ref="vueref">
+          <source :src="downurl+videoUrl" type="video/mp4" />
+        </video>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="videoi"
+            >关 闭</el-button
+          >
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -629,6 +658,9 @@ export default {
       dir: "",
       // 多文件上传
       moreFile: [],
+      // 视频播放
+      vivdeos: false,
+      videoUrl:null
     };
   },
   created() {
@@ -656,6 +688,21 @@ export default {
     Treeselect,
   },
   methods: {
+    vueVideo(){
+      if(this.$refs.vueref.paused==false){
+        this.$refs.vueref.pause()
+      }
+    },
+    videoi(){
+      this.videoUrl=null;
+      this.vivdeos = false;
+    },
+    // 视频播放
+    vivdeo(row) {
+      this.videoUrl=row.parentDirName
+      this.vivdeos = true;
+      this.title = "播放视频";
+    },
     selectPeo1(row) {
       this.dir = row.directory;
       this.form.directoryId = row.id;
@@ -821,7 +868,6 @@ export default {
     // 点击目录
     mulus(row) {
       this.parentId = row.id;
-
       this.parentDirectory = row.parentDirectory;
       this.subclassification = row.subclassification;
       // 文件
@@ -1109,6 +1155,8 @@ export default {
         this.pageNum = 1;
         this.previewDialog = true;
         this.pdfurl = process.env.VUE_APP_BASE_API + row.parentDirName;
+      } else {
+        this.$message.error("只支持Word跟pdt文件！");
       }
       listread(row).then((res) => {
         this.getList();
@@ -1659,4 +1707,8 @@ body,
 ::v-deep .el-input__suffix {
   display: none !important;
 }
+
+::v-deep .video .el-dialog__body{
+  padding: 30px 78px;
+}
 </style>