Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

src/components/orgTree/orgDropDown.vue

@@ -118,7 +118,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
+<style  lang="scss" scoped>
 ::v-deep {
   .vue-treeselect__menu {
     overflow-x: auto !important;

src/views/core/outIn/letter/dialog.addletter.vue

@@ -216,7 +216,7 @@ export default {
         reasons: [{ required: true, message: "请输入出入事由" }],
         letterNo: [{ required: true, message: "请输入介绍信编号" }],
         receptionOrgIds: [{ required: true, message: "请选择接待机构" }],
-        startDate: [{ required: true, message: "请选择开具日期" }],      
+        startTime: [{ required: true, message: "请选择开具日期" }],      
         effectiveDays: [{ required: true, message: "请选择有效天数" }],   
         userInfos: [{ required: true, message: "请添加出入人员" }],
         letterFile:[{ required: true, message: "请上传介绍信" }],
@@ -277,7 +277,7 @@ export default {
 
     async show(id, other = {}) {     
       if (id) {
-        this.title = "修改介绍信";   
+        this.title = "编辑介绍信";   
         this.isShow = true;
         getLetter(id).then((response) => {
           // let tempRange=[];

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -89,9 +89,9 @@
                     </template> 
                </el-table-column>            
           </el-table>
-          <el-row :gutter="10" class="mb8">
+          <el-row :gutter="10">
             <el-col :span="12">
-                <h3 class="title">
+                <h3 >
                   <i class="el-icon-collection-tag"></i>
                   接待机构
                 </h3> 

src/views/core/outIn/letter/index.vue

@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出入事由" prop="reasons">
+      <el-form-item label="来访事由" prop="reasons">
         <el-input
           v-model="queryParams.reasons"
           placeholder="请输入关键字"
@@ -241,7 +241,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除介绍信编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除介绍信编号为 "' + row.letterNo + '" 的数据项？').then(function() {
         return delLetter(ids);
       }).then(() => {
         this.getList();

src/views/resumption/taskManager/index.vue

@@ -2,15 +2,15 @@
   <div class="app-container">
     <el-row :gutter="10">
       <!--机构数据-->
-      <el-col :span="4" :xs="24">
+      <!-- <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
           @defaultOrg="getDefaultOrg"
           @checkChange="checkChange"
           @click="clickTreeNode"
         ></org-tree>
-      </el-col>
-      <el-col :span="20" :xs="24">
+      </el-col> -->
+      <el-col :span="24" :xs="24">
         <div class="main-right-box">
           <!--    搜索条件    -->
           <div class="main-search-box">
@@ -20,8 +20,24 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="100px"
             >
+              <el-form-item label="任务名称" prop="orgId">
+                <div style="display: flex; width: 460px">
+                  <div style="width: 300px; margin-right: 10px">
+                    <orgDropDown
+                      v-model="queryParams.orgId"
+                      placeholder="选择机构"
+                      @select="clickTreeNode"
+                      orgTreeType="org"
+                    />
+                  </div>
+
+                  <el-checkbox v-model="queryParams.checkSub"
+                    >关联下级所有数据</el-checkbox
+                  >
+                </div>
+              </el-form-item>
+
               <!-- <el-row>
                 <el-col :span="5"> -->
               <el-form-item label="任务名称" prop="planId">
@@ -132,7 +148,6 @@
             <el-table-column
               header-align="center"
               align="center"
-              type="index"
               fixed
               width="60px"
               label="序号"
@@ -270,6 +285,7 @@ import { mapGetters } from "vuex";
 import DialogDetail from "./dialog.detail";
 import DialogScanRecord from "./dialog.scanrecord";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
+import orgDropDown from "@/components/orgTree/orgDropDown.vue";
 import OrgTree from "@/components/orgTree";
 import * as api from "@/api/resumption/taskManger.js";
 import { getLabel } from "@/views/commonOption.js";
@@ -278,7 +294,13 @@ import dayjs from "dayjs";
 export default {
   name: "overviewDetialList",
   dicts: ["resumption_plan_cycle", "resumption_status"],
-  components: { DialogDetail, DialogScanRecord, DataRangePicker, OrgTree },
+  components: {
+    DialogDetail,
+    DialogScanRecord,
+    DataRangePicker,
+    OrgTree,
+    orgDropDown,
+  },
   data() {
     let sDate = new Date();
     let eDate = new Date();
@@ -345,7 +367,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["orgName"]),
+    ...mapGetters(["orgName","orgId"]),
   },
   methods: {
     getLabel,
@@ -396,6 +418,9 @@ export default {
     },
     // 节点单击事件
     clickTreeNode(data) {
+      if(data==null){
+        return;
+      }
       this.queryParams.orgId = data.id;
       this.selectedOrgName = data.shortName;
       this.loadPlanList();
@@ -484,6 +509,8 @@ export default {
     },
   },
   async mounted() {
+    this.queryParams.orgId=this.orgId   
+    console.info("this.queryParams.orgId",this.queryParams.orgId)
     // let tabs=this.$tab;
     // debugger
     // const { params, query } = this.$route;

src/views/safetyBook/aqbwbndjh/dialog.des.vue

@@ -0,0 +1,290 @@
+<template>
+  <div class="rule-type">
+    <DialogCom
+      :title="id ? '安全保卫部年度工作计划详情' : '新增安全保卫部年度工作计划'"
+      :visible.sync="isShow"
+      @close="onHide"
+      width="700px"
+    >
+      <div class="page-body">
+        <el-form
+          :model="formData"
+          :rules="formDataRules"
+          size="small"
+          ref="form"
+          label-position="right"
+          label-width="130px"
+          label-prefix=":"
+        >
+          <el-descriptions
+            class="margin-top"
+            :column="1"
+            size="medium"
+            border
+            :label-style="labelStyle"
+            :contentStyle="content_style"
+          >
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="行社名称"
+            >
+              {{ formData.orgName }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="orgId" label="行社名称:">
+                <el-input
+              :readonly="true"
+              v-model="formData.orgName"
+              :disabled="true"
+            ></el-input>
+            </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="文件种类"
+            >
+              {{ formData.type }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="type" label="文件种类:">
+              <el-input :disabled="true" :readonly="true"
+                v-model="formData.type"
+              ></el-input>
+            </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="工作年度"
+            >
+              {{ formData.year }}
+            </el-descriptions-item>
+            <!-- <el-form-item label="工作年度" prop="year">
+                  <el-date-picker :disabled="true" :readonly="true"
+                    v-model="formData.year"
+                    :clearable="timeClearable"
+                    type="year"
+                    placeholder="请选择工作计划年度"
+                    value-format="yyyy"
+                  >
+                  </el-date-picker>
+                </el-form-item> -->
+            <!-- <el-form-item prop="userIds" label="参与人员:" v-if="false">
+              <div>
+                <el-input :disabled="true" :readonly="true"
+                  v-model="joinedStringArray"
+                  placeholder="点击选择"
+                ></el-input>
+                <el-button @click="selectUser">选择</el-button>
+              </div>
+            </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="文件日期"
+            >
+              {{ formData.date }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="date" label="文件日期:">
+              <el-date-picker :disabled="true" :readonly="true"
+                v-model="formData.date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择文件发布日期"
+                type="date"
+                :clearable="false"
+              ></el-date-picker>
+            </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="附件(word、pdf文件格式)"
+            >
+              <imgs-upload
+                :limit="5"
+                v-model="formData.images"
+                :fileSize="2"
+              ></imgs-upload>
+            </el-descriptions-item>
+            <!-- <el-form-item label="上传附件（word、pdf文件格式）" prop="images">
+              <imgs-upload
+                :limit="5"
+                v-model="formData.images"
+                :fileSize="2"
+              ></imgs-upload>
+            </el-form-item> -->
+            <!-- <el-descriptions-item labelClassName="gx_info_label" label="内容" >
+            {{
+            formData.content
+            }}
+          </el-descriptions-item> -->
+          </el-descriptions>
+          <!-- <div>
+              <el-form-item label="内容" prop="content" v-if="false">
+                <Editor style="height: 150px" v-model="formData.content"></Editor>
+              </el-form-item>
+            </div> -->
+        </el-form>
+      </div>
+
+      <div style="margin-top: 100px" slot="footer" class="dialog-footer">
+        <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
+        <el-button @click="isShow = false">确定</el-button>
+      </div>
+    </DialogCom>
+    <UserSelector ref="UserSelector" @select="onUserSelect"></UserSelector>
+  </div>
+</template>
+
+<script>
+import { mapState, mapMutations } from "vuex";
+import { Add, edit, getaqbwbndjh } from "@/api/safetyBook/aqbwbndjh";
+import { deptTreeSelect } from "@/api/system/public";
+import UserSelector from "@/components/userSelector/index.vue";
+import ImgsUpload from "@/components/ImgsUpload";
+import Editor from "@/components/Editor";
+export default {
+  dicts: ["safety_book_type"],
+  components: { UserSelector, ImgsUpload, Editor },
+  data() {
+    return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "150px",
+        "word-break": "break-all",
+      },
+      id: null,
+      isShow: false,
+      timeClearable: true,
+      formData: this.reset(),
+      //修改新增中的机构树
+      deptOptions: [],
+      formDataRules: {
+        userIds: [{ required: true, message: "请选择参与人员" }],
+        date: [{ required: true, message: "请选择记录日期" }],
+        images: [{ required: true, message: "请选择照片" }],
+        content: [{ required: true, message: "请输入内容" }],
+        orgId: [{ required: true, message: "请选择机构" }],
+      },
+    };
+  },
+
+  watch: {},
+  computed: {
+    ...mapState([]),
+    joinedStringArray: {
+      get() {
+        if (this.formData.names == null || this.formData.names == undefined) {
+          this.formData.names = this.formData.userNames.split(", ");
+        }
+        return this.formData.names.join(", ");
+      },
+      set(value) {
+        this.formData.names = value.split(", ");
+      },
+    },
+  },
+  methods: {
+    ...mapMutations([]),
+
+    /** 查询机构树数据 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** treeSelect组件自定义数据*/
+    tenantIdnormalizer(node, instanceId) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.shortName,
+        children: node.children,
+      };
+    },
+
+    reset() {
+      return {
+        id: null,
+        // names: [],
+        // userIds: [],
+        date: null,
+        images: [],
+        // content: null,
+        title: null,
+        orgId: null,
+        type: "工作计划",
+        year: null,
+      };
+    },
+    async refresh(id) {
+      if (id != null && id != undefined) {
+        await getaqbwbndjh(id).then((res) => {
+          // this.formData.names = res.data.userNames.split(",");
+          this.formData = res.data;
+          // this.formData.year=res.data.year;
+        });
+      }
+    },
+    async show(id) {
+      // console.log(id, "id");
+      this.getDeptTree();
+      this.formData = this.reset();
+      this.id = id;
+      await this.refresh(id);
+      this.isShow = true;
+    },
+
+    // 事件
+    onHide() {
+      this.formData = this.reset();
+      this.$refs.form.resetFields();
+    },
+    onSubmit() {
+      console.log(this.formData, "this.formData");
+      this.$refs.form.validate(async (isValidate) => {
+        if (!isValidate) return;
+        if (this.id == null || this.id == undefined) {
+          await Add(this.formData).then((res) => {
+            this.$emit("success");
+            this.isShow = false;
+          });
+        } else {
+          await edit(this.formData).then((res) => {
+            this.$emit("success");
+            this.isShow = false;
+          });
+        }
+      });
+    },
+    //选择用户回调
+    onUserSelect(data) {
+      var ids = data.map((obj) => obj.id);
+      var names = data.map((obj) => obj.name);
+      this.formData.userIds = ids;
+      this.formData.names = names;
+      this.formData.userNames = names.join(",");
+      //   console.log(this.formData.userIds, "this.formData.userIds");
+    },
+    //用户选择
+    selectUser(event) {
+      //   event.preventDefault();
+      this.$refs.UserSelector.show();
+    },
+
+    // 事件
+    //apimark//
+  },
+  mounted() {},
+};
+</script>
+
+<style lang="scss" scoped>
+.brand_info {
+  .el-form {
+    width: 600px;
+    padding-top: 40px;
+  }
+}
+</style>

src/views/safetyBook/aqbwbndjh/dialog.edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="rule-type">
     <DialogCom
-      :title="id ? '编辑安全保卫部年度计划' : '新增安全保卫部年度计划'"
+      :title="id ? '编辑安全保卫部年度工作计划' : '新增安全保卫部年度工作计划'"
       :visible.sync="isShow"
       @close="onHide"
       width="700px"
@@ -16,7 +16,7 @@
           label-width="130px"
           label-prefix=":"
         >
-          <el-form-item prop="orgId" label="选择机构:">
+          <el-form-item prop="orgId" label="行社名称:">
             <tree-select
                 v-model="formData.orgId"
                 :options="deptOptions"
@@ -29,7 +29,22 @@
                 noResultsText="没有搜索结果"
               />
           </el-form-item>
-          <el-form-item prop="userIds" label="参与人员:">
+          <el-form-item prop="type" label="文件种类:">
+            <el-input
+              v-model="formData.type"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="工作年度:" prop="year">
+                <el-date-picker
+                  v-model="formData.year"
+                  :clearable="timeClearable"
+                  type="year"
+                  placeholder="请选择工作计划年度"
+                  value-format="yyyy"
+                >
+                </el-date-picker>
+              </el-form-item>
+          <el-form-item prop="userIds" label="参与人员:" v-if="false">
             <div>
               <el-input
                 :readonly="true"
@@ -39,18 +54,17 @@
               <el-button @click="selectUser">选择</el-button>
             </div>
           </el-form-item>
-          <el-form-item prop="date" label="开会日期:">
+          <el-form-item prop="date" label="文件日期:">
             <el-date-picker
               v-model="formData.date"
-              style="width: 240px"
-              value-format="yyyy-MM-dd hh:mm:ss"
-              placeholder="请选择记录日期"
-              type="datetime"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择文件发布日期"
+              type="date"
               :clearable="false"
             ></el-date-picker>
           </el-form-item>
 
-          <el-form-item label="照片" prop="images">
+          <el-form-item label="上传附件（word、pdf文件格式）" prop="images">
             <imgs-upload
               :limit="5"
               v-model="formData.images"
@@ -58,7 +72,7 @@
             ></imgs-upload>
           </el-form-item>
           <div>
-            <el-form-item label="内容" prop="content">
+            <el-form-item label="内容:" prop="content" v-if="false">
               <Editor style="height: 150px" v-model="formData.content"></Editor>
             </el-form-item>
           </div>
@@ -66,8 +80,9 @@
       </div>
 
       <div style="margin-top: 100px" slot="footer" class="dialog-footer">
-        <el-button @click="isShow = false">取消</el-button>
+       
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="isShow = false">取消</el-button>
       </div>
     </DialogCom>
     <UserSelector ref="UserSelector" @select="onUserSelect"></UserSelector>
@@ -82,11 +97,13 @@ import UserSelector from "@/components/userSelector/index.vue";
 import ImgsUpload from "@/components/ImgsUpload";
 import Editor from "@/components/Editor";
 export default {
+  dicts: ["safety_book_type"],
   components: { UserSelector, ImgsUpload, Editor },
   data() {
     return {
       id: null,
       isShow: false,
+      timeClearable: true,
       formData: this.reset(),
       //修改新增中的机构树
       deptOptions: [],
@@ -139,20 +156,23 @@ export default {
     reset() {
       return {
         id: null,
-        names: [],
-        userIds: [],
+        // names: [],
+        // userIds: [],
         date: null,
         images: [],
-        content: null,
+        // content: null,
         title: null,
         orgId:null,
+        type:"工作计划",
+        year:null,
       };
     },
     async refresh(id) {
       if (id != null && id != undefined) {
         await getaqbwbndjh(id).then((res) => {
-          this.formData.names = res.data.userNames.split(",");
+          // this.formData.names = res.data.userNames.split(",");
           this.formData = res.data;
+          // this.formData.year=res.data.year;
         });
       }
     },

src/views/safetyBook/aqbwbndjh/index.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
-      <!--机构数据-->
-      <el-col :span="4" :xs="24" v-if="false">
+    <!--机构数据-->
+    <!-- <el-col :span="4" :xs="24" v-if="false">
         <org-tree
           v-model="queryParams.orgId"
           @defaultKey="getDefaultKey"
@@ -10,33 +9,82 @@
           @click="clickTreeNode"
           wholeTree
         ></org-tree>
-      </el-col>
-      <!--用户数据-->
-      <el-col :span="24" :xs="24">
+      </el-col> -->
+    <!--用户数据-->
+    <div class="main-right-box">
+      <!--    搜索条件    -->
+      <div class="main-search-box">
         <el-form
           :model="queryParams"
           ref="queryForm"
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="68px"
-        >
-          <el-form-item label="所属年份" prop="year" v-if="false">
-            <el-date-picker
-              v-model="queryParams.year"
-              :clearable="timeClearable"
-              type="year"
-              placeholder="选择时间"
-              value-format="yyyy"
-              @change="handleQuery"
-            >
-            </el-date-picker>
-          </el-form-item>
+          ><el-row :gutter="50">
+            <el-col :span="6" :xs="24">
+              <el-form-item label="工作年度" prop="year">
+                <el-date-picker
+                  v-model="queryParams.year"
+                  :clearable="timeClearable"
+                  type="year"
+                  placeholder="请选择工作年度"
+                  value-format="yyyy"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" :xs="24">
+              <el-form-item label="文件发布日期" prop="range">
+                <DataRangePicker
+                  type="daterange"
+                  :default-time="['00:00:00', '23:59:59']"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  v-model="queryParams.range"
+                >
+                </DataRangePicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+              <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
+                <tree-select
+                  v-model="queryParams.orgId"
+                  :options="deptOptions"
+                  :show-count="true"
+                  :normalizer="tenantIdnormalizer"
+                  :props="{ checkStrictly: true, label: 'name' }"
+                  placeholder="请选择组织机构"
+                  clearValueText="清除"
+                  :noChildrenText="''"
+                  noOptionsText="没有数据"
+                  noResultsText="没有搜索结果"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
               type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="getList"
+              >搜索</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery"
+              >重置</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd(null)"
@@ -50,94 +98,80 @@
             @queryTable="getList"
           ></right-toolbar>
         </el-row>
-        <!-- 表格数据 -->
-        <el-table
-          border
-          height="600"
-          size="small"
-          v-loading="loading"
-          :data="dataList"
-        >
-          <el-table-column
-            label="序号"
-            type="index"
-            align="center"
-            width="60"
-          />
-          <el-table-column
-            label="机构名称"
-            align="left"
-            width="300"
-            prop="orgName"
-          />
-          <el-table-column
-            label="记录人"
-            align="left"
-            prop="userName"
-          >
-
+      </div>
+      <!-- 表格数据 -->
+      <el-table
+        border
+        height="600"
+        size="small"
+        v-loading="loading"
+        :data="dataList"
+      >
+        <el-table-column label="序号" type="index" align="center" width="60" />
+        <el-table-column
+          label="行社名称"
+          align="left"
+          width="300"
+          prop="orgName"
+        />
+        <el-table-column
+          label="工作年度"
+          align="center"
+          width="200"
+          prop="year"
+        />
+        <el-table-column label="文件发布日期" align="center" prop="date">
+          <template slot-scope="r">
+            {{ r.row.date ? dayjs(r.row.date).format("YYYY年-MM月-DD日") : "" }}
+          </template>
         </el-table-column>
-          <el-table-column
-            label="记录时间"
-            align="center"
-            width="180"
-            prop="date"
-          />
 
+        <el-table-column
+          label="操作"
+          fixed="right"
+          align="center"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-info"
+              @click="handleInfo(scope.row.id)"
+              v-hasPermi="['core:aqbwbndjh:query']"
+              >详情
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit-outline"
+              @click="handleAdd(scope.row.id)"
+              v-hasPermi="['core:aqbwbndjh:add']"
+              >编辑
+            </el-button>
 
-          <el-table-column
-            label="操作"
-            fixed="right"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit-view"
-                @click="showImages(scope.row.images)"
-                v-hasPermi="['core:hsggbsdj:query']"
-                >查看照片
-              </el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="handleAdd(scope.row.id)"
-                v-hasPermi="['core:aqbwbndjh:edit']"
-                >编辑
-              </el-button>
-              <!-- <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-info"
-                @click="handleInfo(scope.row)"
-                v-hasPermi="['core:aqbwbndjh:query']"
-                >详情
-              </el-button> -->
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['core:aqbwbndjh:remove']"
-                >删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['core:aqbwbndjh:remove']"
+              >删除
+            </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"
-        />
-      </el-col>
-    </el-row>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
     <dialog-edit ref="editDialog" @success="getList()"></dialog-edit>
+    <dialog-des ref="desDialog" ></dialog-des>
     <el-image-viewer
       v-if="imageViewer"
       :on-close="closeImgViewer"
@@ -154,19 +188,29 @@ import {
   edit,
   delaqbwbndjh,
 } from "@/api/safetyBook/aqbwbndjh";
-import {  getLabel } from "@/views/commonOption";
+import { getLabel } from "@/views/commonOption";
 import DialogEdit from "./dialog.edit";
+import DialogDes from "./dialog.des";
 import { deptTreeSelect } from "@/api/system/public";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import OrgTree from "@/components/orgTree/index.vue";
 import kOrgTree from "@/components/k-orgTree/index.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import tableList from "@/mixins/tableList";
-
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
+import dayjs from "dayjs";
 export default {
   name: "aqbwbndjh",
-  components: { OrgTree, kOrgTree, KFileUpload, DialogEdit,    "el-image-viewer": () =>
-      import("element-ui/packages/image/src/image-viewer"), },
+  components: {
+    OrgTree,
+    kOrgTree,
+    KFileUpload,
+    DialogEdit,
+    DataRangePicker,
+    DialogDes,
+    "el-image-viewer": () =>
+      import("element-ui/packages/image/src/image-viewer"),
+  },
   mixins: [tableList],
   data() {
     return {
@@ -189,7 +233,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 机构树选项
-      deptOptions: undefined,
+      deptOptions: [],
       // 机构名称
       deptName: undefined,
       //是否关联下级
@@ -231,6 +275,22 @@ export default {
     this.getList();
   },
   methods: {
+    dayjs,
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.getList();
+    },
+    /** treeSelect组件自定义数据*/
+    tenantIdnormalizer(node, instanceId) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.shortName,
+        children: node.children,
+      };
+    },
     showImages(file) {
       let array = file.split(",");
       this.srcList = array;
@@ -314,22 +374,21 @@ export default {
     },
 
     /** 详情按钮操作 */
-    handleInfo(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getaqbwbndjh(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "安全责任书详情";
-      });
+    handleInfo(id) {
+      this.$refs.desDialog.show(id);
     },
   },
 };
 </script>
-<style>
+<style lang="scss" scoped>
 .ellipsis {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
+::v-deep.formTreeItem {
+  .el-form-item__content {
+    width: 264px;
+  }
+}
 </style>

src/views/safetyBook/dialog.des.vue

@@ -1,37 +1,50 @@
 <template>
-    <div class="rule-type">
-      <DialogCom
-        :title="id ? '安全责任书存档记录详情' : '新增安全责任书存档记录'"
-        :visible.sync="isShow"
-        @close="onHide"
-        width="800px"
-      >
-        <div class="page-body">
-          <el-form
-            :model="formData"
-            :rules="formDataRules"
-            size="small"
-            ref="form"
-            label-position="right"
-            label-width="180px"
-            label-prefix=":"
+  <div class="rule-type">
+    <DialogCom
+      :title="id ? '安全责任书存档记录详情' : '新增安全责任书存档记录'"
+      :visible.sync="isShow"
+      @close="onHide"
+      width="800px"
+    >
+      <div class="page-body">
+        <el-form
+          :model="formData"
+          :rules="formDataRules"
+          size="small"
+          ref="form"
+          label-position="right"
+          label-width="180px"
+          label-prefix=":"
+        >
+          <el-descriptions
+            class="margin-top"
+            :column="1"
+            size="medium"
+            border
+            :label-style="labelStyle"
+            :contentStyle="content_style"
           >
-            <el-form-item prop="orgName" label="签署人所在机构:" >
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="签署人所在机构"
+            >
+              {{ formData.orgName }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="orgName" label="签署人所在机构:" >
                 <el-input
               :readonly="true"
               v-model="formData.orgName"
               :disabled="true"
             ></el-input>
-              <!-- <tree-select
-                v-model="formData.orgId"
-                :options="deptOptions"
-                :show-count="true"
-                :normalizer="tenantIdnormalizer"
-                :props="{ checkStrictly: true, label: 'name' }"
-                placeholder="请选择签署人所在机构"
-              /> -->
-            </el-form-item>
-            <el-form-item label="所属年度" prop="year">
+             
+            </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="所属年度"
+            >
+              {{ formData.year }}
+            </el-descriptions-item>
+            <!-- <el-form-item label="所属年度" prop="year">
                   <el-date-picker
                   :disabled="true"
                     v-model="formData.year"
@@ -41,8 +54,14 @@
                     value-format="yyyy"
                   >
                   </el-date-picker>
-                </el-form-item>
-            <el-form-item prop="type" label="签署责任书类型:">
+                </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="签署责任书类型"
+            >
+              {{ formData.type }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="type" label="签署责任书类型:">
               <el-select
               :disabled="true"
                 v-model="formData.type"
@@ -56,177 +75,191 @@
                   :value="`${dict.value}`"
                 ></el-option>
               </el-select>
-            </el-form-item>
-          </el-form>
-          <el-button @click="openSelect" v-if="false">上传签署文件</el-button>
-  
-          <el-table :data="tableData" style="width: 100%;margin-top: 10px;" height="500px">
-            <el-table-column prop="names" label="签署人">
-              <template slot-scope="scope">
-                <template v-for="item in scope.row.names">
-                  {{ item }}
-                  <br />
-                </template>
+            </el-form-item> -->
+          </el-descriptions>
+        </el-form>
+        <el-button @click="openSelect" v-if="false">上传签署文件</el-button>
+
+        <el-table
+          :data="tableData"
+          style="width: 100%; margin-top: 10px"
+          height="500px"
+        >
+          <el-table-column prop="names" label="签署人">
+            <template slot-scope="scope">
+              <template v-for="item in scope.row.names">
+                {{ item }}
+                <br />
               </template>
-            </el-table-column>
-            <el-table-column prop="time" label="签署时间">
-                <template slot-scope="r">
-                {{
-                  r.row.time
-                    ? dayjs(r.row.time).format("YYYY年-MM月-DD日")
-                    : ""
-                }}
-              </template> </el-table-column>
-            <el-table-column prop="files" label="签署文件">
-              <template slot-scope="r">
+            </template>
+          </el-table-column>
+          <el-table-column prop="time" label="签署时间">
+            <template slot-scope="r">
+              {{
+                r.row.time ? dayjs(r.row.time).format("YYYY年-MM月-DD日") : ""
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="files" label="签署文件">
+            <template slot-scope="r">
               <el-image
                 style="width: 50px; height: 50px"
                 :src="r.row.files"
                 :preview-src-list="[r.row.files]"
               ></el-image>
             </template>
-               </el-table-column>
-  
-            <el-table-column prop="names" label="操作" v-if="false">
-              <template v-slot="{ row }">
-                <el-button type="text" @click="removeRow(row)">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-  
-        <div slot="footer" class="dialog-footer" style="margin-top: 10px;">
-          <el-button @click="isShow = false">确定</el-button>
-          <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
-        </div>
-     </DialogCom>
-      <DialogSelect ref="DialogSelect" @success="getSign"></DialogSelect>
-    
-    </div>
-  </template>
-  
-  <script>
-  import { mapState, mapMutations } from "vuex";
-  import {
-    listSafetyBook,
-    getSafetyBook,
-    editOrAdd,
-    delSafetyBook,
-  } from "@/api/safetyBook/index";
-  import { deptTreeSelect } from "@/api/system/public";
-  import DialogSelect from "./dialog.sign";
-  import dayjs from "dayjs";
-  export default {
-    dicts: ["safety_book_type"],
-    data() {
+          </el-table-column>
+
+          <el-table-column prop="names" label="操作" v-if="false">
+            <template v-slot="{ row }">
+              <el-button type="text" @click="removeRow(row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <div slot="footer" class="dialog-footer" style="margin-top: 10px">
+        <el-button @click="isShow = false">确定</el-button>
+        <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
+      </div>
+    </DialogCom>
+    <DialogSelect ref="DialogSelect" @success="getSign"></DialogSelect>
+  </div>
+</template>
+
+<script>
+import { mapState, mapMutations } from "vuex";
+import {
+  listSafetyBook,
+  getSafetyBook,
+  editOrAdd,
+  delSafetyBook,
+} from "@/api/safetyBook/index";
+import { deptTreeSelect } from "@/api/system/public";
+import DialogSelect from "./dialog.sign";
+import dayjs from "dayjs";
+export default {
+  dicts: ["safety_book_type"],
+  data() {
+    return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "150px",
+        "word-break": "break-all",
+      },
+      id: null,
+      isShow: false,
+      timeClearable: true,
+      formData: this.reset(),
+      tableData: [],
+      //修改新增中的机构树
+      deptOptions: [],
+      formDataRules: {
+        orgId: [{ required: true, message: "请选择签署责任人所在机构" }],
+        type: [{ required: true, message: "请选择签署责任书类型" }],
+        year: [{ required: true, message: "请选择所属年度" }],
+      },
+    };
+  },
+
+  watch: {},
+  computed: {
+    ...mapState([]),
+  },
+  methods: {
+    ...mapMutations([]),
+    dayjs,
+    //添加签署后回调
+    getSign(data) {
+      this.tableData.push(data);
+      // console.log(data, "ddd");
+    },
+    //新增签署
+    openSelect() {
+      this.$refs.DialogSelect.show();
+    },
+    /** 查询机构树数据 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** treeSelect组件自定义数据*/
+    tenantIdnormalizer(node, instanceId) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
       return {
-        id: null,
-        isShow: false,
-        timeClearable: true,
-        formData: this.reset(),
-        tableData: [],
-        //修改新增中的机构树
-        deptOptions: [],
-        formDataRules: {
-          orgId: [{ required: true, message: "请选择签署责任人所在机构" }],
-          type: [{ required: true, message: "请选择签署责任书类型" }],
-          year: [{ required: true, message: "请选择所属年度" }],
-        },
+        id: node.id,
+        label: node.shortName,
+        children: node.children,
       };
     },
-  
-    watch: {},
-    computed: {
-      ...mapState([]),
+    removeRow(row) {
+      this.tableData = this.tableData.filter((item) => item !== row);
     },
-    methods: {
-      ...mapMutations([]),
-      dayjs,
-      //添加签署后回调
-      getSign(data) {
-        this.tableData.push(data);
-        // console.log(data, "ddd");
-      },
-      //新增签署
-      openSelect() {
-        this.$refs.DialogSelect.show();
-      },
-      /** 查询机构树数据 */
-      getDeptTree() {
-        deptTreeSelect().then((response) => {
-          this.deptOptions = response.data;
-        });
-      },
-      /** treeSelect组件自定义数据*/
-      tenantIdnormalizer(node, instanceId) {
-        if (node.children && !node.children.length) {
-          delete node.children;
-        }
-        return {
-          id: node.id,
-          label: node.shortName,
-          children: node.children,
-        };
-      },
-      removeRow(row) {
-        this.tableData = this.tableData.filter((item) => item !== row);
-      },
-      reset() {
-        return {
-          id: null,
-          type: null,
-          year:null,
-        };
-      },
-      async refresh(id) {
-        if(id!=null&&id!=undefined){
-          await getSafetyBook(id).then((res) => {
-            // console.log(res.data,"res")
-            this.formData=res.data;
-            this.tableData=res.data.bookUsers;
-          });
-        }
-      },
-      async show(id) {
-        // console.log(id, "id");
-        this.getDeptTree();
-        this.formData=this.reset();
-        this.tableData=[];
-        this.id = id;
-        await this.refresh(id);
-        this.isShow = true;
-      },
-  
-      // 事件
-      onHide() {
-        this.formData = this.reset();
-        this.$refs.form.resetFields();
-      },
-      onSubmit() {
-        console.log(this.formData,"this.formData")
-        this.$refs.form.validate(async (isValidate) => {
-          if (!isValidate) return;
-          this.formData.bookUsers=this.tableData;
-          await editOrAdd(this.formData);
-          this.$emit("success");
-          this.isShow = false;
+    reset() {
+      return {
+        id: null,
+        type: null,
+        year: null,
+      };
+    },
+    async refresh(id) {
+      if (id != null && id != undefined) {
+        await getSafetyBook(id).then((res) => {
+          // console.log(res.data,"res")
+          this.formData = res.data;
+          this.tableData = res.data.bookUsers;
         });
-      },
-  
-      // 事件
-      //apimark//
+      }
+    },
+    async show(id) {
+      // console.log(id, "id");
+      this.getDeptTree();
+      this.formData = this.reset();
+      this.tableData = [];
+      this.id = id;
+      await this.refresh(id);
+      this.isShow = true;
+    },
+
+    // 事件
+    onHide() {
+      this.formData = this.reset();
+      this.$refs.form.resetFields();
+    },
+    onSubmit() {
+      console.log(this.formData, "this.formData");
+      this.$refs.form.validate(async (isValidate) => {
+        if (!isValidate) return;
+        this.formData.bookUsers = this.tableData;
+        await editOrAdd(this.formData);
+        this.$emit("success");
+        this.isShow = false;
+      });
     },
-    mounted() {},
-    components: { DialogSelect },
-  };
-  </script>
-  
-  <style lang="scss" scoped>
-  .brand_info {
-    .el-form {
-      width: 600px;
-      padding-top: 40px;
-    }
+
+    // 事件
+    //apimark//
+  },
+  mounted() {},
+  components: { DialogSelect },
+};
+</script>
+
+<style lang="scss" scoped>
+.brand_info {
+  .el-form {
+    width: 600px;
+    padding-top: 40px;
   }
-  </style>
-  
+}
+</style>

src/views/safetyBook/dialog.edit.vue

@@ -26,7 +26,7 @@
               placeholder="请选择签署人所在机构"
             />
           </el-form-item>
-          <el-form-item label="所属年度" prop="year">
+          <el-form-item label="所属年度:" prop="year">
                 <el-date-picker
                   v-model="formData.year"
                   :clearable="timeClearable"

src/views/safetyBook/hsggbsdj/dialog.des.vue

@@ -15,23 +15,48 @@
           label-width="130px"
           label-prefix=":"
         >
-          <el-form-item prop="orgId" label="行社名称:">
+          <el-descriptions
+            class="margin-top"
+            :column="1"
+            size="medium"
+            border
+            :label-style="labelStyle"
+            :contentStyle="content_style"
+          >
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="行社名称"
+            >
+              {{ formData.orgName }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="orgId" label="行社名称:">
             <el-input
               :readonly="true"
               v-model="formData.orgName"
               :disabled="true"
             ></el-input>
-          </el-form-item>
-          <el-form-item prop="title" label="会议主题:">
+          </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="会议主题"
+            >
+              {{ formData.title }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="title" label="会议主题:">
             <el-input
               :disabled="true"
               style="width: 100%; margin-bottom: 20px"
               v-model="formData.title"
               placeholder="请输入会议主题"
             ></el-input>
-          </el-form-item>
-
-          <el-form-item prop="date" label="会议日期:">
+          </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="会议日期"
+            >
+              {{ formData.date }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="date" label="会议日期:">
             <el-date-picker
               :disabled="true"
               v-model="formData.date"
@@ -41,8 +66,11 @@
               type="date"
               :clearable="false"
             ></el-date-picker>
-          </el-form-item>
-          <el-form-item prop="userIds" label="主持人:">
+          </el-form-item> -->
+            <el-descriptions-item labelClassName="gx_info_label" label="主持人">
+              {{ joinedStringArray }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="userIds" label="主持人:">
             <div>
               <el-input
                 :disabled="true"
@@ -52,16 +80,32 @@
               ></el-input>
               <el-button @click="selectUser" v-if="false">选择</el-button>
             </div>
-          </el-form-item>
-          <el-form-item prop="title" label="参会人员:">
+          </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="参会人员"
+            >
+              {{ formData.joinNames }}
+            </el-descriptions-item>
+            <!-- <el-form-item prop="title" label="参会人员:">
             <el-input
               :disabled="true"
               style="width: 100%; margin-bottom: 20px"
               v-model="formData.joinNames"
               placeholder="请输入参会人员"
             ></el-input>
-          </el-form-item>
-          <el-form-item
+          </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="附件(包含不限于会议照片,会议通知等)"
+            >
+              <imgs-upload
+                :limit="5"
+                v-model="formData.images"
+                :fileSize="2"
+              ></imgs-upload>
+            </el-descriptions-item>
+            <!-- <el-form-item
             label="附件(包含不限于会议照片,会议通知等)"
             prop="images"
           >
@@ -70,20 +114,24 @@
               v-model="formData.images"
               :fileSize="2"
             ></imgs-upload>
-          </el-form-item>
-          <div>
-            <el-form-item label="会议重点" prop="content">
-              <!-- <Editor style="height: 150px" v-model="formData.content"></Editor> -->
-              <el-input type="textarea" v-model="formData.content" rows="6" :autosize="{ minRows: 6, maxRows: 10 }"></el-input>
-            </el-form-item>
-          </div>
+          </el-form-item> -->
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="会议重点"
+            >
+              {{ formData.content }}
+            </el-descriptions-item>
+            <!-- <el-form-item label="会议重点" prop="content">
+              
+              <el-input :disable="true" :readonly="true" type="textarea" v-model="formData.content" rows="6" :autosize="{ minRows: 6, maxRows: 10 }"></el-input>
+            </el-form-item> -->
+          </el-descriptions>
         </el-form>
       </div>
 
       <div style="margin-top: 100px" slot="footer" class="dialog-footer">
         <el-button @click="isShow = false">确定</el-button>
         <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
-        
       </div>
     </DialogCom>
     <UserSelector ref="UserSelector" @select="onUserSelect"></UserSelector>
@@ -101,6 +149,18 @@ export default {
   components: { UserSelector, ImgsUpload, Editor },
   data() {
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       id: null,
       isShow: false,
       formData: this.reset(),

src/views/safetyBook/hsggbsdj/dialog.edit.vue

@@ -69,7 +69,7 @@
             ></imgs-upload>
           </el-form-item>
           <div>
-            <el-form-item label="会议重点" prop="content">
+            <el-form-item label="会议重点:" prop="content">
               <Editor style="height: 150px" v-model="formData.content"></Editor>
             </el-form-item>
           </div>
@@ -77,8 +77,9 @@
       </div>
 
       <div style="margin-top: 100px" slot="footer" class="dialog-footer">
-        <el-button @click="isShow = false">取消</el-button>
+       
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="isShow = false">取消</el-button>
       </div>
     </DialogCom>
     <UserSelector ref="UserSelector" @select="onUserSelect"></UserSelector>

src/views/safetyBook/hsggbsdj/index.vue

@@ -37,7 +37,6 @@
               <el-form-item label="会议时间" prop="range">
                 <DataRangePicker
                   type="daterange"
-                  value-format="yyyy-MM-dd HH:mm:ss"
                   :default-time="['00:00:00', '23:59:59']"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"

src/views/system/user/index.vue

@@ -119,7 +119,7 @@
               <el-col :span="1.5">
                 <el-button
                   type="primary"
-                  icon="el-icon-upload2"
+                  icon="el-icon-download"
                   size="mini"
                   @click="handleImport"
                   v-hasPermi="['system:user:import']"
@@ -130,7 +130,7 @@
               <el-col :span="1.5">
                 <el-button
                   type="primary"
-                  icon="el-icon-download"
+                  icon="el-icon-upload2"
                   size="mini"
                   @click="handleExport"
                   v-hasPermi="['system:user:export']"
@@ -140,7 +140,7 @@
               <el-col :span="1.5">
                 <el-button
                   type="primary"
-                  icon="el-icon-download"
+                  icon="el-icon-upload2"
                   size="mini"
                   @click="handleExportManager"
                   v-hasPermi="['system:user:exportManager']"