Merge branch 'master' of http://110.249.213.118:2039/yinet2020/YinetOASystemWeb

src/api/system/archives/archives.js

@@ -23,7 +23,6 @@ export function getArchives(id) {
     method: 'get'
   })
 }
-
 // 新增【请填写功能名称】
 export function addArchives(data) {
   return request({

src/api/system/meapply/meapply.js

@@ -40,7 +40,7 @@ export function examineHistory(query,businessKey) {
 }
 export function ActManager(query) {
   return request({
-    url: '/act/interface/ActManager',
+    url: '/fw/ActManager',
     method: 'get',
     params: query
   })

src/components/SelectRen/index.vue

@@ -107,6 +107,8 @@
           handler() {
             if(this.userIds!="")
               this.userIdsArr = this.userIds.split(',');
+            else
+              this.userIdsArr=[];
           }
         }
       },
@@ -115,10 +117,13 @@
         this.getTreeselect();
         if(this.userIds!="")
           this.userIdsArr = this.userIds.split(',');
+        else
+          this.userIdsArr=[];
       },
       methods:{
         /** 查询用户列表 */
         getList() {
+          //console.log("用户数据重新加载");
           this.loading = true;
           listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
               this.userList = response.rows;
@@ -126,7 +131,7 @@
               this.loading = false;
 
             this.$nextTick(function(){
-              console.log("进入nexttick中："+this.userIds);
+              //console.log("进入nexttick中userids："+this.userIds);
               this.checked(this.userIds);//每次更新了数据，触发这个函数即可。
             })
           });
@@ -186,9 +191,9 @@
         },
         //行选中
         handleCurrentChange(row, event, column) {
-          var same=false;
+          let same=false;
           if(this.userIdsArr.length > 0){
-            for(var i=0; i<this.userIdsArr.length ;i++){
+            for(let i=0; i<this.userIdsArr.length ;i++){
               if(this.userIdsArr[i]==row.userName){
                 same=true;
                 break;
@@ -208,14 +213,6 @@
             this.$emit('fatherFunction',row.userName,row.nickName);
           }
         },
-        removeByValue(arr, val){
-          for (var i = 0; i < arr.length; i++) {
-            if (arr[i] == val) {
-              arr.splice(i, 1);
-              break;
-            }
-          }
-        },
         checked(userids){
           let selectUsers = [];
           selectUsers = userids.split(',');

src/components/SelectRen/selectUserByDept.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 选择人员对话框 -->
-  <el-dialog style="z-index: 2093 !important;" :title="this.title" :visible.sync="childOpen" width="1000px" append-to-body  destroy-on-close="true" >
-    <SelectRen ref="renlist" :userIds="receiverAccount" @fatherFunction = "selectChange" @removeFunction="removeSelectuser"/>
+  <!-- 选择人员对话框  -->
+  <el-dialog :title="this.title" :visible.sync="childOpen" width="1000px" append-to-body :destroy-on-close="true" >
+    <SelectRen v-if="this.open" ref="renlist" :userIds="receiverAccount" @fatherFunction = "selectChange" @removeFunction="removeSelectuser"/>
 
     <div slot="footer" class="dialog-footer">
       <el-button @click="cancel">取 消</el-button>
@@ -26,16 +26,18 @@
           receiverAccount: "", // 收件人的账号
         };
       },
+      created(){
+        this.receiverAccount = this.inputAccount;
+        this.receiverName = this.inputName;
+      },
       methods:{
         // 人员选择器----取消按钮
         cancel() {
-          this.open = false;
-          this.childOpen=false;
           this.filterText='';
-          // alert("取消前"+this.receiverAccount);
-          // alert("取消input:"+this.inputAccount);
           this.receiverAccount =this.inputAccount;
           this.receiverName = this.inputName;
+          //this.open = false;
+          this.childOpen=false;
         },
         /** 人员选择器中的 选定按钮操作 */
         submitRen(){
@@ -69,7 +71,6 @@
         },
         /**  人员取消选择  */
         removeSelectuser(zh,xm){
-          console.log("去除已选择的数据=="+zh+"=="+xm);
           let zhArr = this.receiverAccount.split(',');
           let xmArr = this.receiverName.split(',');
 
@@ -91,18 +92,8 @@
         },
         inputAccount(val) {
             this.receiverAccount = this.inputAccount;
-            //alert("监听ry后："+this.receiverAccount);
+            this.receiverName = this.inputName;
         }
       }
     }
 </script>
-
-<style scoped>
-  /*.v-modal{*/
-  /*  z-index: 1800 !important;*/
-  /*}*/
-  /*.el-dialog__wrapper{*/
-  /*  z-index: 2093 !important;*/
-  /*}*/
-
-</style>

src/components/files/option.vue

@@ -0,0 +1,155 @@
+<template>
+    <div style="padding: 0 30px">
+            <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+              <el-form-item label="档案归属" prop="documentType">
+                <el-input v-model="form.deptId" v-show="false"></el-input>
+                  <el-input title="选择归属部门" v-model="form.archivesType" placeholder="选择归属部门" prop="avtiveSend" :disabled="true">
+                    <template slot="append">
+                      <el-button
+                        type="primary"
+                        icon="el-icon-plus"
+                        size="mini"
+                        @click="handleSelectDept">
+                        选择部门
+                      </el-button>
+                    </template>
+                  </el-input>
+              </el-form-item>
+              <el-form-item label="档案名称" prop="archivesName">
+                <el-input v-model="form.archivesName" placeholder="请输入档案名称" />
+              </el-form-item>
+              <el-form-item label="档案actkey" prop="actkey">
+                <el-input v-model="form.actkey" placeholder="请输入档案名称" />
+              </el-form-item>
+              <el-form-item label="档案id" prop="taskid">
+                <el-input v-model="form.taskId" placeholder="请输入档案名称" />
+              </el-form-item>
+
+              <el-button type="primary" @click="submit()">归档</el-button>
+
+            </el-form>
+      <el-dialog :title="tctitle" :visible.sync="deptOpen" width="20%" append-to-body style="size: 30px">
+        <el-tree
+          :data="deptOptions"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          default-expand-all
+          @node-click="handleNodeClick"
+          empty-text="加载中，请稍后"
+          :props="defaultProps"
+        ></el-tree>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="getDeptAll">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+
+      </el-dialog>
+    </div>
+</template>
+
+<script>
+  import { addArchives } from "@/api/system/archives/archives.js";
+  import { listDept } from "@/api/system/archives/column.js";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+  export default {
+    name: 'option',
+    components: {
+      Treeselect
+    },
+    props:['optiontitle','optionactkey','optionid'],
+    data(){
+      return{
+        depid: [],
+        depname: [],
+        deptOpen:false,
+        // 部门树选项
+        deptOptions: [],
+        defaultProps: {
+          children: "children",
+          label: "deptName"
+        },
+        doc:[],
+        options:[],
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        }
+      }
+    },
+    created() {
+      this.getList();
+      this.option();
+    },
+    methods:{
+
+      // 筛选节点
+      filterNode(value, data) {
+        if (!value) return true;
+        return data.leabel.indexOf(value) !== -1;
+      },
+      // 节点单击事件
+      handleNodeClick(data) {
+        console.log(data)
+        if(data.children.length == 0 ){
+          this.form.deptId = data.deptId;
+          this.form.parentId = data.parentId;
+          this.form.archivesType = data.deptName;
+        }else{
+          return false
+        }
+
+      },
+
+      option(){
+        this.form.archivesName = this.optiontitle;
+        this.form.actkey = this.optionactkey;
+        this.form.taskId = this.optionid;
+      },
+
+      /** 查询文档列表 */
+      getList() {
+        this.loading = true;
+        listDept(this.queryParams).then(response => {
+          console.log(response.data)
+          this.deptOptions = this.handleTree(response.data, "deptId");
+          console.log(this.deptOptions)
+          // this.doc = this.handleTree(response.data, "deptId");
+          this.loading = false;
+        });
+      },
+      submit(){
+
+        addArchives(this.form).then(response => {
+            this.msgSuccess("成功");
+        });
+      },
+      getDeptAll(){
+        this.deptOpen = false;
+      },
+      cancel() {
+        this.$emit('getList');
+        this.contentOpen = false;
+        this.deptOpen = false;
+        this.reset();
+
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          everyone: undefined,
+        };
+        this.resetForm("form");
+      },
+      handleSelectDept() {
+        this.deptOpen = true;
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/system/actwork/actManager.vue

@@ -20,7 +20,7 @@
       </el-col>
     </el-row>
 
-    <el-table border :data="infoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" type="index" width="130" align="center"></el-table-column>
       <el-table-column label="流程名称" width="180" align="center" prop="taskName"/>
       <el-table-column label="标题" align="center" prop="title"/>
@@ -125,7 +125,7 @@
     <!-- 删除原因 -->
     <el-dialog   :visible.sync="qsshow" width="500px" append-to-body>
 
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"  v-loading="xxloading" >
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"   >
         <el-form-item label="删除原因" prop="cause">
         <el-input
           type="textarea"
@@ -166,11 +166,8 @@
           cause: [
             { required: true, message: '删除原因不能为空', trigger: 'blur' },
           ]},
-
         // 删除原因弹出层弹出层
         qsshow: false,
-        //删除原因
-
         //流程遮罩层
         actOpen: false,
         //传入到下一页面的值
@@ -192,23 +189,7 @@
         multiple: true,
         // 总条数
         total: 0,
-        // 【请填写功能名称】表格数据
-        infoList: [
-          {
-            title:'',
-            taskName:'',
-            applyUser:'',
-            createUserName :'',
-            taskid: '',
-            fwtitle: '',
-            fwdept: '',
-            create_time: '',
-            dispose: '',
-            definitionId:'',
-            businessKey:''
-          }
-
-        ],
+        infoList: [],
         //审批历史
         historyExamine: [
           {
@@ -255,7 +236,7 @@
       this.getAllList();
     },
     methods: {
-      /*我的申请进度查看*/
+      /*进度查看*/
       planLook(row,businessKey) {
         var formdata = new FormData
         formdata.append('pProcessInstanceId', row)
@@ -263,13 +244,10 @@
         recordImg(formdata).then(response => {
           this.picUrl = window.URL.createObjectURL(response)
         })
-
         examineHistory(row,businessKey).then(response => {
-
           this.historyExamine = response.rows;
           console.log(response.rows)
         })
-
         this.dialogVisible = true
       },
       detern(actkey,id) {
@@ -284,15 +262,14 @@
         this.actOpen = true
         return vue.actForm = this.actForm
       },
-      deleteTask(actkey,id,dispose) {
 
+      deleteTask(actkey,id,dispose) {
         this.qsshow=true;
         this.$refs["ruleForm"].resetFields();
         this.deleteActkey=actkey;
         this.deleteId=id,
         this.deleteDispose=dispose;
         this.cause='';
-
       },
       confirm(formName){
         this.$refs[formName].validate((valid) => {
@@ -320,15 +297,13 @@
             return false;
           }
         });
-
-
       },
       /** 所有申请流程列表 */
       getAllList() {
         this.loading = true
         ActManager(this.queryParams).then(response => {
           this.infoList = response.rows
-          this.total = response.total
+          this.total = response.rows[0].total
           this.loading = false
         })
       },
@@ -373,49 +348,8 @@
         this.single = selection.length != 1
         this.multiple = !selection.length
       },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset()
-        this.open = true
-        this.title = '添加【请填写功能名称】'
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset()
-        const mailGuid = row.mailGuid || this.ids
-        getInfo(mailGuid).then(response => {
-          this.form = response.data
-          this.open = true
-          this.title = '修改'
-        })
-      },
-      handleUpdate1(row) {
-        this.reset()
-        const mailGuid = row.mailGuid || this.ids
-        this.$router.push({ path: '/email/draftList/draftinfo', query: { id: mailGuid } })
-        getInfo(mailGuid).then(response => {
-          this.form = response.data
-          // this.open = true;
-          // this.title = "修改";
-        })
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const mailGuids = row.mailGuid || this.ids
-        const flg = row.flg || this.ids
-        let len = flg.length
-        this.$confirm('是否确认删除这' + len + '封邮件?', '警告', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(function() {
-          return delInfo(mailGuids)
-        }).then(() => {
-          this.getAllList()
-          this.msgSuccess('删除成功')
-        }).catch(function() {
-        })
-      }
+
+
     }
   }
 </script>

