6、实现首页待办工作、已办工作 、待签通知、未读邮件。

修改我的申请,代办,已办列表 翻页显示

src/api/activiti/form/fw.js

@@ -23,13 +23,14 @@ export function updateInfo(query) {
 }
 
 // 发文待办列表
-export function listInfo(query) {
+/*export function listInfo(query) {
   return request({
     url: '/fw/toDoFwList',
     method: 'get',
     params: query
   })
-}// 待办列表
+}*/
+// 待办列表
 export function toDoItemListInfo(query) {
   return request({
     url: '/fw/toDoAllList',

src/components/files/option.vue

@@ -3,14 +3,14 @@
             <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">
+                  <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>
@@ -18,7 +18,7 @@
               <el-form-item label="档案名称" prop="archivesName">
                 <el-input v-model="form.archivesName" placeholder="请输入档案名称" />
               </el-form-item>
-              <el-form-item label="档案actkey" prop="actkey">
+              <!--<el-form-item label="档案actkey" prop="actkey">
                 <el-input v-model="form.actkey" placeholder="请输入档案名称" />
               </el-form-item>
               <el-form-item label="档案id" prop="taskid">
@@ -26,7 +26,7 @@
               </el-form-item>
               <el-form-item label="流程名称" prop="processName">
                 <el-input v-model="form.processName" placeholder="请输入流程名称" />
-              </el-form-item>
+              </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">
@@ -123,7 +123,6 @@
         });
       },
       submit(){
-
         addArchives(this.form).then(response => {
             this.msgSuccess("成功");
         });

src/views/dashboard/LineChart.vue

@@ -6,22 +6,8 @@
       <el-button style="float: right; padding: 3px 0;color: #000000;" type="text" @click="more">更多</el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="我的申请" name="first">
-        <el-table :data="myApplication" style="width: 100%;" :header-cell-style="{}">
-          <!--             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>-->
-          <el-table-column prop="fwtitle" label="标题"  align="left" >
-            <template slot-scope="scope">
-              <el-button type="text" @click="myAppReturn(scope.row)" style="color: black">{{scope.row.fwtitle}}</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" width="180" align="center">
-            <template slot-scope="scope">
-              <span>{{scope.row.create_time | timefilters}}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="待办工作" name="second">
+
+      <el-tab-pane label="待办工作" name="first">
         <el-table :data="toListItem" style="width: 100%;" :header-cell-style="[]" empty-text="暂无数据">
           <template slot="empty">
             <div>
@@ -45,7 +31,21 @@
 
         </el-table>
       </el-tab-pane>
-
+      <el-tab-pane label="我的申请" name="second">
+        <el-table :data="myApplication" style="width: 100%;" :header-cell-style="{}">
+          <!--             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>-->
+          <el-table-column prop="fwtitle" label="标题"  align="left" >
+            <template slot-scope="scope">
+              <el-button type="text" @click="myAppReturn(scope.row)" style="color: black">{{scope.row.fwtitle}}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" label="创建时间" width="180" align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.create_time | timefilters}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
 
     </el-tabs>
     <el-dialog id="actform" title="流程详情" :visible.sync="actOpen" :before-close="cancel" append-to-body width="80%"
@@ -96,7 +96,6 @@
         optionactkey:'',
         optionName:'',
         optionid:'',
-        optiontrue:false,
         actForm: null,
         actForm1: null,
         actOpen:false,
@@ -200,11 +199,16 @@
         this.loading = true;
         //我的申请
         listInfo(this.queryParams).then(response => {
-            response.rows.length=4
+
             this.myApplication=response.rows
+          if(this.myApplication.length<4){
+            this.myApplication.length=response.rows.length
+          }else{
+            this.myApplication.length=4
+          }
             this.title = response.title;
             this.loading = false;
-            console.log(this.myApplication)
+          // this.$emit('getNum','sq',response.total)
           // this.loading = true
         });
 
@@ -223,14 +227,15 @@
       //   });
        // 待办请求
         toDoItemListInfo(this.queryParams).then(response => {
-          console.log(response.rows)
-          console.log("a"+this.queryParams)
-          console.log("a"+this.queryParams)
-          response.rows.length=4
           this.toListItem = response.rows;
+          if(this.toListItem.length<4){
+            this.toListItem.length=response.rows.length
+          }else{
+            this.toListItem.length=4
+          }
           this.title = response.title;
           this.loading = false;
-
+          this.$emit('getNum','db',response.total)
         });
         this.actOpen=false;
         this.actOpen1=false;
@@ -290,11 +295,10 @@
 
       more(){
         if(this.activeName=='first'){
-          this.$router.replace('/meapply')
-        }else {
           this.$router.replace('/todo')
+        }else {
+          this.$router.replace('/meapply')
         }
-
       },
     }
   };

