修改流程发文提交页面

src/api/activiti/form/fw.js

@@ -13,6 +13,14 @@ export function submitApply(query) {
   })
 }
 
+//更新详情数据
+export function  updateInfo(query) {
+  return request({
+    url: '/fw/updateInfo',
+    method: 'post',
+    params: query
+  })
+}
 // 发文待办列表
 export function listInfo(query) {
   return request({

src/views/system/actform/fawen/iWebOffice.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width:100%;height:700px;">
+  <div style="width:100%;height:700px;" >
     <div id="office"></div>
     <input style="color:Red;" type=button value="打开本地文档(有窗口)" @click="OnUnLoad(),openlocal()">
     <input style="color:Red;" type=button value="保存文档到服务器" @click="SaveDocument()">
@@ -9,7 +9,8 @@
   import Vue from 'vue/dist/vue.js'
   import webOfficeTpl from '../../../../../static/iweboffice/iWebOffice2015.js';
   import {WebOffice2015} from '../../../../../static/iweboffice/WebOffice.js'
-  import { getToken } from "@/utils/auth";
+  import {getToken} from "@/utils/auth";
+
   export default {
     props: {
       fileData: {}
@@ -18,19 +19,16 @@
       return {
         webOffice: null,
         webOfficeObj: null,
-        headers:  "Bearer " + getToken(),
+        headers: "Bearer " + getToken(),
         saveResult: '',
-
       }
     },
     beforeCreate() {
 
     },
     mounted() {
-      console.log(webOfficeTpl);
       this.$nextTick(() => {
         this.initWebOffice();
-        this.webOfficeObj = new WebOffice2015();
         this.initWebOfficeObject();
       })
     },
@@ -41,11 +39,11 @@
 
     },
     methods: {
-      openlocal(){
+      openlocal() {
         this.webOfficeObj.WebOpenLocal()
       },
-      OnUnLoad(){
-     this.webOfficeObj.WebClose();
+      OnUnLoad() {
+        this.webOfficeObj.WebClose();
       },
       initWebOffice() {
         this.webOffice = new Vue({
@@ -53,16 +51,16 @@
         }).$mount('#office');
       },
       initWebOfficeObject() {
-        // this.webOfficeObj = new WebOffice2015();
+        this.webOfficeObj = new WebOffice2015();
         try {
           this.webOfficeObj.ServerUrl = "http://localhost/dev-api";
-           // this.webOfficeObj.RecordID = "web";  //RecordID:本文档记录编号
+          // this.webOfficeObj.RecordID = "web";  //RecordID:本文档记录编号
           this.webOfficeObj.setObj(document.getElementById('WebOffice'));
           this.webOfficeObj.UserName = this.fileData.user;
           this.webOfficeObj.FileName = this.fileData.filePath;
           this.webOfficeObj.getResultJson = {};
           this.webOfficeObj.SaveServlet = "/content/upload";
-          this.webOfficeObj.FileType = "."+this.fileData.filePath.split(".")[ this.fileData.filePath.split(".").length-1]; //FileType:文档类型  .doc  .xls
+          this.webOfficeObj.FileType = "." + this.fileData.filePath.split(".")[this.fileData.filePath.split(".").length - 1]; //FileType:文档类型  .doc  .xls
           this.webOfficeObj.ShowWindow = false; //显示/隐藏进度条
           this.webOfficeObj.EditType = "1"; //设置加载文档类型 0 锁定文档，1无痕迹模式，2带痕迹模式
           this.webOfficeObj.ShowMenu = 1;
@@ -71,10 +69,10 @@
           //参数顺序依次为：控件标题栏颜色、自定义菜单开始颜色、自定义工具栏按钮开始颜色、自定义工具栏按钮结束颜色、
           //自定义工具栏按钮边框颜色、自定义工具栏开始颜色、控件标题栏文本颜色（默认值为：0x000000）
           if (!this.webOfficeObj.WebSetSkin(0xdbdbdb, 0xeaeaea, 0xeaeaea, 0xdbdbdb, 0xdbdbdb, 0xdbdbdb, 0x000000)) {
-            alert(this.webOfficeObj.Status);
+            this.msgSuccess(this.webOfficeObj.Status);
           }    //设置控件皮肤
           if (this.webOfficeObj.WebOpen()) {
-              alert(this.webOfficeObj.Status);
+            this.msgSuccess(this.webOfficeObj.Status);
           }
           // if (this.webOfficeObj.WebOpen2(this.webOfficeObj.FileName)) {
           //     alert(webOfficeObj.Status);
@@ -96,47 +94,86 @@
       //设置页面中的状态值
       StatusMsg(mValue) {
         try {
-          alert(mValue);
+          this.msgSuccess(mValue);
         } catch (e) {
           return false;
         }
       },
 
       //保存文档
-      SaveDocument(d)
-  {
-    // this.$emit('func', d)
-    if (this.webOfficeObj.WebSave(this.headers)){    //交互OfficeServer的OPTION="SAVEFILE"
-     this.$emit('func', this.webOfficeObj.getResultJson.fileName)
-
-      this.webOfficeObj.FileName=this.webOfficeObj.getResultJson.fileName
-      // this.webOfficeObj.WebClose();
-      // window.close();
+      SaveDocument(d) {
+        // this.$emit('func', d)
+        if (this.webOfficeObj.WebSave(this.headers)) {    //交互OfficeServer的OPTION="SAVEFILE"
+          this.$emit('func', this.webOfficeObj.getResultJson.fileName)
+          this.webOfficeObj.FileName = this.webOfficeObj.getResultJson.fileName
+          this.webOfficeObj.WebClose();
+          // window.close();
 
-    }else{
-      this.webOfficeObj.Alert(this.webOfficeObj.Status);
-      this.StatusMsg(this.webOfficeObj.Status);
-    }
-  },
-      OnCommand(ID, Caption, bCancel){
-    switch(ID){
-      case 1:WebOpenLocal();break;//打开本地文件
-      case 2:this.webOfficeObj.WebSaveLocal();break;//另存本地文件
-      case 4:this.webOfficeObj.PrintPreview();break;//启用
-      case 5:this.webOfficeObj.PrintPreviewExit();this.webOfficeObj.ShowField();break;//启用
-      case 17:this.webOfficeObj.SaveEnabled(true);this.StatusMsg("启用保存");break;//启用保存
-      case 18:this.webOfficeObj.SaveEnabled(false);this.StatusMsg("关闭保存");break;//关闭保存
-      case 19:this.webOfficeObj.PrintEnabled(true);this.StatusMsg("启用打印");break;//启用打印
-      case 20:this.webOfficeObj.PrintEnabled(false);this.StatusMsg("关闭打印");break;//关闭打印
-      case 301:this.webOfficeObj.HandWriting("255","4");this.StatusMsg("手写签批");break;//手写签批
-      case 302:this.webOfficeObj.StopHandWriting();this.StatusMsg("停止手写签批");break;//停止手写签批
-      case 303:this.webOfficeObj.TextWriting();this.StatusMsg("文字签名");break;//文字签名
-      case 304:this.webOfficeObj.ShapeWriting();this.StatusMsg("图形签批");break;//图形签批
-      case 305:this.webOfficeObj.RemoveLastWriting();this.StatusMsg("取消上一次签批");break;//取消上一次签批
-      case 306:this.webOfficeObj.ShowWritingUser(false,this.webOfficeObj.UserName);this.StatusMsg("显示签批用户");break;//显示签批用户
-      default:;return;
-    }
-  },
+        } else {
+          this.webOfficeObj.Alert(this.webOfficeObj.Status);
+          this.StatusMsg(this.webOfficeObj.Status);
+        }
+      },
+      OnCommand(ID, Caption, bCancel) {
+        switch (ID) {
+          case 1:
+            WebOpenLocal();
+            break;//打开本地文件
+          case 2:
+            this.webOfficeObj.WebSaveLocal();
+            break;//另存本地文件
+          case 4:
+            this.webOfficeObj.PrintPreview();
+            break;//启用
+          case 5:
+            this.webOfficeObj.PrintPreviewExit();
+            this.webOfficeObj.ShowField();
+            break;//启用
+          case 17:
+            this.webOfficeObj.SaveEnabled(true);
+            this.StatusMsg("启用保存");
+            break;//启用保存
+          case 18:
+            this.webOfficeObj.SaveEnabled(false);
+            this.StatusMsg("关闭保存");
+            break;//关闭保存
+          case 19:
+            this.webOfficeObj.PrintEnabled(true);
+            this.StatusMsg("启用打印");
+            break;//启用打印
+          case 20:
+            this.webOfficeObj.PrintEnabled(false);
+            this.StatusMsg("关闭打印");
+            break;//关闭打印
+          case 301:
+            this.webOfficeObj.HandWriting("255", "4");
+            this.StatusMsg("手写签批");
+            break;//手写签批
+          case 302:
+            this.webOfficeObj.StopHandWriting();
+            this.StatusMsg("停止手写签批");
+            break;//停止手写签批
+          case 303:
+            this.webOfficeObj.TextWriting();
+            this.StatusMsg("文字签名");
+            break;//文字签名
+          case 304:
+            this.webOfficeObj.ShapeWriting();
+            this.StatusMsg("图形签批");
+            break;//图形签批
+          case 305:
+            this.webOfficeObj.RemoveLastWriting();
+            this.StatusMsg("取消上一次签批");
+            break;//取消上一次签批
+          case 306:
+            this.webOfficeObj.ShowWritingUser(false, this.webOfficeObj.UserName);
+            this.StatusMsg("显示签批用户");
+            break;//显示签批用户
+          default:
+            ;
+            return;
+        }
+      },
       //服务端Servlet方式打开文档
       LoadServlet() {
         this.webOfficeObj = new WebOffice2015();
@@ -180,14 +217,14 @@
         }
       },
       //烟枪灰皮肤
-       SetGraySkin(){
-    //参数顺序依次为：控件标题栏颜色、自定义菜单开始颜色、自定义工具栏按钮开始颜色、自定义工具栏按钮结束颜色、
-    //自定义工具栏按钮边框颜色、自定义工具栏开始颜色、控件标题栏文本颜色（默认值为：0x000000）
-    if (!this.webOfficeObj.WebSetSkin(0xdbdbdb, 0xeaeaea, 0xeaeaea, 0xdbdbdb, 0xdbdbdb, 0xdbdbdb, 0x000000))
-      this.webOfficeObj.Alert(this.webOfficeObj.Status);
-  }
+      SetGraySkin() {
+        //参数顺序依次为：控件标题栏颜色、自定义菜单开始颜色、自定义工具栏按钮开始颜色、自定义工具栏按钮结束颜色、
+        //自定义工具栏按钮边框颜色、自定义工具栏开始颜色、控件标题栏文本颜色（默认值为：0x000000）
+        if (!this.webOfficeObj.WebSetSkin(0xdbdbdb, 0xeaeaea, 0xeaeaea, 0xdbdbdb, 0xdbdbdb, 0xdbdbdb, 0x000000))
+          this.webOfficeObj.Alert(this.webOfficeObj.Status);
+      }
 
-  }
+    }
   }
 </script>
 

src/views/system/actform/fawen/write.vue

@@ -1,788 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-form :model="queryParams" ref="queryForm" :inline="true">
-          <el-form-item label="请输入标题" prop="mailTheme">
-            <el-input
-              v-model="queryParams.mailTheme"
-              placeholder="请输入标题"
-              clearable
-              size="small"
-            />
-          </el-form-item>
-          <el-form-item label="请输入机关代字" prop="status">
-            <el-input
-              v-model="queryParams.receiverAccount"
-              placeholder="请输入机关代字"
-              clearable
-              size="small"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-col>
-    </el-row>
-    <el-row class="bottom10">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="small"
-          @click="handleAdd"
-          v-hasPermi="['system:info:add']"
-          style="margin-right: 15px;"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-       <!-- <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="small"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:info:remove']"
-        >删除</el-button> -->
-      </el-col>
-    </el-row>
-    <el-table border v-loading="loading" :data="infoList" @selection-change="">
-      <el-table-column label="标题" align="center" prop="" width="300"/>
-      <el-table-column label="机关代字" align="center" prop="" />
-      <el-table-column label="文号" align="center" prop="" />
-      <el-table-column label="起草正文" align="center" prop="" />
-      <el-table-column label="缓急" align="center" prop="" />
-      <el-table-column label="密级" align="center" prop="" />
-      <el-table-column label="打印份数" align="center" prop="" />
-      <el-table-column label="状态" align="center" prop="" />
-      <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-document"
-            @click="handleUpdate1(scope.row)"
-          >详情</el-button>
-          <el-button
-            size="small" type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px" border>
-          <table width="100%" border="1">
-            <tr>
-              <td colspan="2"><p class="title">发文起草</p></td>
-            </tr>
-          <tr>
-            <td>
-              <el-form-item label="机关待字" prop="senderName">
-                 <el-select v-model="form.senderName" placeholder="请选择">
-                      <el-option label="001" value=""></el-option>
-                      <el-option label="002" value=""></el-option>
-                    </el-select>
-              </el-form-item>
-            </td>
-            <td>
-              <el-form-item label="文号" prop="number">
-              <el-input v-model="form.number" placeholder="请输入发件人-账号" />
-            </el-form-item>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              <el-form-item label="缓急" prop="urgency" >
-               <el-select v-model="form.urgency" placeholder="请选择">
-                <el-option label="一般" value=""></el-option>
-                <el-option label="平急" value=""></el-option>
-                <el-option label="加急" value=""></el-option>
-                <el-option label="特急" value=""></el-option>
-                <el-option label="特提" value=""></el-option>
-              </el-select>
-            </el-form-item>
-            </td>
-            <td>
-               <el-form-item label="密级" prop="encryption">
-               <el-select v-model="form.encryption" placeholder="请选择">
-                    <el-option label="一般" value=""></el-option>
-                    <el-option label="秘密" value=""></el-option>
-                    <el-option label="机密" value=""></el-option>
-                    <el-option label="绝密" value=""></el-option>
-                  </el-select>
-            </el-form-item>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              <el-form-item label="部门会签：" prop="mailTheme">
-                <el-input v-model="form.mailTheme" type="textarea" placeholder="" />
-              </el-form-item>
-        </td>
-            <td>
-              <el-form-item label="领导会签：" prop="mailContent">
-                <el-input v-model="form.mailContent" type="textarea" placeholder="" />
-              </el-form-item>
-            </td>
-          </tr>
-          <tr>
-            <td>
-               <el-form-item label="拟稿人" prop="">
-                    <el-input placeholder="请选择" >
-                        <el-button slot="append"  @click="dialogTableVisible = true">选择</el-button>
-                    </el-input>
-                     <!--选择人员-->
-               <el-dialog title="选择人员" :visible.sync="dialogTableVisible">
-                          <el-container>
-                             <el-aside width="200px">
-                               <el-tree :data="data" :props="defaultProps"></el-tree>
-                             </el-aside>
-                             <el-main>
-                               <el-table :data="gridData" border>
-                              <el-table-column property="date" label="日期" width="150"></el-table-column>
-                              <el-table-column property="name" label="姓名" width="200"></el-table-column>
-                              <el-table-column property="address" label="地址"></el-table-column>
-                              </el-table>
-                             </el-main>
-                          </el-container>
-                            <div slot="footer" class="dialog-footer">
-                              <el-button @click="dialogFormVisible = false">取 消</el-button>
-                              <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
-                            </div>
-                        </el-dialog>
-                    </el-form-item>
-            </td>
-            <td>
-              <el-form-item label="拟稿部门" prop="">
-                <el-input placeholder="请选择">
-                   <el-button slot="append">选择</el-button>
-               </el-input>
-                </el-form-item>
-            </td>
-          </tr>
-          <tr>
-            <td  colspan="2">
-              <el-form-item label="拟稿人意见：" prop="">
-                <el-input  type="textarea" placeholder="" />
-              </el-form-item>
-            </td>
-          </tr>
-           <tr>
-             <td  colspan="2">
-               <el-form-item label="办公室核稿意见：" prop="">
-                  <el-input  type="textarea" placeholder="" />
-                </el-form-item>
-                </td>
-           </tr>
-            <tr>
-              <td  colspan="2">
-                 <el-form-item label="办公室领导核稿意见：" prop="">
-                  <el-input  type="textarea" placeholder="" />
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <td  colspan="2">
-                <el-form-item label="主办单位审核：" prop="">
-                  <el-input  type="textarea" placeholder="" />
-                </el-form-item>
-              </td>
-            </tr>
-             <tr>
-               <td  colspan="2">
-                 <el-form-item label="秘书审核：" prop="">
-                   <el-input  type="textarea" placeholder="" />
-                 </el-form-item>
-               </td>
-             </tr>
-              <tr>
-                <td colspan="2">
-                  <el-form-item label="校对意见:" prop="">
-           <el-input  type="textarea" placeholder="" />
-         </el-form-item>
-                </td>
-              </tr>
-              <tr >
-                <td  colspan="2">
-                   <el-form-item label="打印份数" prop="">
-           <el-input  type="text" placeholder="" />
-         </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <td  colspan="2">
-                    <el-form-item label="标题：" prop="">
-           <el-input  type="text" placeholder="" />
-         </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <td  colspan="2">
-                   <el-form-item label="主送：" :disabled="true" prop="">
-          <el-input placeholder="请选择" :disabled="true">
-              <el-button slot="append">选择</el-button>
-          </el-input>
-         </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <td colspan="2">
-                   <el-form-item label=" 抄送：" :disabled="true" prop="">
-            <el-input placeholder="请选择" :disabled="true">
-                <el-button slot="append">选择</el-button>
-            </el-input>
-          </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <td colspan="2">
-                   <el-form-item label="上传：" prop="">
-            <el-upload
-            class="upload-demo"
-            action="https://jsonplaceholder.typicode.com/posts/"
-            :on-change="handleChange"
-            :file-list="fileList3">
-            <el-button size="small" type="primary">点击上传</el-button>
-            <div slot="tip" class="el-upload__tip">只能上传文件，且不超过500kb</div>
-          </el-upload>
-          </el-form-item>
-                </td>
-              </tr>
-      </table>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button type="primary" @click="submitForm">保存草稿</el-button>
-        <el-button type="primary" @click="submitForm">起草正文</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 详情对话框 -->
-    <el-dialog title="公文详情" :visible.sync="open1" width="800px" append-to-body>
-     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-       <el-row>
-         <el-col :span="12">
-           <el-form-item label="机关待字" prop="senderName">
-            <el-select v-model="form.senderName" placeholder="请选择">
-                 <el-option label="001" value=""></el-option>
-                 <el-option label="002" value=""></el-option>
-               </el-select>
-         </el-form-item>
-         </el-col>
-          <el-col :span="12">
-            <el-form-item label="文号" prop="number">
-             <el-input v-model="form.number" placeholder="请输入发件人-账号" />
-           </el-form-item>
-          </el-col>
-       </el-row>
-       <el-row>
-         <el-col :span="12">
-           <el-form-item label="缓急" prop="urgency" >
-            <el-select v-model="form.urgency" placeholder="请选择">
-             <el-option label="一般" value=""></el-option>
-             <el-option label="平急" value=""></el-option>
-             <el-option label="加急" value=""></el-option>
-             <el-option label="特急" value=""></el-option>
-             <el-option label="特提" value=""></el-option>
-           </el-select>
-         </el-form-item>
-         </el-col>
-         <el-col :span="12">
-            <el-form-item label="密级" prop="encryption">
-            <el-select v-model="form.encryption" placeholder="请选择">
-                 <el-option label="一般" value=""></el-option>
-                 <el-option label="秘密" value=""></el-option>
-                 <el-option label="机密" value=""></el-option>
-                 <el-option label="绝密" value=""></el-option>
-               </el-select>
-         </el-form-item>
-         </el-col>
-       </el-row>
-       <el-form-item label="部门会签：" prop="mailTheme">
-         <el-input v-model="form.mailTheme" type="textarea" placeholder="" />
-       </el-form-item>
-       <el-form-item label="领导会签：" prop="mailContent">
-         <el-input v-model="form.mailContent" type="textarea" placeholder="" />
-       </el-form-item><el-form-item label="领导会签：" prop="mailContent">
-         <el-input v-model="form.mailContent" type="textarea" placeholder="" />
-       </el-form-item>
-       <el-form-item label="拟稿人" prop="">
-       <el-input placeholder="xx" >
-       </el-input>
-       </el-form-item>
-       <el-form-item label="拟稿部门" prop="">
-      <el-input placeholder="xx" prefix-icon="el-icon-search">
-      </el-input>
-       </el-form-item>
-      <!-- <el-form-item label="拟稿人意见：" prop="">
-         <el-input  type="textarea" placeholder="" />
-       </el-form-item>
-       <el-form-item label="办公室核稿意见：" prop="">
-         <el-input  type="textarea" placeholder="" />
-       </el-form-item>
-       <el-form-item label="办公室领导核稿意见：" prop="">
-         <el-input  type="textarea" placeholder="" />
-       </el-form-item>
-       <el-form-item label="主办单位审核：" prop="">
-         <el-input  type="textarea" placeholder="" />
-       </el-form-item>
-        <el-form-item label="秘书审核：" prop="">
-          <el-input  type="textarea" placeholder="" />
-        </el-form-item>
-        <el-form-item label="校对意见:" prop="">
-          <el-input  type="textarea" placeholder="" />
-        </el-form-item>
-        <el-form-item label="打印份数" prop="">
-          <el-input  type="text" placeholder="" />
-        </el-form-item>-->
-        <el-form-item label="标题：" prop="">
-          <el-input  type="text" placeholder="" />
-        </el-form-item>
-        <el-form-item label="主送：" :disabled="true" prop="">
-         <el-input placeholder="xx" :disabled="true">
-         </el-input>
-        </el-form-item>
-         <el-form-item label=" 抄送：" :disabled="true" prop="">
-           <el-input placeholder="xx" :disabled="true">
-           </el-input>
-         </el-form-item>
-         <el-form-item label="上传：" prop="">
-           <el-upload
-           class="upload-demo"
-           action="https://jsonplaceholder.typicode.com/posts/"
-           :on-change="handleChange"
-           :file-list="fileList3">
-           <div slot="tip" class="el-upload__tip">1.gggggggggg</div>
-         </el-upload>
-         </el-form-item>
-     </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="openda">关 闭</el-button>
-        <el-button @click="openda">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--选择人员-->
-    <el-dialog title="选择人员" :visible.sync="dialogTableVisible">
-      <el-container>
-         <el-aside width="200px">
-           <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
-         </el-aside>
-         <el-main>
-           <el-table :data="gridData" border>
-          <el-table-column property="date" label="日期" width="150"></el-table-column>
-          <el-table-column property="name" label="姓名" width="200"></el-table-column>
-          <el-table-column property="address" label="地址"></el-table-column>
-          </el-table>
-         </el-main>
-      </el-container>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
-        </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-         options: [{//部门选择级别
-                  label: '一级',
-                  children: [{
-                    label: '2-1',
-                    children: [{
-                      label: '3-1'
-                    }, {
-                      label: '3-2'
-                    }, {
-                      label: '3-3'
-                    }]
-                  },
-                  {
-                    value: 'daohang',
-                    label: '2-2',
-                    children: [{
-                      label: '3-1'
-                    }, {
-                      label: '3-2'
-                    }]
-                  }]
-                },
-                {
-                  label: '一级2',
-                  children: [{
-                    label: '22-1',
-                    children: [{
-                      label: '33-1'
-                    }, {
-                      label: '33-2'
-                    }, {
-                      label: '33-3'
-                    },  {
-                      label: '33-4utton'
-                    }]
-                  },
-                  {
-                    value: 'form',
-                    label: 'Form',
-                    children: [{
-                      value: 'radio',
-                      label: 'Radio 单选框'
-                    }, {
-                      value: 'checkbox',
-                      label: 'Checkbox 多选框'
-                    }, {
-                      value: 'input',
-                      label: 'Input 输入框'
-                    }, {
-                      value: 'input-number',
-                      label: 'InputNumber 计数器'
-                    }, {
-                      value: 'select',
-                      label: 'Select 选择器'
-                    }, {
-                      value: 'cascader',
-                      label: 'Cascader 级联选择器'
-                    }, {
-                      value: 'switch',
-                      label: 'Switch 开关'
-                    }, {
-                      value: 'slider',
-                      label: 'Slider 滑块'
-                    }, {
-                      value: 'time-picker',
-                      label: 'TimePicker 时间选择器'
-                    }, {
-                      value: 'date-picker',
-                      label: 'DatePicker 日期选择器'
-                    }, {
-                      value: 'datetime-picker',
-                      label: 'DateTimePicker 日期时间选择器'
-                    }, {
-                      value: 'upload',
-                      label: 'Upload 上传'
-                    }, {
-                      value: 'rate',
-                      label: 'Rate 评分'
-                    }, {
-                      value: 'form',
-                      label: 'Form 表单'
-                    }]
-                  }, {
-                    value: 'data',
-                    label: 'Data',
-                    children: [{
-                      value: 'table',
-                      label: 'Table 表格'
-                    }, {
-                      value: 'tag',
-                      label: 'Tag 标签'
-                    }, {
-                      value: 'progress',
-                      label: 'Progress 进度条'
-                    }, {
-                      value: 'tree',
-                      label: 'Tree 树形控件'
-                    }, {
-                      value: 'pagination',
-                      label: 'Pagination 分页'
-                    }, {
-                      value: 'badge',
-                      label: 'Badge 标记'
-                    }]
-                  }, {
-                    value: 'notice',
-                    label: 'Notice',
-                    children: [{
-                      value: 'alert',
-                      label: 'Alert 警告'
-                    }, {
-                      value: 'loading',
-                      label: 'Loading 加载'
-                    }, {
-                      value: 'message',
-                      label: 'Message 消息提示'
-                    }, {
-                      value: 'message-box',
-                      label: 'MessageBox 弹框'
-                    }, {
-                      value: 'notification',
-                      label: 'Notification 通知'
-                    }]
-                  }, {
-                    value: 'navigation',
-                    label: 'Navigation',
-                    children: [{
-                      value: 'menu',
-                      label: 'NavMenu 导航菜单'
-                    }, {
-                      value: 'tabs',
-                      label: 'Tabs 标签页'
-                    }, {
-                      value: 'breadcrumb',
-                      label: 'Breadcrumb 面包屑'
-                    }, {
-                      value: 'dropdown',
-                      label: 'Dropdown 下拉菜单'
-                    }, {
-                      value: 'steps',
-                      label: 'Steps 步骤条'
-                    }]
-                  }, {
-                    value: 'others',
-                    label: 'Others',
-                    children: [{
-                      value: 'dialog',
-                      label: 'Dialog 对话框'
-                    }, {
-                      value: 'tooltip',
-                      label: 'Tooltip 文字提示'
-                    }, {
-                      value: 'popover',
-                      label: 'Popover 弹出框'
-                    }, {
-                      value: 'card',
-                      label: 'Card 卡片'
-                    }, {
-                      value: 'carousel',
-                      label: 'Carousel 走马灯'
-                    }, {
-                      value: 'collapse',
-                      label: 'Collapse 折叠面板'
-                    }]
-                  }]
-                }, {
-                  value: 'ziyuan',
-                  label: '资源',
-                  children: [{
-                    value: 'axure',
-                    label: 'Axure Components'
-                  }, {
-                    value: 'sketch',
-                    label: 'Sketch Templates'
-                  }, {
-                    value: 'jiaohu',
-                    label: '组件交互文档'
-                  }]
-                  }],
-                  gridData: [{//选择人员
-                            date: '2016-05-02',
-                            name: '王小虎',
-                            address: '上海市普陀区金沙江路 1518 弄'
-                          }, {
-                            date: '2016-05-04',
-                            name: '王小虎',
-                            address: '上海市普陀区金沙江路 1518 弄'
-                          }, {
-                            date: '2016-05-01',
-                            name: '王小虎',
-                            address: '上海市普陀区金沙江路 1518 弄'
-                          }, {
-                            date: '2016-05-03',
-                            name: '王小虎',
-                            address: '上海市普陀区金沙江路 1518 弄'
-                          }],
-                                  data: [{
-                                    label: '一级 1',
-                                    children: [{
-                                      label: '二级 1-1',
-                                      children: [{
-                                        label: '三级 1-1-1'
-                                      }]
-                                    }]
-                                  }, {
-                                    label: '一级 2',
-                                    children: [{
-                                      label: '二级 2-1',
-                                      children: [{
-                                        label: '三级 2-1-1'
-                                      }]
-                                    }, {
-                                      label: '二级 2-2',
-                                      children: [{
-                                        label: '三级 2-2-1'
-                                      }]
-                                    }]
-                                  }, {
-                                    label: '一级 3',
-                                    children: [{
-                                      label: '二级 3-1',
-                                      children: [{
-                                        label: '三级 3-1-1'
-                                      }]
-                                    }, {
-                                      label: '二级 3-2',
-                                      children: [{
-                                        label: '三级 3-2-1'
-                                      }]
-                                    }]
-                                  }],
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 总条数
-        total: 0,
-        // 【请填写功能名称】表格数据
-        infoList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-          open1: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          status: undefined,
-          deleteTime: undefined
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-        }
-      };
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-
-        openda(){
-            this.open1 = false;
-        },
-      /** 查询【请填写功能名称】列表 */
-
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          everyone: undefined,
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.mailGuid)
-        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
-            getInfo(mailGuid).then(response => {
-                this.form = response.data;
-                this.open1 = true;
-                this.title = "公文发文";
-            });
-        },
-      /** 提交按钮 */
-      submitForm: function() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.mailGuid != undefined) {
-              updateInfo(this.form).then(response => {
-                if (response.code === 200) {
-                  this.msgSuccess("修改成功");
-                  this.open = false;
-                  this.getList();
-                }
-              });
-            } else {
-              addInfo(this.form).then(response => {
-                if (response.code === 200) {
-                  this.msgSuccess("新增成功");
-                  this.open = false;
-                  this.getList();
-                }
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const mailGuids = row.mailGuid || this.ids;
-        this.$confirm('是否确认删除这一封邮件?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delInfo(mailGuids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(function() {});
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有【请填写功能名称】数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportInfo(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
-      }
-    }
-  };
-</script>
-
-<style lang="less" scoped>
-  .apple{
-    width: 150px;
-    overflow :hidden;
-    white-space :nowrap;
-    text-overflow: ellipsis;
-  }
-.bottom10{margin-bottom:20px;}
-.el-dialog__title{
-  text-align: center;
-  font-weight: bold;
-}
-table{ border-collapse: collapse;}
-.title{font-size: 30px;text-align: center; margin-top: 30px;}
-.el-form-item{margin-bottom: 10px !important;margin-top: 10px;}
-</style>

src/views/system/actform/fawen/write1.vue

@@ -56,14 +56,14 @@
           <td colspan="2">
             <el-form-item label="部门：" prop="fwdept">
               <!--              <el-input v-model="form.fwdept"  type="text" placeholder=""/>-->
-              <el-input title="选择部门" v-model="form.fwdept" placeholder="请选择部门" prop="avtiveSend" :disabled="true">
+              <el-input title="选择发文部门" v-model="form.fwdept" 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>
@@ -72,15 +72,15 @@
         </tr>
         <tr>
           <td colspan="2">
-            <el-form-item label="主送：" :disabled="true">
-              <el-input v-model="form.avtiveSend" placeholder="请选择主送人" prop="avtiveSend" :disabled="true">
+            <el-form-item label="主送：" :disabled="true" prop="avtiveSend">
+              <el-input v-model="form.avtiveSend" placeholder="请选择主送人"  :disabled="true">
                 <template slot="append">
                   <el-button
                     type="primary"
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleSelect(0)">
-                    选择人员
+                    选择主送部门
                   </el-button>
                 </template>
               </el-input>
@@ -89,15 +89,15 @@
         </tr>
         <tr>
           <td colspan="2">
-            <el-form-item label=" 抄送：" :disabled="true">
-              <el-input v-model="form.copyTo" placeholder="请选择抄送人" prop="copyTo" :disabled="true">
+            <el-form-item label=" 抄送：" :disabled="true"  prop="copyTo" >
+              <el-input v-model="form.copyTo" placeholder="请选择抄送人":disabled="true">
                 <template slot="append">
                   <el-button
                     type="primary"
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleSelect(1)">
-                    选择人员
+                    选择抄送部门
                   </el-button>
                 </template>
               </el-input>
@@ -127,14 +127,14 @@
         <tr>
           <td colspan="2">
             <el-form-item label="正文：" prop="content">
-              <el-button size="small" type="primary" @click="openIweboffice">打开正文</el-button>
+              <el-button size="small" type="primary" @click="openIweboffice" v-loading.fullscreen.lock="fullscreenLoading">打开正文</el-button>
               <el-input v-model="form.content" type="primary" placeholder=""/>
             </el-form-item>
           </td>
         </tr>
         <tr v-show="false">
           <td>
-            <el-form-item label="actkey：" prop="mailTheme">
+            <el-form-item label="actkey：" prop="actkey">
               <el-input v-model="form.actkey" type="textarea" placeholder=""/>
             </el-form-item>
           </td>
@@ -152,16 +152,18 @@
       <el-button type="primary" @click="deleteToDo()">拒绝</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>
-    <el-dialog id="content" title="正文修改" :visible.sync="contentOpen" :before-close="cancel" append-to-body
+    <el-dialog id="content" title="正文修改"
+               :visible.sync="contentOpen"
+               :before-close="cancel" append-to-body
                width="80%"
                top="10" height="800px">
       <!-- 动态引入组件-->
-      <i-web-office @func="getcontent" :fileData="fileData"></i-web-office>
+          <i-web-office :key="timer" @func="getcontent" :fileData="fileData" ></i-web-office>
     </el-dialog>
 
     <select-user-by-dept ref="selectUserByDept" :title="title" :open="Renopen" @ok="selectOK"/>
 
-    <el-dialog :title="tctitle" :visible.sync="deptOpen" width="20%" append-to-body style="size: 30px">
+    <el-dialog :title="title" :visible.sync="deptOpen" width="40%" append-to-body style="size: 30px">
       <el-tree
         :data="deptOptions"
         show-checkbox
@@ -173,9 +175,8 @@
       ></el-tree>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="getDeptAllCheckedKeys">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancelDept">取 消</el-button>
       </div>
-
     </el-dialog>
 
   </div>
@@ -186,7 +187,7 @@
   import iWebOffice from "./iWebOffice";
   import SelectRen from '@/components/SelectRen';
   import {treeselect} from "@/api/system/dept";
-  import {submitApply, getFormData, deleteToDoItem, submitToDoItem} from "@/api/activiti/form/fw";
+  import {submitApply, getFormData, deleteToDoItem, submitToDoItem,updateInfo} from "@/api/activiti/form/fw";
   import Treeselect from "@riophae/vue-treeselect";
   import {getToken} from "@/utils/auth";
 
@@ -205,12 +206,14 @@
       return {
         Renopen: false,
         receiverName: [],
+        timer: '',
         contentOpen: false,
         receiverAccount: [],
         dialogTableVisible: false,
+        fullscreenLoading: false,
         //正文的文件地址
         fileData: {
-          filePath: '/profile/doc/inche.doc',
+          filePath: '/profile/doc/NewCreate.doc',
           user: 'xxx',
         },
         fileList3: [],
@@ -240,7 +243,7 @@
         form: {
           actkey: '',
           content: '',
-          fwdept:'',
+          fwdept: '',
           ponderance: '',
           securityClass: '',
           copyTo: '',
@@ -249,7 +252,26 @@
         },  // 表单参数
         flg: '',
         // 表单校验
-        rules: {},
+        rules: {
+          fwtitle: [
+            { required: true, message: "标题题不能为空", trigger: "blur" }
+          ],
+          fwdept: [
+            { required: true, message: "请选择发文部门", trigger: "blur" }
+          ],
+          copyTo: [
+            { required: true, message: "请选择抄送部门", trigger: "blur" }
+          ],
+          avtiveSend: [
+            { required: true, message: "请选择主送部门", trigger: "blur" }
+          ],
+          ponderance: [
+            { required: true, message: "请选择缓急程度", trigger: "blur" }
+          ],
+          securityClass: [
+            { required: true, message: "请选择密级等级", trigger: "blur" }
+          ],
+        },
         // 判断是否为提交,还是添加
         open3: false,
         // 判断是否为提交,还是添加
@@ -269,6 +291,7 @@
           "label": "单位",
           "value": 1
         }],
+        loading: true,
         // 上传参数
         upload: {
           // 是否禁用上传
@@ -283,9 +306,11 @@
       };
     },
     created() {
-
+      //flg 为流程状态,undefined:创建新的流程 1:打开代办中的流程, eles为查看流程详情
       this.flg = this.data.flg;
+      //为 启动流程时的key值
       this.form.actkey = this.data.getactkey;
+      //加载部门树表
       this.getTreeselect();
       if (this.flg == undefined) {
         this.open3 = true;
@@ -302,17 +327,17 @@
 
       /** 写 选择人员 按钮弹窗操作 */
       handleSelect(type) {
-        this.$refs.selectUserByDept.childOpen = true;
-        this.Renopen = true;
+        this.deptOpen = true;
         if (type == 0) {
-          this.title = "选择主送人";
+          this.title = "主送部门";
         } else {
-          this.title = "选择抄送人";
+          this.title = "抄送部门";
         }
 
       }, /** 写 选择人员 按钮弹窗操作 */
       handleSelectDept() {
         this.deptOpen = true;
+        this.title = "发文部门";
       },
 
       /** --------------查询部门下拉树结构---------------- */
@@ -348,30 +373,26 @@
         console.log(a)
         checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
         // this.form.fwdept =this.depid;
-        this.form.fwdept = this.depname[0];
+
+        if (this.title == "主送部门") {
+          this.form.avtiveSend = this.depname.toString();
+        } else if (this.title == "抄送部门"){
+          this.form.copyTo = this.depname.toString();;
+        }else {
+          this.form.fwdept = this.depname.toString();
+        }
         this.deptOpen = false;
         this.depname = [];
         this.depid = [];
         return halfCheckedKeys;
 
       },
-      selectOK(zh, xm) {
-        // this.form.avtiveSend = zh;
-        if (this.title == "选择主送人") {
-          this.form.avtiveSend = xm;
-        } else {
-          this.form.copyTo = xm;
-        }
-        this.Renopen = false;
-      },
-
-
-
 
       //返回正文
       getcontent(data) {
-        this.form.content = data;
         this.contentOpen = false;
+        this.form.content = data;
+        this.fileData.filePath = data;
       },
 
       // 文件提交处理
@@ -385,7 +406,7 @@
     // 文件上传成功处理
       handleFileSuccess(response, file, fileList) {
         this.upload.isUploading = false;
-        this.form.assign = response.fileName;
+        this.form.accessory = response.fileName;
         this.msgSuccess(response.msg);
       },
 
@@ -396,7 +417,15 @@
           this.form = response.data;
           this.fileData.filePath = this.form.content;
           this.fileData.user = this.form.user;
-          this.upload.fileList = [{ name: this.form.accessory, url: process.env.VUE_APP_BASE_API+this.form.accessory }];
+          var files= response.data.accessory.split(",")
+          for (var i=0;i<files.length;i++){
+            var fiellist={
+              "name":files[i].substring(files[i].lastIndexOf("/")+1,files[i].length),
+              "url":process.env.VUE_APP_BASE_API+files[i]
+            }
+            this.upload.fileList.push(fiellist)
+          }
+
         });
       },
       openda() {
@@ -406,6 +435,7 @@
       //打开weboffice 页面添加正文
       openIweboffice() {
         // this.$router.push({path:'/actwork/fw/iweboffice'})
+        this.timer = new Date().getTime()
         this.contentOpen = true;
       },
 
@@ -448,6 +478,10 @@
         this.open = true;
         this.title = "公文发文";
       },