src/views/system/actwork/havedone.vue

@@ -99,10 +99,11 @@
            <el-button @click="cancel">关 闭</el-button>
       </span>
     </el-dialog>
-    <el-dialog id="actform" title="流程详情" :visible.sync="actOpen" :before-close="cancel" append-to-body width="80%"
-               top="10" height="90%">
+    <el-dialog id="actform" title="流程详情" :visible.sync="actOpen" :before-close="cancel" append-to-body width="80%" top="10" height="90%">
       <!-- 动态引入组件-->
       <component :is="actForm" :data="details":actOpen="actOpen" @getList="getList" ></component>
+
+
     </el-dialog>
   </div>
 </template>
@@ -111,6 +112,7 @@
   import { havedInfo } from "@/api/activiti/form/fw";
   import { recordImg, examineHistory } from '@/api/system/meapply/meapply'
   import {getStartFormKey } from '@/api/activiti/process/startprocess'
+
   export default {
     name: 'havedone',
     data(){
@@ -206,10 +208,7 @@
           this.historyExamine = response.rows;
           console.log(response.rows)
         })
-
       },
-
-
       /** 查询列表 */
       getList() {
         this.loading = true;

src/views/system/actwork/todo.vue

@@ -39,38 +39,38 @@
         </el-form>
       </el-col>
     </el-row>
-    <el-table border :data="infoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
+    <el-table border  :data="infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="55" align="center"></el-table-column>
-      <el-table-column label="流程名称" width="180" align="center" prop="taskName">
+      <el-table-column label="流程名称" width="180" align="center"prop="taskName"  >
       </el-table-column>
-      <el-table-column label="标题" align="center" prop="title"/>
-      <el-table-column label="当前处理" width="180" align="center" prop="name"/>
-      <el-table-column label="到达时间" width="180" align="center" prop="createTime">
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="当前处理" width="180" align="center" prop="name" />
+      <el-table-column label="到达时间" width="180" align="center" prop="createTime" >
         <template slot-scope="scope">
           <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="到达时间" width="180" align="center" prop="updateTime" >
-         <template slot-scope="scope">
-           <span>{{scope.row.updateTime | format('yyyy-MM-dd hh:mm')}}</span>
-         </template>
-       </el-table-column>-->
-      <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
+     <!-- <el-table-column label="到达时间" width="180" align="center" prop="updateTime" >
+        <template slot-scope="scope">
+          <span>{{scope.row.updateTime | format('yyyy-MM-dd hh:mm')}}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="small"
             type="text"
             icon="el-icon-edit"
-            @click="openactform(scope.row.processInstanceId,scope.row.businessKey)"
-          >办理
-          </el-button>
-          <!--  <el-button
-              size="small"
-              type="text"
-              icon="el-icon-share"
-              @click="details(scope.row)"
-            >审批进度</el-button>-->
+            @click="openactform(scope.row.processDfinitionId,scope.row.businessKey,scope.row.name,scope.row.title)"
+          >办理</el-button>
+
+        <!--  <el-button
+            size="small"
+            type="text"
+            icon="el-icon-share"
+            @click="details(scope.row)"
+          >审批进度</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -85,31 +85,36 @@
     <el-dialog id="actform" title="流程详情" :visible.sync="actOpen" :before-close="cancel" append-to-body width="80%"
                top="10" height="90%">
       <!-- 动态引入组件-->
-      <component :is="actForm" :data="details" :actOpen="actOpen" @getList="getList"></component>
+      <component :is="actForm" :data="details":actOpen="actOpen" @getList="getList" ></component>
+
+      <Option :optiontitle="optiontitle" :optionactkey="optionactkey" :optionid="optionid" v-show="optiontrue"></Option>
     </el-dialog>
 
   </div>
 </template>
 
 <script>
-  import { toDoItemListInfo } from '@/api/activiti/form/fw'
-  import { getCurrentFlowFormKey } from '@/api/activiti/process/startprocess'
-
+  import {toDoItemListInfo} from "@/api/activiti/form/fw";
+  import {getStartFormKey } from '@/api/activiti/process/startprocess'
+  import Option from "@/components/files/option";
   export default {
     name: 'todo',
-
-    data() {
+    components: {Option},
+    data(){
       return {
         //流程遮罩层
         actOpen: false,
         //传入到下一页面的值
-        details: {
-          getactkey: '',
-          formId: '',
-          flg: '1'
+        details:{getactkey: '',
+        formId:'',
+        flg:'1',
         },
-        dialogVisible: false,
-        tabPosition: 'left',
+        dialogVisible:false,
+        tabPosition:'left',
+        optiontrue:false,
+        optiontitle:'',
+        optionactkey:'',
+        optionid:'',
         // 遮罩层
         loading: true,
         // 选中数组
@@ -122,9 +127,10 @@
         // 总条数
         total: 0,
         // 【请填写功能名称】表格数据
-        infoList: [],
+        infoList: [
+        ],
         // 弹出层标题
-        title: '',
+        title: "",
         // 是否显示弹出层
         open: false,
         actForm: null,
@@ -132,32 +138,43 @@
         toDoParams: {
           pageNum: 1,
           pageSize: 10,
-          orderByColumn: 'createTime',
-          isAsc: 'desc'//排序方式
+          orderByColumn: "createTime",
+          isAsc:"desc",//排序方式
         },
         // 表单参数
         form: {},
         // 表单校验
-        rules: {}
-      }
+        rules: {
+        }
+      };
     },
     created() {
-      this.getList()
+      this.getList();
     },
     methods: {
 
-      detern(row) {
-        this.reset()
-        const actkey = row.actkey || this.ids
-        this.$router.push({ path: '/actwork/todo/tododetails', query: { id: actkey } })
-      },
+        detern(row){
+            this.reset();
+            const actkey = row.actkey || this.ids
+            this.$router.push({path:'/actwork/todo/tododetails',query: {id:actkey }})
+        },
       //通过流程key查询启动的表单fromkey
-      openactform(actkey, id) {
+      openactform(actkey,id,name,title) {
+
+        if(name == "赋文号归档分发"){
+          this.optiontrue = true;
+          this.optiontitle = title;
+          this.optionactkey = actkey;
+          this.optionid = id;
+        }else{
+          this.optiontrue = false;
+        }
+
         let vue = this
-        actkey = actkey.split(':')[0]
+        actkey=actkey.split(":")[0];
         this.details.getactkey = actkey//动态传参到下面的页面
         this.details.formId = id//动态传参到下面的页面
-        getCurrentFlowFormKey(actkey).then(response => {
+        getStartFormKey(actkey).then(response => {
           var path = response.msg
           this.actForm = () => Promise.resolve().then(() => require(`@/views/${path}`))
         })
@@ -165,23 +182,24 @@
         return vue.actForm = this.actForm
       },
       // 详情
-      details() {
+      details(){
         this.dialogVisible = true
       },
       /** 查询列表 */
       getList() {
-        this.loading = true
+        this.loading = true;
         toDoItemListInfo(this.toDoParams).then(response => {
-          this.infoList = response.rows
-          this.total = response.total
-          this.loading = false
-          this.actOpen = false
-        })
+          this.infoList = response.rows;
+          console.log(response.rows)
+          this.total = response.total;
+          this.loading = false;
+          this.actOpen=false;
+        });
       },
       // 取消按钮
       cancel() {
-        this.dialogVisible = false
-        this.actOpen = false
+        this.dialogVisible = false;
+        this.actOpen = false;
       },
       // 表单重置
       reset() {
@@ -194,49 +212,49 @@
           mailTheme: undefined,
           mailContent: undefined,
           createTime: undefined,
-          status: '0',
+          status: "0",
           deleteTime: undefined
-        }
-        this.resetForm('form')
+        };
+        this.resetForm("form");
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.toDoParams.pageNum = 1
-        this.getList()
+        this.toDoParams.pageNum = 1;
+        this.getList();
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.resetForm('queryForm')
-        this.handleQuery()
+        this.resetForm("queryForm");
+        this.handleQuery();
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
         this.ids = selection.map(item => item.mailGuid)
         this.flgs = selection.map(item => item.flg)
-        this.single = selection.length != 1
+        this.single = selection.length!=1
         this.multiple = !selection.length
-      }
+      },
+
+
+
 
     }
   }
 </script>
 
 <style scoped>
-  .el-dialog__header {
+  .el-dialog__header{
     border-bottom: 1px solid #e8e8e8 !important;
   }
-
-  .dear {
+  .dear{
     border-top: 1px solid #e8e8e8;
   }
-
-  .dad {
+  .dad{
     margin: 30px 20px 20px;
     border: 1px solid #e8e8e8;
     padding: 30px;
   }
-
-  .dac {
+  .dac{
     margin: 30px 20px 20px;
     border: 1px solid #e8e8e8;
     padding: 25px 0;

src/views/system/contacts/index.vue

@@ -110,16 +110,16 @@
     />
 
     <!-- 添加或修改常用联系人对话框append-to-body -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :modal-append-to-body='false' append-to-body>
+    <el-dialog :title="title" :visible.sync="addOpen" width="500px" :modal-append-to-body='false' append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="组名称" prop="groupname">
+        <el-form-item label="组名称" prop="groupname" >
           <el-input v-model="form.groupname" placeholder="请输入组名称" />
         </el-form-item>
-        <el-form-item label="人员账号" prop="accounts">
-          <el-input v-model="form.accounts" placeholder="请输入人员账号" />
+        <el-form-item label="人员账号" prop="accounts" v-show="false">
+          <el-input v-model="form.accounts" placeholder="请输入人员账号" readonly/>
         </el-form-item>
         <el-form-item label="人员姓名" prop="accountNames">
-          <el-input v-model="form.accountNames" placeholder="请选择该分组下的联系人" >
+          <el-input v-model="form.accountNames" placeholder="请选择该分组下的联系人" readonly>
             <template slot="append">
               <el-button
                 type="primary"
@@ -132,11 +132,11 @@
         </el-form-item>
       </el-form>
       <!-- 选择人员对话框 -->
-      <select-user-by-dept style="z-index: 2093;" ref="selectUserByDept" :title="childTitle" :open="childOpen" :inputName="childAccountnames" :inputAccount="childAccouts" @ok="selectOK" />
+      <select-user-by-dept style="z-index: 2093;" ref="selectUserByDept" :title="childTitle" :open="childOpen1" :inputName="childAccountnames" :inputAccount="childAccouts" @ok="selectOK" />
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancelp">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -166,7 +166,7 @@ export default {
       // 弹出层标题
       title: "",
       // 是否显示弹出层
-      open: false,
+      addOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -181,7 +181,7 @@ export default {
       rules: {
       },
       childTitle:'',
-      childOpen:false,
+      childOpen1:false,
       childAccouts:'',
       childAccountnames:''
     };
@@ -199,11 +199,11 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
+    // 添加或编辑 弹窗的取消按钮
     cancelp() {
-      this.open = false;
       this.reset();
-      this.childOpen=false;
+      this.childOpen1=false;
+      this.addOpen = false;
     },
     // 表单重置
     reset() {
@@ -236,11 +236,14 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.open = true;
-      this.title = "添加常用联系人";
-      console.log("新增==="+this.open+"=="+this.childOpen+"=="+this.childAccouts+"=="+this.loading);
-      this.childOpen=false;
+      //选择人员弹框 初始化
+      this.childAccouts = '';
+      this.childAccountnames = '';
+      this.childOpen1=false;
       this.childTitle='';
+
+      this.addOpen = true;
+      this.title = "添加常用联系人";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -248,13 +251,14 @@ export default {
       const id = row.id || this.ids
       getContacts(id).then(response => {
         this.form = response.data;
-        this.open = true;
-        this.title = "修改常用联系人";
+        //选择人员弹框 初始化
         this.childAccouts = this.form.accounts;
         this.childAccountnames = this.form.accountNames;
-
-        this.childOpen=false;
+        this.childOpen1=false;
         this.childTitle='';
+
+        this.addOpen = true;
+        this.title = "修改常用联系人";
       });
     },
     /** 提交按钮 */
@@ -265,7 +269,7 @@ export default {
             updateContacts(this.form).then(response => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
-                this.open = false;
+                this.addOpen = false;
                 this.getList();
               }
             });
@@ -273,7 +277,7 @@ export default {
             addContacts(this.form).then(response => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
-                this.open = false;
+                this.addOpen = false;
                 this.getList();
               }
             });
@@ -311,26 +315,16 @@ export default {
     /** 新增或修改弹出框中的  选择人员 按钮弹窗操作 */
     handleSelect() {
       this.$refs.selectUserByDept.childOpen=true;
-      this.childOpen = true;
+      this.childOpen1 = true;
       this.childTitle = "选择收件人";
-      console.log("选择人员==="+this.open+"=="+this.childOpen+"=="+this.childAccouts+"=="+this.loading);
     },
     selectOK(zh, xm) {
       this.childAccouts=zh;
       this.childAccountnames=xm;
       this.form.accounts = zh;
       this.form.accountNames=xm;
-      this.childOpen=false;
+      this.childOpen1=false;
     }
   }
 };
 </script>
-
-<style scoped>
-  /*.v-modal{*/
-  /*  z-index: 1800 !important;*/
-  /*}*/
-  /*.el-dialog__wrapper{*/
-  /*  z-index: 2093 !important;*/
-  /*}*/
-</style>

src/views/system/dept/index.vue

@@ -56,17 +56,17 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
@@ -205,7 +205,9 @@ export default {
     getList() {
       this.loading = true;
       listDept(this.queryParams).then(response => {
+        console.log(response.data)
         this.deptList = this.handleTree(response.data, "deptId");
+        console.log(this.handleTree(response.data, "deptId"))
         this.loading = false;
       });
     },
@@ -310,4 +312,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/duty/duty.vue

@@ -436,8 +436,6 @@
         this.$refs.selectUserByDept3.childOpen=true;
         this.open3 = true;
         this.title = "选择晚上值班人员";
-
-
         this.$refs.selectUserByDept1.childOpen=false;
         this.$refs.selectUserByDept2.childOpen=false;
         this.$refs.selectUserByDept.childOpen=false;
@@ -472,6 +470,14 @@
       cancel() {
         this.form = {};
         this.dialogVisible = false;
+        this.open = false;
+        this.open1 = false;
+        this.open2 = false;
+        this.open3 = false;
+        this.$refs.selectUserByDept.childOpen = false;
+        this.$refs.selectUserByDept1.childOpen = false;
+        this.$refs.selectUserByDept2.childOpen = false;
+        this.$refs.selectUserByDept3.childOpen = false;
         this.reset();
       },
       // 表单重置

src/views/system/email/detail.vue

@@ -53,7 +53,6 @@
         </el-form>
       </el-col>
     </el-row>
-
     <el-table border v-loading="loading" :data="detailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="阅读状态" width="130" align="center" prop="readFlag">
@@ -73,8 +72,8 @@
 
       </el-table-column>
       <el-table-column label="邮件主题" align="center" prop="mailTheme" />
-      <!--<el-table-column label="收件人-账号" align="center" prop="receiverAccount" />-->
-      <el-table-column label="收件人" align="center" prop="receiverName" v-if="receiverAccount != 'admin'" />
+<!--      <el-table-column label="收件人-账号" align="center" prop="receiverAccount" />-->
+      <el-table-column label="收件人" align="center" prop="receiverName" v-if="receiverAccount == 'admin'" />
       <el-table-column label="接收时间" width="180" align="center" prop="readTime"/>
       <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

src/views/system/files/file.vue

@@ -146,75 +146,6 @@
       <component :is="actForm" :data="details":actOpen="open" @getListtable="getListtable" ></component>
     </el-dialog>
 
-
-    <!-- 添加或修改【请填写功能名称】对话框 -->
-<!--    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>-->
-<!--      <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
-<!--        <el-form-item label="时间" prop="archivesTime">-->
-<!--          <el-date-picker clearable size="small" style="width: 200px"-->
-<!--                          v-model="form.archivesTime"-->
-<!--                          type="date"-->
-<!--                          value-format="yyyy-MM-dd"-->
-<!--                          placeholder="选择时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="档案类型" prop="archivesType">-->
-<!--          <el-radio-group v-model="form.archivesType">-->
-<!--            <el-radio label="目录" value="1"></el-radio>-->
-<!--            <el-radio label="文档" value="2"></el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="档案归属" prop="documentType">-->
-<!--          <el-cascader-->
-<!--            v-model="doc"-->
-<!--            :options="options"-->
-<!--            :props="{ checkStrictly: true }"-->
-<!--            @change="handleChange"></el-cascader>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="档案名称" prop="archivesName">-->
-<!--          <el-input v-model="form.archivesName" placeholder="请输入档案名称" />-->
-<!--        </el-form-item>-->
-<!--&lt;!&ndash;        <el-form-item label="档案编号" prop="archivesNum">&ndash;&gt;-->
-<!--&lt;!&ndash;          <el-input v-model="form.archivesNum" placeholder="请输入档案编号" />&ndash;&gt;-->
-<!--&lt;!&ndash;        </el-form-item>&ndash;&gt;-->
-<!--&lt;!&ndash;        <el-form-item label="部门id" prop="deptId">&ndash;&gt;-->
-<!--&lt;!&ndash;          <el-input v-model="form.deptId" placeholder="请输入部门id" />&ndash;&gt;-->
-<!--&lt;!&ndash;        </el-form-item>&ndash;&gt;-->
-<!--&lt;!&ndash;        <el-form-item label="部门名称" prop="deptName">&ndash;&gt;-->
-<!--&lt;!&ndash;          <el-input v-model="form.deptName" placeholder="请输入部门名称" />&ndash;&gt;-->
-<!--&lt;!&ndash;        </el-form-item>&ndash;&gt;-->
-<!--&lt;!&ndash;        <el-form-item label="归档类别">&ndash;&gt;-->
-<!--&lt;!&ndash;          <el-input v-model="form.archivesType" placeholder="请选择归档类别" />&ndash;&gt;-->
-<!--&lt;!&ndash;        </el-form-item>&ndash;&gt;-->
-<!--        <el-form-item label="文件上传">-->
-<!--          <el-upload-->
-<!--            class="upload-demo"-->
-<!--            action="#"-->
-<!--            :on-preview="handlePreview"-->
-<!--            :on-remove="handleRemove"-->
-<!--            :before-remove="beforeRemove"-->
-<!--            multiple-->
-<!--            :limit="3"-->
-<!--            :on-exceed="handleExceed"-->
-<!--            :file-list="fileList">-->
-<!--            <el-button size="small" type="primary">点击上传</el-button>-->
-<!--          </el-upload>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="档案内容" prop="mailContent" style="height: 250px;">-->
-<!--          <Editor v-model="form.Content" />-->
-<!--        </el-form-item>-->
-<!--&lt;!&ndash;        <el-form-item label="状态(0=正常,1=非正常)" prop="state">&ndash;&gt;-->
-<!--&lt;!&ndash;          <el-input v-model="form.state" placeholder="请输入状态(0=正常,1=非正常)" />&ndash;&gt;-->
-<!--&lt;!&ndash;        </el-form-item>&ndash;&gt;-->
-<!--&lt;!&ndash;        <el-form-item label="状态(0=正常,1=非正常)" prop="rematk">&ndash;&gt;-->
-<!--&lt;!&ndash;          <el-input v-model="form.rematk" placeholder="请输入状态(0=正常,1=非正常)" />&ndash;&gt;-->
-<!--&lt;!&ndash;        </el-form-item>&ndash;&gt;-->
-<!--      </el-form>-->
-<!--      <div slot="footer" class="dialog-footer">-->
-<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
-<!--        <el-button @click="cancel">取 消</el-button>-->
-<!--      </div>-->
-<!--    </el-dialog>-->
   </div>
 </template>
 

src/views/system/information/index.vue

@@ -427,18 +427,18 @@
       getList() {
         this.loading = true;
         listMes(this.queryParams).then(response => {
-          //  alert(response.total)
+
           this.mesList = response.rows;
           this.total = response.total;
           this.loading = false;
           var doc="";
-          console.log(this.mesList)
+          //console.log(this.mesList)
           //str.replace(/\[|]/g, '');
           for (var i=0;i<this.mesList.length;i++){
             doc=this.mesList[i].documentType
             doc.replace(/\[|]/g, '');
-            console.log(doc)
-            console.log( doc.replace(/\[|]/g, ''))
+            //console.log(doc)
+            //console.log( doc.replace(/\[|]/g, ''))
           }
         });
       },