src/views/dashboard/PanelGroup.vue

@@ -1,54 +1,54 @@
 <template>
   <el-row :gutter="40" class="panel-group">
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+      <div class="card-panel" @click="more('dbgz')">
         <div class="card-panel-icon-wrapper icon-people">
           <svg-icon icon-class="peoples" class-name="card-panel-icon" />
         </div>
-        <div class="card-panel-description">
+        <div class="card-panel-description"  >
           <div class="card-panel-text">
             待办工作
           </div>
-          <count-to :start-val="0" :end-val="18" :duration="20" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="this.nums.todoNum" :duration="20" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
+      <div class="card-panel" @click="more('ybgz')">
         <div class="card-panel-icon-wrapper icon-message">
           <svg-icon icon-class="message" class-name="card-panel-icon" />
         </div>
-        <div class="card-panel-description">
+        <div class="card-panel-description"  >
           <div class="card-panel-text">
-            待签个人通知
+            已办工作
           </div>
-          <count-to :start-val="0" :end-val="12" :duration="30" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="this.nums.doNum" :duration="30" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+      <div class="card-panel" @click="more('gztz')">
         <div class="card-panel-icon-wrapper icon-money">
           <svg-icon icon-class="message" class-name="card-panel-icon" />
         </div>
-        <div class="card-panel-description">
+        <div class="card-panel-description" >
           <div class="card-panel-text">
-            未处理的承办事项
+            待签通知
           </div>
-          <count-to :start-val="0" :end-val="10" :duration="30" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="this.nums.notificationNum" :duration="30" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+      <div class="card-panel" @click="more('wdyj')">
         <div class="card-panel-icon-wrapper icon-shopping">
           <svg-icon icon-class="message" class-name="card-panel-icon" />
         </div>
-        <div class="card-panel-description">
+        <div class="card-panel-description"  >
           <div class="card-panel-text">
-            需要回执的文件
+            未读邮件
           </div>
-          <count-to :start-val="0" :end-val="13" :duration="30" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="this.nums.myapplication" :duration="30" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -57,15 +57,48 @@
 
 <script>
 import CountTo from 'vue-count-to'
-
+import {list1}from "@/api/system/email/detail";
 export default {
   components: {
     CountTo
   },
+  props: {
+    nums:{
+      todoNum:0,
+      // myapplication:0,
+      doNum:0,
+      notificationNum:0,
+    }
+  },
+  created() {
+    this.getWorkNum();
+  },
   methods: {
     handleSetLineChartData(type) {
       this.$emit('handleSetLineChartData', type)
-    }
+    },
+    getWorkNum(){
+      var queryParam={
+        pageNum: 1,
+        pageSize: 1,
+        readFlag: 0,
+        status: 1,
+      }
+      list1(queryParam).then(response => {
+        this.nums.myapplication=response.total
+      })
+    },
+    more(type){
+      if(type=="dbgz"){
+        this.$router.replace('/todo')
+      }else if(type=="ybgz"){
+        this.$router.replace('/havedone')
+      }else if(type=="gztz"){
+        this.$router.replace('/mylist')
+      }else if(type=="wdyj"){
+        this.$router.replace('/email/receiveList')
+      }
+    },
   }
 }
 </script>

src/views/dashboard/PieChart.vue

@@ -89,8 +89,6 @@
           ],
         },
         tztitle: "通知详情",
-        tzshow: false,
-        xxloading: true,
       };
     },
     created() {
@@ -122,7 +120,6 @@
       getList() {
         this.loading = true;
         listInfo(this.queryParams).then(response => {
-          console.log(response.rows)
           this.infoList = response.rows;
           this.loading = false;
           let result=response.rows;
@@ -131,6 +128,7 @@
               result[i].title=result[i].title.substring(0,10)+"...";
             }
           }
+          this.$emit('getNum','tz',response.total)
         });
       },
       /** 详情按钮操作 */