+      //关闭部门窗口
+      cancelDept(){
+        this.deptOpen=false;
+      },
 
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -495,10 +529,12 @@
         });
       },
       submitToDo() {
-        this.loading = true;
-        submitToDoItem(this.form.taskid).then(response => {
+        updateInfo(this.form).then(response => {
+        submitToDoItem(this.form.taskid).then(response1 => {
           this.msgSuccess("提交成功");
+            console.log(response1.code)
           this.$emit('getList');
+          });
         })
       },
       //拒绝按钮

src/views/system/actform/fawen/write2.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form ref="form" :model="form" label-width="130px" border>
+    <el-form ref="form" :model="form" :rules="rules"  label-width="130px" border>
       <table width="100%" border="1">
         <tr>
           <td colspan="2"><p class="title">发文起草</p></td>
         </tr>
         <tr>
           <td>
-            <el-form-item label="缓急" prop="urgency">
+            <el-form-item label="缓急" prop="ponderance">
               <el-select v-model="form.ponderance" placeholder="请选择">
                 <el-option label="一般" value="4"></el-option>
                 <el-option label="平急" value="3"></el-option>
@@ -18,7 +18,7 @@
             </el-form-item>
           </td>
           <td>
-            <el-form-item label="密级" prop="encryption">
+            <el-form-item label="密级" prop="securityClass">
               <el-select v-model="form.securityClass" placeholder="请选择">
                 <el-option label="一般" value="3"></el-option>
                 <el-option label="秘密" value="2"></el-option>
@@ -39,30 +39,44 @@
         <tr>
           <td colspan="2">
             <el-form-item label="部门：" prop="fwdept">
-              <el-input title="选择部门" v-model="form.fwdept" placeholder="请选择部门" prop="avtiveSend" :disabled="true">
+              <!--              <el-input v-model="form.fwdept"  type="text" placeholder=""/>-->
+              <el-input title="选择发文部门" v-model="form.fwdept" placeholder="请选择发文部门" prop="avtiveSend" :disabled="true">
+
               </el-input>
             </el-form-item>
           </td>
         </tr>
         <tr>
           <td colspan="2">
-            <el-form-item label="主送：" :disabled="true">
-              <el-input v-model="form.avtiveSend" placeholder="请选择主送人" prop="avtiveSend" :disabled="true">
+            <el-form-item label="主送：" :disabled="true" prop="avtiveSend">
+              <el-input v-model="form.avtiveSend" placeholder="请选择主送人" :disabled="true">
+
               </el-input>
             </el-form-item>
           </td>
         </tr>
         <tr>
           <td colspan="2">
-            <el-form-item label=" 抄送：" :disabled="true">
-              <el-input v-model="form.copyTo" placeholder="请选择抄送人" prop="copyTo" :disabled="true">
+            <el-form-item label=" 抄送：" :disabled="true" prop="copyTo">
+              <el-input v-model="form.copyTo" placeholder="请选择抄送人" :disabled="true">
+
               </el-input>
             </el-form-item>
           </td>
         </tr>
         <tr>
           <td colspan="2">
-            <el-form-item label="附件：" prop="accessory">
+            <el-form-item label="上传附件：" prop="accessory">
+              <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".jpg, .png"
+                :action="upload.url"
+                :headers="upload.headers"
+                :file-list="upload.fileList"
+                :auto-upload="false">
+                <div slot="tip" class="el-upload__tip">只能上传文件，且不超过500kb</div>
+              </el-upload>
             </el-form-item>
           </td>
         </tr>
@@ -84,7 +98,7 @@
         <tr v-if="postForm.SelectUserType!=null&&postForm.SelectUserType.includes('custom')">
           <td colspan="2">
             <el-form-item label="选择下一步处理人：" :disabled="true">
-              <el-input v-model="postForm.sendUserRealName" placeholder="请选择下一步处理人"
+              <el-input v-model="postForm.sendUserRealName" placeholder=" 请选择下一步处理人"
                         prop="avtiveSend" :disabled="true">
                 <template slot="append">
                   <el-button
@@ -110,7 +124,23 @@
                width="80%"
                top="10" height="800px">
       <!-- 动态引入组件-->
-      <i-web-office @func="getcontent" :fileData="fileData"></i-web-office>
+      <i-web-office  :key="timer" @func="getcontent" :fileData="fileData"></i-web-office>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="deptOpen" width="40%" append-to-body style="size: 30px">
+      <el-tree
+        :data="deptOptions"
+        show-checkbox
+        default-expand-all
+        ref="dept"
+        node-key="id"
+        empty-text="加载中，请稍后"
+        :props="defaultProps"
+      ></el-tree>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="getDeptAllCheckedKeys">确 定</el-button>
+        <el-button @click="cancelDept">取 消</el-button>
+      </div>
     </el-dialog>
 
     <select-user-by-dept ref="selectUserByDept" :title="title" :open="Renopen" @ok="selectOK"/>
@@ -124,7 +154,7 @@
   import iWebOffice from './iWebOffice'
   import SelectRen from '@/components/SelectRen'
   import { treeselect } from '@/api/system/dept'
-  import { submitApply, getFormData, deleteToDoItem, submitToDoItem } from '@/api/activiti/form/fw'
+  import { getFormData, deleteToDoItem, submitToDoItem,updateInfo } from '@/api/activiti/form/fw'
   import Treeselect from '@riophae/vue-treeselect'
   import { getToken } from '@/utils/auth'
 
@@ -145,15 +175,18 @@
         contentOpen: false,
         //正文的文件地址
         fileData: {
-          filePath: '/profile/doc/inche.doc',
+          filePath: '/profile/doc/NewCreate.doc',
           user: 'xxx'
         },
         // 弹出层标题
         title: '',
+        //子组件每次打开刷新
+        timer: '',
         // 是否显示弹出层
         open: false,
         // 表单参数
         form: {
+          fwtitle: '',
           actkey: '',
           content: '',
           fwdept: '',
@@ -168,6 +201,27 @@
           sendUserRealName: '',
           sendUser: ''
         },
+        // 表单校验
+        rules: {
+          fwtitle: [
+            { required: true, message: "标题题不能为空", trigger: "blur" }
+          ],
+          fwdept: [
+            { required: true, message: "请选择发文部门", trigger: "blur" }
+          ],
+          copyTo: [
+            { required: true, message: "请选择抄送部门", trigger: "blur" }
+          ],
+          avtiveSend: [
+            { required: true, message: "请选择主送部门", trigger: "blur" }
+          ],
+          ponderance: [
+            { required: true, message: "请选择缓急程度", trigger: "blur" }
+          ],
+          securityClass: [
+            { required: true, message: "请选择密级等级", trigger: "blur" }
+          ],
+        },
         flg: '',
         // 判断是否为提交,还是添加
         open4: false,
@@ -176,18 +230,28 @@
         deptOpen: false,
         // 部门树选项
         deptOptions: [],
+        defaultProps: {
+          children: "children",
+          label: "label"
+        },
         // 部门id
         depid: [],
         depname: [],
         // 上传参数
         upload: {
+          // 是否禁用上传
+          isUploading: false,
+          // 设置上传的请求头部
+          headers: {Authorization: "Bearer " + getToken()},
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/common/upload",
           // 上传的文件列表
           fileList: []
-        }
+        },
       }
     },
     created() {
-
+      //flg 为流程状态, 1:打开代办中的流程, eles  为查看流程详情
       this.flg = this.data.flg
       this.form.actkey = this.data.getactkey
       if (this.flg == '1') {
@@ -200,56 +264,85 @@
       }
     },
     methods: {
+
+
+
       /** 写 选择人员 按钮弹窗操作 */
+    /*  handleSelect(type) {
+        this.deptOpen = true;
+        if (type == 0) {
+          this.title = "主送部门";
+        } else {
+          this.title = "抄送部门";
+        }
+
+      }, /!** 写 选择人员 按钮弹窗操作 *!/
+      handleSelectDept() {
+        this.deptOpen = true;
+        this.title = "发文部门";
+      },*/
       handleSelect() {
         this.$refs.selectUserByDept.childOpen = true
         this.Renopen = true
       },
+
       // 取消按钮
       cancel() {
         this.$emit('getList')
         this.contentOpen = false
         this.open = false
         this.reset()
-
+      },
+      cancelDept(){
+        this.deptOpen=false;
       },
       selectOK(zh, xm) {
         this.postForm.sendUser = zh
         this.postForm.sendUserRealName = xm
         this.Renopen = false
       },
-
       //返回正文
       getcontent(data) {
-        this.form.content = data
-        this.contentOpen = false
+        this.contentOpen = false;
+        this.form.content = data;
+        this.fileData.filePath = data;
       },
 
       //获取详细信息，修改用到
       getDetails() {
         getFormData(this.form.formId).then(response => {
-          this.form = response.data
+          this.form = response.data;
+          //下一节点用户选择规则
           this.postForm.SelectUserType = response.data.SelectUserType
-          this.fileData.filePath = this.form.content
-          this.fileData.user = this.form.user
-          this.upload.fileList = [{
-            name: this.form.accessory,
-            url: process.env.VUE_APP_BASE_API + this.form.accessory
-          }]
-        })
+          this.fileData.filePath = this.form.content==""?"/profile/doc/NewCreate.doc":this.form.content;
+          this.fileData.user = this.form.user;
+          var files= response.data.accessory.split(",")
+          for (var i=0;i<files.length;i++){
+            var fiellist={
+              "name":files[i].substring(files[i].lastIndexOf("/")+1,files[i].length),
+              "url":process.env.VUE_APP_BASE_API+files[i]
+            }
+            this.upload.fileList.push(fiellist)
+          }
+
+        });
       },
 
       //打开weboffice 页面添加正文
       openIweboffice() {
-        // this.$router.push({path:'/actwork/fw/iweboffice'})
+        this.timer = new Date().getTime()
         this.contentOpen = true
       },
       //同意
       submitToDo() {
-        this.loading = true
-        submitToDoItem(this.form.taskid, this.postForm).then(response => {
-          this.msgSuccess('提交成功')
-          this.$emit('getList')
+        updateInfo(this.form).then(response => {
+          if(response.code==200){
+           submitToDoItem(this.form.taskid, this.postForm).then(response1 => {
+            this.msgSuccess('提交成功')
+            console.log(response1.code)
+             this.$emit('getList')
+          });
+          }
         })
       },
       //拒绝按钮