Merge branch 'xcv' of yinet2020/YinetOASystemWeb into master

src/api/system/archives/archives.js

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

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/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/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>