src/views/dashboard/RaddarChart.vue

@@ -74,9 +74,9 @@
      getList() {
        this.loading = true;
        havedInfo(this.raddarParams).then(response => {
-         console.log(response.rows)
          this.doneList = response.rows;
          this.loading = false;
+         this.$emit('getNum','yb',response.total)
        });
      },
      more(){

src/views/index.vue

@@ -1,24 +1,24 @@
 <template>
 <!--  rgb(36, 151, 241)      #2368c5     #323345   #d2d2d2-->
   <div class="dashboard-editor-container">
-   <panel-group/>
+   <panel-group :nums="nums"/>
    <el-row>
      <el-col :xs="24" :sm="24" :lg="16">
-       <LineChart :chart-data="lineChartData" style="padding:0;background-color: #fff;" />
+       <LineChart @getNum="getNum" style="padding:0;background-color: #fff;" />
      </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="chart-wrapper">
-          <BarChart/>
+          <BarChart @getNum="getNum" />
         </div>
       </el-col>
       <el-col :xs="24" :sm="24" :lg="16">
         <div class="chart-wrapper">
-          <RaddarChart />
+          <RaddarChart @getNum="getNum"/>
         </div>
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
           <div class="chart-wrapper">
-            <PieChart />
+            <PieChart @getNum="getNum"/>
           </div>
         </el-col>
     </el-row>
@@ -59,12 +59,26 @@ export default {
   },
   data() {
     return {
-      lineChartData: lineChartData.newVisitis
+      lineChartData: lineChartData.newVisitis,
+      nums:{
+        todoNum:0,
+        doNum:0,
+        notificationNum:0,
+      }
     }
   },
   methods: {
     handleSetLineChartData(type) {
       this.lineChartData = lineChartData[type]
+    },
+    getNum(name,number){
+        if(name=="db"){
+        this.nums.todoNum=number;
+      }else if(name=="yb"){
+        this.nums.doNum=number;
+      }else {
+        this.nums.notificationNum=number;
+      }
     }
   }
 }

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

@@ -1,5 +1,6 @@
 <template>
-  <div style="width:100%;height:600px; bottom:20px;">
+
+  <div >
     <el-button  type="success" value="保存文档到服务器" @click="SaveDocument()">保存文档到服务器</el-button>
     <el-button  type="primary" value="打开本地文档(有窗口)" @click="OnUnLoad(),openlocal()">打开本地文档(有窗口)</el-button>
     <el-button  type="info" value="锁定文档" @click="WebSetProtect(true, '123456')">锁定文档</el-button>
@@ -8,7 +9,9 @@
     <el-button   type="info" style="background:#6E30B4;" value="解除区域保护" @click="WebAreaUnProtect()">解除区域保护</el-button>
     <el-button   type="info" style="background:#303133" value="禁止拷贝" @click="WebEnableCopy()">禁止拷贝</el-button>
     <el-button   type="info"  style="background:#19868E"value="允许拷贝" @click="WebEnableCopy()">允许拷贝</el-button>
+    <div style="width:100%;height:700px; bottom:20px;">
     <div id="office"></div>
+    </div>
   </div>
 </template>
 <script>
@@ -71,7 +74,7 @@
           this.webOfficeObj.FileType = "." + this.fileData.filePath.split(".")[this.fileData.filePath.split(".").length - 1]; //FileType:文档类型  .doc  .xls
           this.webOfficeObj.ShowWindow = false; //显示/隐藏进度条
           this.webOfficeObj.EditType = this.fileData.EditType; //设置加载文档类型 0 锁定文档，1无痕迹模式，2带痕迹模式
-          this.webOfficeObj.ShowMenu = 1;
+          this.webOfficeObj.ShowMenu = 0;
           this.webOfficeObj.ShowToolBar = 0;
           this.webOfficeObj.SetCaption(this.webOfficeObj.UserName + "正在编辑文档"); // 设置控件标题栏标题文本信息
           //参数顺序依次为：控件标题栏颜色、自定义菜单开始颜色、自定义工具栏按钮开始颜色、自定义工具栏按钮结束颜色、
@@ -89,10 +92,8 @@
 
             // this.msgSuccess(this.webOfficeObj.Status);
           }    //设置控件皮肤
-
           if (this.webOfficeObj.WebOpen()) {
             this.msgSuccess(this.webOfficeObj.Status);
-
           }
           // if (this.webOfficeObj.WebOpen2(this.webOfficeObj.FileName)) {
           //     alert(webOfficeObj.Status);

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

@@ -52,10 +52,19 @@
             </el-form-item>
           </td>
         </tr>
+
+        <!--园林局样式-->
         <tr>
+          <td colspan="2">
+            <el-form-item label="发文字号：" prop="fwtitle">
+              <el-input v-model="form.referenceNumber" type="text" placeholder=""/>
+            </el-form-item>
+          </td>
+        </tr>
+        <!--<tr>
           <td colspan="2">
             <el-form-item label="部门：" prop="fwdept">
-              <!--              <el-input v-model="form.fwdept"  type="text" placeholder=""/>-->
+              &lt;!&ndash;              <el-input v-model="form.fwdept"  type="text" placeholder=""/>&ndash;&gt;
               <el-input title="选择发文部门" v-model="form.fwdept" placeholder="请选择发文部门" prop="avtiveSend" :disabled="true">
                 <template slot="append">
                   <el-button
@@ -103,7 +112,7 @@
               </el-input>
             </el-form-item>
           </td>
-        </tr>
+        </tr>-->
         <tr>
           <td colspan="2">
             <el-form-item label="上传附件：" prop="accessory">
@@ -130,10 +139,11 @@
           </td>
         </tr>
         <tr>
-          <td colspan="2">
-            <el-form-item label="正文：" prop="content">
-              <el-button size="small" type="primary" @click="openIweboffice" v-loading.fullscreen.lock="fullscreenLoading">打开正文</el-button>
+          <td colspan="6">
+            <el-form-item  label="正文：" prop="content"  v-if="contentOpen" :loading="contentOpen">
+<!--              <el-button size="small" type="primary" @click="openIweboffice" v-loading.fullscreen.lock="fullscreenLoading">打开正文</el-button>-->
 <!--              <el-input v-model="form.content" type="primary" placeholder=""/>-->
+              <i-web-office :key="timer" @func="getcontent" :fileData="fileData" ></i-web-office>
             </el-form-item>
           </td>
         </tr>
@@ -157,19 +167,19 @@
       <el-button type="primary" @click="deleteToDo()">拒绝</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>
-    <el-dialog id="content" title="正文修改"
+
+ <!--   <el-dialog id="content" title="正文修改"
                :visible.sync="contentOpen"
                :before-close="cancel1" append-to-body
                width="80%"
                top="10"
 
                height="900px">
-      <!-- 动态引入组件-->
-          <i-web-office :key="timer" @func="getcontent" :fileData="fileData" ></i-web-office>
+      <i-web-office :key="timer" @func="getcontent" :fileData="fileData" ></i-web-office>
       <span slot="footer" class="dialog-footer">
         <el-button @click="contentOpen = false">取 消</el-button>
       </span>
-    </el-dialog>
+    </el-dialog>-->
 
 <!--    <select-user-by-dept ref="selectUserByDept" :title="title" :open="Renopen" @ok="selectOK"/>-->
 
@@ -255,6 +265,7 @@
           actkey: '',
           content: '',
           fwdept: '',
+          referenceNumber: '',
           ponderance: '',
           securityClass: '',
           copyTo: '',
@@ -267,7 +278,7 @@
           fwtitle: [
             { required: true, message: "标题题不能为空", trigger: "blur" }
           ],
-          fwdept: [
+          /*fwdept: [
             { required: true, message: "请选择发文部门", trigger: "blur" }
           ],
           copyTo: [
@@ -275,7 +286,7 @@
           ],
           avtiveSend: [
             { required: true, message: "请选择主送部门", trigger: "blur" }
-          ],
+          ],*/
           ponderance: [
             { required: true, message: "请选择缓急程度", trigger: "blur" }
           ],
@@ -324,13 +335,18 @@
       this.form.actkey = this.data.getactkey;
       //加载部门树表
       this.getTreeselect();
+      //flg=undefined 新增发文时; flg=1 页面正在流程中;else 查看详情时
       if (this.flg == undefined) {
         this.open3 = true;
-      } else if (this.flg == '1') {
+        //打开weboffice
+        this.contentOpen = true;
+      }
+      else if (this.flg == '1') {
         this.form = this.data;
         this.getDetails();
         this.open4 = true;
-      } else {
+      }
+      else {
         this.form = this.data;
         this.getDetails();
       }
@@ -452,6 +468,8 @@
           this.form = response.data;
           this.fileData.filePath = this.form.content==""?"/profile/doc/NewCreate.doc":this.form.content;
           this.fileData.user = this.form.user;
+          //打开weboffice
+          this.contentOpen = true;
           if (response.data.accessory!=""){
           var files= response.data.accessory.split(",")
           for (var i=0;i<files.length;i++){

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

@@ -36,10 +36,18 @@
             </el-form-item>
           </td>
         </tr>
+        <!--园林局样式-->
         <tr>
+          <td colspan="2">
+            <el-form-item label="发文字号：" prop="fwtitle">
+              <el-input v-model="form.referenceNumber" type="text" placeholder=""/>
+            </el-form-item>
+          </td>
+        </tr>
+      <!--  <tr>
           <td colspan="2">
             <el-form-item label="部门：" prop="fwdept">
-              <!--              <el-input v-model="form.fwdept"  type="text" placeholder=""/>-->
+              &lt;!&ndash;              <el-input v-model="form.fwdept"  type="text" placeholder=""/>&ndash;&gt;
               <el-input title="选择发文部门" v-model="form.fwdept" placeholder="请选择发文部门" prop="avtiveSend" :disabled="true">
 
               </el-input>
@@ -63,7 +71,7 @@
               </el-input>
             </el-form-item>
           </td>
-        </tr>
+        </tr>-->
         <tr>
           <td colspan="2">
             <el-form-item label="附件：" prop="accessory">
@@ -82,10 +90,11 @@
           </td>
         </tr>
         <tr>
-          <td colspan="2">
-            <el-form-item label="正文：" prop="content">
-              <el-button size="small" type="primary" @click="openIweboffice">打开正文</el-button>
-<!--              <el-input v-model="form.content" type="primary" placeholder=""/>-->
+          <td colspan="6">
+            <el-form-item  label="正文：" prop="content"  v-if="contentOpen" :loading="contentOpen">
+              <!--              <el-button size="small" type="primary" @click="openIweboffice" v-loading.fullscreen.lock="fullscreenLoading">打开正文</el-button>-->
+              <!--              <el-input v-model="form.content" type="primary" placeholder=""/>-->
+              <i-web-office :key="timer" @func="getcontent" :fileData="fileData" ></i-web-office>
             </el-form-item>
           </td>
         </tr>
@@ -143,16 +152,16 @@
       <el-button type="primary" @click="submitFw()">提交</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>
-    <el-dialog id="content" title="正文修改" :visible.sync="contentOpen"
+    <!--<el-dialog id="content" title="正文修改" :visible.sync="contentOpen"
                :before-close="cancel1" append-to-body
                width="80%"
                top="10" height="900px">
-      <!-- 动态引入组件-->
+      &lt;!&ndash; 动态引入组件&ndash;&gt;
       <i-web-office :key="timer" @func="getcontent" :fileData="fileData"></i-web-office>
       <span slot="footer" class="dialog-footer">
         <el-button @click="contentOpen = false">取 消</el-button>
       </span>
-    </el-dialog>
+    </el-dialog>-->
 
     <select-user-by-dept ref="selectUserByDept" :title="title" :open="Renopen"
                          :inputName="postForm.sendUserRealName"
@@ -345,13 +354,17 @@
           this.form = response.data
           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]
+          //打开weboffice
+          this.contentOpen = true;
+          if (response.data.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)
             }
-            this.upload.fileList.push(fiellist)
           }
           //下一节点用户选择规则
           this.postForm.SelectUserType = response.data.SelectUserType

static/iweboffice/WebOffice.js

@@ -1956,7 +1956,6 @@ function WebOffice2015() {
 			CustomToolbarStartColor/* 自定义工具栏开始颜色 */, TitleBarTextColor/* 控件标题栏文本颜色 */) {
 		this.Status = '';
 		var style = this.obj.Style;
-
 		try {
 			style.TitleBarColor = titleBarColor;
 			if ((TitleBarTextColor == undefined) || (TitleBarTextColor == '')) // 设置默认标题文字颜色