Merge remote-tracking branch 'origin/master'

public/index.html

@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>兴光评估系统平台</title>
+  <title>兴光系统平台</title>
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/static/img/favicon.ico">

src/api/cw/projectRecords/ProjectRecordsService.js

@@ -43,4 +43,12 @@ export default class ProjectRecordsService {
       data: data
     })
   }
+  exportFile (params) {
+    return request({
+      url: '/cwProjectRecords/export',
+      method: 'get',
+      params: params,
+      responseType: 'blob'
+    })
+  }
 }

src/api/cw/projectRecords/ProjectReportArchiveDetailService.js

@@ -0,0 +1,20 @@
+import request from '@/utils/httpRequest'
+
+export default class ProjectReportArchiveDetailService {
+  list (params) {
+    return request({
+      url: '/cwProjectReportArchiveDetail/list',
+      method: 'get',
+      params: params
+    })
+  }
+
+  exportExcel (params) {
+    return request({
+      url: '/cwProjectReportArchiveDetail/export',
+      method: 'get',
+      params: params,
+      responseType: 'blob'
+    })
+  }
+}

src/api/cw/projectRecords/ProjectReportArchiveService.js

@@ -50,4 +50,12 @@ export default class ProjectReportArchiveService {
       data: data
     })
   }
+  exportFile (params) {
+    return request({
+      url: '/cwProjectReportArchive/export',
+      method: 'get',
+      params: params,
+      responseType: 'blob'
+    })
+  }
 }

src/api/cw/reportManagement/ProjectReportService.js

@@ -50,4 +50,48 @@ export default class ProjectReportService {
       params: params
     })
   }
+  saveFlowableParam (inputForm) {
+    return request({
+      url: `/cwProjectReport/saveFlowableParam`,
+      method: 'post',
+      data: inputForm
+    })
+  }
+  updateSignatureStatusById (data) {
+    return request({
+      url: '/cwProjectReport/updateSignatureStatusById',
+      method: 'post',
+      data: data
+    })
+  }
+  queryBySignatureId (id) {
+    return request({
+      url: '/cwProjectReport/queryBySignatureId',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  findBySignatureId (id) {
+    return request({
+      url: '/cwProjectReport/findBySignatureId',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  saveData (inputForm) {
+    return request({
+      url: `/cwProjectReport/saveData`,
+      method: 'post',
+      data: inputForm
+    })
+  }
+
+  exportExcel (params) {
+    return request({
+      url: '/cwProjectReport/export',
+      method: 'get',
+      params: params,
+      responseType: 'blob'
+    })
+  }
 }

src/api/cw/workClientInfo/WorkClientService.js

@@ -43,4 +43,12 @@ export default class WorkClientService {
       data: data
     })
   }
+  exportFile (params) {
+    return request({
+      url: '/cw_work_client/info/export',
+      method: 'get',
+      params: params,
+      responseType: 'blob'
+    })
+  }
 }

src/utils/index.js

@@ -178,7 +178,7 @@ export function unescapeHTML (a) {
 
 export function printLogo () {
   console.info(
-    '%c欢迎使用%c兴光评估系统平台',
+    '%c欢迎使用%c兴光系统平台',
     'color: #ffffff; background: #000000; padding:5px 10px 5px 10px;font-size:40px;border-radius:12px 0 0 12px;', 'color: #000000; background: #FE9A00; padding:5px 10px;font-size:40px;border-radius:0 12px 12px 0;')
 }
 

src/views/modules/cw/projectRecords/ProjectRecordsForm.vue

@@ -19,8 +19,6 @@
             <el-col :span="24">
               <el-form-item label="合同名称" prop="contractName"
                             :rules="[
-                          {required: true, message:'合同不能为空', trigger:'blur'},
-                          {required: true, message:'合同不能为空', trigger:'change'}
                  ]">
                 <el-input size="medium" :readonly="true" @focus="openContract()" v-model="inputForm.contractName" placeholder="请选择合同">
                   <el-button slot="append" icon="el-icon-search" @click="openContract()"></el-button>
@@ -479,6 +477,17 @@
           // 暂存
           // this.inputForm.status = '1'
           this.loading = true
+          if (this.commonJS.isNotEmpty(this.inputForm.planEndDate) && this.commonJS.isNotEmpty(this.inputForm.planStartDate)) {
+            if (this.moment(this.inputForm.planEndDate).format('YYYY-MM-DD') < this.moment(this.inputForm.planStartDate).format('YYYY-MM-DD') || this.moment(this.inputForm.planEndDate).format('YYYY-MM-DD') === this.moment(this.inputForm.planStartDate).format('YYYY-MM-DD')) {
+              this.$message.error('项目预计开始时间要小于项目预计结束时间')
+              this.loading = false
+              throw new Error('项目预计开始时间要小于项目预计结束时间')
+            }
+          } else {
+            this.$message.error('“项目预计开始时间”和“项目预计结束时间”不允许为空')
+            this.loading = false
+            throw new Error('“项目预计开始时间”和“项目预计结束时间”不允许为空')
+          }
           if (this.$refs.uploadComponent.checkProgress()) {
             this.loading = false
             return
@@ -580,6 +589,7 @@
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
+        this.$emit('refreshList')
         this.visible = false
       },
       tabHandleClick (event) {

src/views/modules/cw/projectRecords/ProjectRecordsList.vue

@@ -9,7 +9,8 @@
         <el-input size="small" v-model="searchForm.projectNumber" placeholder="请输入项目编号" clearable></el-input>
       </el-form-item>
       <el-form-item label="项目经理" prop="projectMasterName">
-        <el-input size="small" v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>
+<!--        <el-input size="small" v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
+        <UserSelect :limit='1' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
       </el-form-item>
       <el-form-item label="创建时间" prop="createDates">
         <el-date-picker
@@ -40,7 +41,7 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top" style="">
-      <vxe-toolbar :refresh="{query: refreshList}" custom>
+      <vxe-toolbar :refresh="{query: refreshList}" export custom>
         <template #buttons>
           <el-button v-if="hasPermission('cwProjectRecords:add')" type="primary" size="small" icon="el-icon-plus" @click="start()">新建</el-button>
           <!--          <el-button v-if="hasPermission('klg:question:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.questionsTable && $refs.questionsTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
@@ -62,9 +63,18 @@
           :menu-config="{}"
           @sort-change="sortChangeHandle"
           :sort-config="{remote:true}"
+          :export-config="{
+                    remote: true,
+                    filename: `项目数据${moment(new Date()).format('YYYY-MM-DD')}`,
+                    sheetName: `项目数据${moment(new Date()).format('YYYY-MM-DD')}`,
+                    exportMethod: exportMethod,
+                    types: ['xlsx'],
+                    modes: ['current', 'selected', 'all']
+                  }"
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column min-width="230" align="center" title="项目名称" field="projectName">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectRecords:view')" @click="view(scope.row.id)">{{scope.row.projectName}}</el-link>
@@ -86,11 +96,11 @@
           </vxe-column>
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('cwProjectRecords:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text" icon="el-icon-edit" size="small" @click="push(scope.row)">修改</el-button>
-              <el-button v-else-if="hasPermission('cwProjectRecords:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="hasPermission('cwProjectRecords:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='2'" type="text" icon="el-icon-edit" size="small" @click="reback(scope.row)">撤回</el-button>
-              <el-button v-if="hasPermission('cwProjectRecords:del')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
-              <el-button v-else-if="hasPermission('cwProjectRecords:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('cwProjectRecords:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  size="small" @click="push(scope.row)">修改</el-button>
+              <el-button v-else-if="hasPermission('cwProjectRecords:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('cwProjectRecords:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
+              <el-button v-if="hasPermission('cwProjectRecords:del')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-else-if="hasPermission('cwProjectRecords:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -106,7 +116,7 @@
         </vxe-pager>
       </div>
     </div>
-    <ProjectRecordsForm ref="projectRecordsForm"></ProjectRecordsForm>
+    <ProjectRecordsForm ref="projectRecordsForm" @refreshList="refreshList"></ProjectRecordsForm>
   </div>
 </template>
 
@@ -117,6 +127,7 @@
   import ProjectRecordsForm from './ProjectRecordsForm'
   import pick from 'lodash.pick'
   import UserService from '@/api/sys/UserService'
+  import UserSelect from '@/components/userSelect'
   export default {
     data () {
       return {
@@ -152,7 +163,8 @@
       this.userService = new UserService()
     },
     components: {
-      ProjectRecordsForm
+      ProjectRecordsForm,
+      UserSelect
     },
     computed: {
       userName () {
@@ -202,7 +214,7 @@
         }).then(({data}) => {
           this.dataList = data.records
           this.tablePage.total = data.total
-          this.tableKey = Math.random()
+          // this.tableKey = Math.random()
           this.loading = false
         })
         this.checkIsAdmin()
@@ -346,6 +358,31 @@
             }
           })
         })
+      },
+      // 自定义服务端导出
+      exportMethod ({ options }) {
+        // 传给服务端的参数
+        const params = {
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm,
+          filename: options.filename,
+          sheetName: options.sheetName,
+          isHeader: options.isHeader,
+          original: options.original,
+          mode: options.mode,
+          selectIds: options.mode === 'selected' ? options.data.map(item => item.id) : [],
+          exportFields: options.columns.map(column => column.property)
+        }
+        return this.projectRecordsService.exportFile(params).then((res) => {
+          // 将二进制流文件写入excel表，以下为重要步骤
+          this.$utils.downloadExcel(res.data, options.filename)
+        }).catch(function (err) {
+          if (err.response) {
+            console.log(err.response)
+          }
+        })
       }
     }
   }

src/views/modules/cw/projectRecords/ProjectRecordsTaskForm.vue

@@ -10,8 +10,6 @@
             <el-col :span="24">
               <el-form-item label="合同名称" prop="contractName"
                             :rules="[
-                          {required: true, message:'合同不能为空', trigger:'blur'},
-                          {required: true, message:'合同不能为空', trigger:'change'}
                  ]">
                 <el-input size="medium" :readonly="true" @focus="openContract()" v-model="inputForm.contractName" placeholder="请选择合同">
                   <el-button slot="append" icon="el-icon-search" @click="openContract()"></el-button>
@@ -439,11 +437,21 @@
         this.doSubmit('save', callback)
       },
       startForm (callback) {
-        this.doSubmit('start', callback)
+        if (this.commonJS.isNotEmpty(this.inputForm.planEndDate) && this.commonJS.isNotEmpty(this.inputForm.planStartDate)) {
+          if (this.moment(this.inputForm.planEndDate).format('YYYY-MM-DD') < this.moment(this.inputForm.planStartDate).format('YYYY-MM-DD') || this.moment(this.inputForm.planEndDate).format('YYYY-MM-DD') === this.moment(this.inputForm.planStartDate).format('YYYY-MM-DD')) {
+            this.$message.error('项目预计开始时间要小于项目预计结束时间')
+            this.loading = false
+            throw new Error('项目预计开始时间要小于项目预计结束时间')
+          } else {
+            this.doSubmit('start', callback)
+          }
+        } else {
+          this.doSubmit('start', callback)
+        }
       },
       async agreeForm (callback) {
         await this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
-          if (this.inputForm.status !== '2') { // 审核状态不是“待审核”，就弹出提示
+          if (data.status !== '2') { // 审核状态不是“待审核”，就弹出提示
             this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
             throw new Error()
           } else {

src/views/modules/cw/projectReportArchive/ProjectReportArchiveDetailList.vue

@@ -0,0 +1,339 @@
+<template>
+  <div class="page">
+    <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+      <!-- 搜索框-->
+      <el-form-item label="项目名称" prop="cwProjectRecordsDTO.projectName">
+        <el-input size="small" v-model="searchForm.cwProjectRecordsDTO.projectName" placeholder="请输入项目名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="创建人" prop="projectMasterId">
+        <SelectUserTree
+          ref="companyTree"
+          :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+          :url="`/sys/user/treeUserDataAllOffice?type=2`"
+          :value="searchForm.cwProjectRecordsDTO.projectMasterId"
+          :clearable="true"
+          :accordion="true"
+          @getValue="(value) => {searchForm.cwProjectRecordsDTO.projectMasterId=value}"/>
+      </el-form-item>
+      <el-form-item label="案卷号" prop="number">
+        <el-input size="small" v-model="searchForm.number" placeholder="请输入案卷号" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item label="报告文号" prop="reportNo">
+        <el-input size="small" v-model="searchForm.reportNo" placeholder="请输入报告文号" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item label="报告时间" prop="reportDates">
+        <el-date-picker
+          placement="bottom-start"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="searchForm.reportDates"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable>
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="归档时间" prop="auditDates">
+        <el-date-picker
+          placement="bottom-start"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="searchForm.auditDates"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable>
+        </el-date-picker>
+      </el-form-item>
+
+
+      <el-form-item label="归档状态" prop="status">
+        <el-select v-model="searchForm.status" placeholder="请选择归档状态" clearable style="width: 100%">
+          <el-option-group
+            v-for="(type,index) in typeDictList"
+            :key="type.key"
+            :label="type.label">
+            <el-option
+              v-for="item in typeDictList[index].childrenList"
+              :key="item.key"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-option-group>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+        <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="bg-white top" style="">
+      <vxe-toolbar :refresh="{query: refreshList}"  export print custom>
+      </vxe-toolbar>
+      <div style="height: calc(100% - 90px)">
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="auto"
+          :loading="loading"
+          size="small"
+          ref="projectTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :print-config="{}"
+          :export-config="{
+                    remote: true,
+                    filename: `归档信息${moment(new Date()).format('YYYY-MM-DD')}`,
+                    sheetName: '归档信息',
+                    exportMethod: exportMethod,
+                    types: ['xlsx'],
+                    modes: ['current', 'selected', 'all']
+                  }"
+          :menu-config="{}"
+          @sort-change="sortChangeHandle"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :checkbox-config="{}">
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column min-width="230" align="center" title="项目名称" field="cwProjectRecordsDTO.projectName">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectRecords:view')" @click="viewProject(scope.row.projectId)">{{commonJS.isNotEmpty(scope.row.cwProjectRecordsDTO)?scope.row.cwProjectRecordsDTO.projectName:''}}</el-link>
+              <span v-else>{{commonJS.isNotEmpty(scope.row.cwProjectRecordsDTO)?scope.row.cwProjectRecordsDTO.projectName:''}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="150" align="center" title="项目经理" field="cwProjectRecordsDTO.projectMasterName"></vxe-column>
+          <vxe-column min-width="230" align="center" title="报告文号" field="reportNo"></vxe-column>
+          <vxe-column min-width="150" align="center" title="报告日期" :formatter="formatDate" field="reportDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="归档日期" :formatter="formatDate" field="auditDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="归档状态" field="status">
+            <template slot-scope="scope">
+              <span style="color:#5bc0de; font-weight: bold;" v-if="scope.row.status === '暂时未归档'">暂时未归档</span>
+              <span style="color:#de6764; font-weight: bold;" v-if="scope.row.status === '超期未归档'">超期未归档</span>
+              <span style="color:#5cb85c; font-weight: bold;" v-if="scope.row.status === '已按时归档'">已按时归档</span>
+              <span style="color:#f0ad4e; font-weight: bold;" v-if="scope.row.status === '已超期归档'">已超期归档</span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="150" align="center" title="超期（天）" field="overdueDay">
+            <template slot-scope="scope">
+              <span style="color:#5bc0de; font-weight: bold;" v-if="scope.row.status === '暂时未归档'">{{scope.row.overdueDay}}</span>
+              <span style="color:#de6764; font-weight: bold;" v-if="scope.row.status === '超期未归档'">{{scope.row.overdueDay}}</span>
+              <span style="color:#5cb85c; font-weight: bold;" v-if="scope.row.status === '已按时归档'">{{scope.row.overdueDay}}</span>
+              <span style="color:#f0ad4e; font-weight: bold;" v-if="scope.row.status === '已超期归档'">{{scope.row.overdueDay}}</span>
+            </template></vxe-column>
+          <vxe-column min-width="150" align="center" title="罚款金额（元）" field="fineMoney"></vxe-column>
+          <vxe-column min-width="150" align="center" title="签字注师1" field="signatureAnnotatorName1"></vxe-column>
+          <vxe-column min-width="150" align="center" title="签字注师2" field="signatureAnnotatorName2"></vxe-column>
+          <vxe-column min-width="230" align="center" title="案卷号" field="number"></vxe-column>
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+      <ProjectRecordsForm ref="projectRecordsForm"></ProjectRecordsForm>
+      <ProjectReportArchiveForm ref="projectReportArchiveForm"></ProjectReportArchiveForm>
+    </div>
+  </div>
+</template>
+
+<script>
+  import ProjectReportArchiveDetailService from '@/api/cw/projectRecords/ProjectReportArchiveDetailService'
+  import TaskService from '@/api/flowable/TaskService'
+  import ProcessService from '@/api/flowable/ProcessService'
+  import UserService from '@/api/sys/UserService'
+  import ProjectRecordsForm from '../projectRecords/ProjectRecordsForm'
+  import ProjectReportArchiveForm from './ProjectReportArchiveForm'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import XEUtils from 'xe-utils'
+  export default {
+    data () {
+      return {
+        searchForm: {
+          name: '',
+          cwProjectRecordsDTO: {
+            id: '',
+            projectName: '',
+            projectMasterId: '',
+            projectMasterName: ''
+          },
+          year: '',
+          number: '',
+          auditDates: [],
+          status: '',
+          reportDates: [],
+          reportNo: '',
+          fileNumber: ''
+        },
+        dataList: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        tableKey: '',
+        loading: false,
+        processDefinitionAuditId: '',
+        procDefAuditKey: '',
+        isAdmin: false,
+        typeDictList: [
+          {
+            key: '已归档',
+            label: '已归档',
+            childrenList: [
+              {
+                key: '已按时归档',
+                value: '已按时归档',
+                label: '已按时归档'
+              },
+              {
+                key: '已超期归档',
+                value: '已超期归档',
+                label: '已超期归档'
+              }
+            ]
+          }, {
+            key: '未归档',
+            label: '未归档',
+            childrenList: [
+              {
+                key: '暂时未归档',
+                value: '暂时未归档',
+                label: '暂时未归档'
+              },
+              {
+                key: '超期未归档',
+                value: '超期未归档',
+                label: '超期未归档'
+              }
+            ]
+          }
+        ]
+      }
+    },
+    projectReportArchiveDetailService: null,
+    taskService: null,
+    processService: null,
+    userService: null,
+    created () {
+      this.projectReportArchiveDetailService = new ProjectReportArchiveDetailService()
+      this.taskService = new TaskService()
+      this.processService = new ProcessService()
+      this.userService = new UserService()
+    },
+    components: {
+      ProjectRecordsForm,
+      ProjectReportArchiveForm,
+      SelectUserTree
+    },
+    computed: {
+      userName () {
+        return JSON.parse(localStorage.getItem('user')).name
+      },
+      user () {
+        this.createName = JSON.parse(localStorage.getItem('user')).name
+        return JSON.parse(localStorage.getItem('user'))
+      }
+    },
+    mounted () {
+      this.refreshList()
+    },
+    activated () {
+      this.refreshList()
+    },
+    methods: {
+      formatDate ({ cellValue }) {
+        return XEUtils.toDateString(cellValue, 'yyyy-MM-dd')
+      },
+      // 查看
+      view (id) {
+        this.$refs.projectReportArchiveForm.init('view', id)
+      },
+      viewProject (id) {
+        this.$refs.projectRecordsForm.init('view', id)
+      },
+      // 查询当前用户是否是管理员用户
+      checkIsAdmin () {
+        this.userService.is().then(({data}) => {
+          this.isAdmin = data
+        })
+      },
+      // 获取数据列表
+      refreshList () {
+        this.loading = true
+        this.projectReportArchiveDetailService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.tableKey = Math.random()
+          this.loading = false
+        })
+      },
+      // 当前页
+      currentChangeHandle ({ currentPage, pageSize }) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.refreshList()
+      },
+      // 排序
+      sortChangeHandle (column) {
+        this.tablePage.orders = []
+        if (column.order != null) {
+          this.tablePage.orders.push({column: this.$utils.toLine(column.property), asc: column.order === 'asc'})
+        }
+        this.refreshList()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.refreshList()
+      },
+      // 自定义服务端导出
+      exportMethod ({ options }) {
+        // 传给服务端的参数
+        const params = {
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm,
+          filename: options.filename,
+          sheetName: options.sheetName,
+          isHeader: options.isHeader,
+          original: options.original,
+          mode: options.mode,
+          selectIds: options.mode === 'selected' ? options.data.map(item => item.id) : [],
+          exportFields: options.columns.map(column => column.property)
+        }
+        return this.projectReportArchiveDetailService.exportExcel(params).then((res) => {
+          // 将二进制流文件写入excel表，以下为重要步骤
+          this.$utils.downloadExcel(res.data, options.filename + '.xls')
+        }).catch(function (err) {
+          if (err.response) {
+            console.log(err.response)
+          }
+        })
+      }
+    }
+  }
+</script>

src/views/modules/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -12,7 +12,8 @@
         <el-input size="small" v-model="searchForm.cwProjectRecordsDTO.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
       <el-form-item label="项目经理" prop="cwProjectRecordsDTO.projectMasterName">
-        <el-input size="small" v-model="searchForm.cwProjectRecordsDTO.projectMasterName" placeholder="请输入项目经理" clearable></el-input>
+<!--        <el-input size="small" v-model="searchForm.cwProjectRecordsDTO.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
+        <UserSelect :limit='1' :userName="searchForm.cwProjectRecordsDTO.projectMasterName" @getValue='(value, label) => {searchForm.cwProjectRecordsDTO.projectMasterName = label}'></UserSelect>
       </el-form-item>
       <el-form-item label="档案年度" prop="year">
         <el-date-picker
@@ -53,7 +54,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="创建人" prop="createBy.name">
-        <el-input size="small" v-model="searchForm.createBy.name" placeholder="请输入创建人" clearable></el-input>
+<!--        <el-input size="small" v-model="searchForm.createBy.name" placeholder="请输入创建人" clearable></el-input>-->
+        <UserSelect :limit='1' :userName="searchForm.createBy.name" @getValue='(value, label) => {searchForm.createBy.name = label}'></UserSelect>
       </el-form-item>
       <el-form-item label="创建时间" prop="createDates">
         <el-date-picker
@@ -78,7 +80,7 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top" style="">
-      <vxe-toolbar :refresh="{query: refreshList}" custom>
+      <vxe-toolbar :refresh="{query: refreshList}" export custom>
         <template #buttons>
           <el-button v-if="hasPermission('cwProjectReportArchive:add')" type="primary" size="small" icon="el-icon-plus" @click="start()">新建</el-button>
         </template>
@@ -95,6 +97,14 @@
           ref="projectTable"
           show-header-overflow
           show-overflow
+          :export-config="{
+                    remote: true,
+                    filename: `报告归档数据${moment(new Date()).format('YYYY-MM-DD')}`,
+                    sheetName: `报告归档数据${moment(new Date()).format('YYYY-MM-DD')}`,
+                    exportMethod: exportMethod,
+                    types: ['xlsx'],
+                    modes: ['current', 'selected', 'all']
+                  }"
           highlight-hover-row
           :menu-config="{}"
           @sort-change="sortChangeHandle"
@@ -102,6 +112,7 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column min-width="230" align="center" title="档案名称" field="name">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectReportArchive:view')" @click="view(scope.row.id)">{{scope.row.name}}</el-link>
@@ -134,11 +145,11 @@
           </vxe-column>
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('cwProjectReportArchive:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text" icon="el-icon-edit" size="small" @click="push(scope.row)">修改</el-button>
-              <el-button v-else-if="hasPermission('cwProjectReportArchive:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="hasPermission('cwProjectReportArchive:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='2'" type="text" icon="el-icon-edit" size="small" @click="reback(scope.row)">撤回</el-button>
-              <el-button v-if="hasPermission('cwProjectReportArchive:del')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
-              <el-button v-else-if="hasPermission('cwProjectReportArchive:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('cwProjectReportArchive:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  size="small" @click="push(scope.row)">修改</el-button>
+              <el-button v-else-if="hasPermission('cwProjectReportArchive:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('cwProjectReportArchive:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
+              <el-button v-if="hasPermission('cwProjectReportArchive:del')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-else-if="hasPermission('cwProjectReportArchive:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -167,6 +178,7 @@
   import UserService from '@/api/sys/UserService'
   import ProjectRecordsForm from '../projectRecords/ProjectRecordsForm'
   import ProjectReportArchiveForm from './ProjectReportArchiveForm'
+  import UserSelect from '@/components/userSelect'
   export default {
     data () {
       return {
@@ -213,7 +225,8 @@
     },
     components: {
       ProjectRecordsForm,
-      ProjectReportArchiveForm
+      ProjectReportArchiveForm,
+      UserSelect
     },
     computed: {
       userName () {
@@ -266,7 +279,7 @@
         }).then(({data}) => {
           this.dataList = data.records
           this.tablePage.total = data.total
-          this.tableKey = Math.random()
+          // this.tableKey = Math.random()
           this.loading = false
         })
         this.checkIsAdmin()
@@ -410,6 +423,31 @@
             }
           })
         })
+      },
+      // 自定义服务端导出
+      exportMethod ({ options }) {
+        // 传给服务端的参数
+        const params = {
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm,
+          filename: options.filename,
+          sheetName: options.sheetName,
+          isHeader: options.isHeader,
+          original: options.original,
+          mode: options.mode,
+          selectIds: options.mode === 'selected' ? options.data.map(item => item.id) : [],
+          exportFields: options.columns.map(column => column.property)
+        }
+        return this.projectReportArchiveService.exportFile(params).then((res) => {
+          // 将二进制流文件写入excel表，以下为重要步骤
+          this.$utils.downloadExcel(res.data, options.filename)
+        }).catch(function (err) {
+          if (err.response) {
+            console.log(err.response)
+          }
+        })
       }
     }
   }

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -56,7 +56,7 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top" style="">
-      <vxe-toolbar :refresh="{query: refreshList}" custom>
+      <vxe-toolbar :refresh="{query: refreshList}" export print custom>
         <template #buttons>
           <el-button v-if="hasPermission('cw_work_client:info:add')" type="primary" size="small" icon="el-icon-plus" @click="start()">新建</el-button>
           <!--          <el-button v-if="hasPermission('klg:question:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.questionsTable && $refs.questionsTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
@@ -64,7 +64,6 @@
       </vxe-toolbar>
       <div style="height: calc(100% - 90px)">
         <vxe-table
-          :key="tableKey"
           border="inner"
           auto-resize
           resizable
@@ -75,6 +74,15 @@
           show-header-overflow
           show-overflow
           highlight-hover-row
+          :print-config="{}"
+          :export-config="{
+                    remote: true,
+                    filename: `报告信息${moment(new Date()).format('YYYY-MM-DD')}`,
+                    sheetName: '报告信息',
+                    exportMethod: exportMethod,
+                    types: ['xlsx'],
+                    modes: ['current', 'selected', 'all']
+                  }"
           :menu-config="{}"
           @sort-change="sortChangeHandle"
           :sort-config="{remote:true}"
@@ -103,6 +111,18 @@
               </el-button>
             </template>
           </vxe-column>
+          <vxe-column  min-width="150px"align="center" fixed="right" title="签章状态" >
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.signatureType === '1'"  type="text" @click="detailS(scope.row)" effect="dark" size="mini"
+                          :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status1, '-')">
+                {{$dictUtils.getDictLabel("cw_status", scope.row.status1, '-')}}
+              </el-button>
+              <el-button v-if="scope.row.signatureType === '2'" type="text" @click="detailS2(scope.row)" effect="dark" size="mini"
+                          :type="$dictUtils.getDictLabel('cw_project_report_sign_status_flag', scope.row.status2, '-')">
+                {{$dictUtils.getDictLabel("cw_project_report_sign_status", scope.row.status2, '-')}}
+              </el-button>
+            </template>
+          </vxe-column>
 
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
@@ -110,8 +130,13 @@
               <el-button v-else-if="hasPermission('cwProjectReport:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-if="hasPermission('cwProjectReport:edit')&&scope.row.createById === $store.state.user.id&&scope.row.status==='2'" type="text" icon="el-icon-edit" size="small" @click="reback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('cwProjectReport:del')&&scope.row.createById === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
-<!--              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && (scope.row.filedType === '0' || scope.row.filedType === undefined)&& scope.row.signatureType === '1'" type="text" size="small" @click="filed(scope.row.id)">盖公章</el-button>-->
               <el-button v-else-if="hasPermission('cwProjectReport:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+<!--              公章流程-->
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' || scope.row.status1 === '4')" type="text" size="small" @click="pushS(scope.row)">公章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '1' && scope.row.status1 === '2'" type="text" size="small" @click="rebackS(scope.row)">撤回签章申请</el-button>
+<!--              公章+执业章流程-->
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' || scope.row.status2 === '4')" type="text" size="small" @click="pushS2(scope.row)">公章+执业章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '2' || scope.row.status2 === '6' || scope.row.status2 === '7')" type="text" size="small" @click="rebackS2(scope.row)">撤回签章申请</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -162,7 +187,11 @@
         processDefinitionAuditId: '',
         procDefAuditKey: '',
         isAdmin: false,
-        create: ''
+        create: '',
+        processDefinitionSId: '',
+        procDefSKey: '',
+        processDefinitionSId2: '',
+        procDefSKey2: ''
       }
     },
     workClientService: null,
@@ -256,6 +285,18 @@
             this.procDefAuditKey = data.key
           }
         })
+        this.processService.getByName('财务-报告签章-公章').then(({data}) => {
+          if (!this.commonJS.isEmpty(data.id)) {
+            this.processDefinitionSId = data.id
+            this.procDefSKey = data.key
+          }
+        })
+        this.processService.getByName('财务-报告签章-公章+执业章').then(({data}) => {
+          if (!this.commonJS.isEmpty(data.id)) {
+            this.processDefinitionSId2 = data.id
+            this.procDefSKey2 = data.key
+          }
+        })
       },
       // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
@@ -409,7 +450,7 @@
           //   }
           // })
         })
-      }
+      },
       // 归档
       // filed (id) {
       //   this.processService.getByName('财务-合同登记归档').then(({data}) => {
@@ -442,6 +483,183 @@
       //     }
       //   })
       // }
+      // 发起报告签章-公章流程
+      pushS (row) {
+        // 读取流程表单
+        let title = `发起流程【报告签章-公章】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-公章]`
+        let status = 'startAndClose'
+        if (row.status1 === '3' || row.status1 === '4') {
+          status = 'startAndClose'
+        }
+        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId,
+          businessId: row.sid1,
+          businessTable: 'cw_project_report_signature'}).then((data) => {
+            console.log('row', row)
+            console.log('rowid', row.sid1)
+            this.$router.push({
+              path: '/flowable/task/TaskForm',
+              query: {
+                procDefId: this.processDefinitionSId,
+                procDefKey: this.procDefSKey,
+                title: title,
+                formType: data.data.formType,
+                formUrl: data.data.formUrl,
+                formTitle: processTitle,
+                businessTable: 'cw_project_report_signature',
+                businessId: row.sid1,
+                isShow: 'false',
+                status: status,
+                routePath: '/cw/reportManagement/ReportManagementList'
+              }
+            })
+          })
+      },
+      // 查看报告签章-公章流程结果
+      detailS (row) {
+        if (row.status1 !== '0' && row.status1 !== '1') {
+          // eslint-disable-next-line eqeqeq
+          this.taskService.getTaskDef({
+            procInsId: row.procInsId1,
+            procDefId: this.processDefinitionSId
+          }).then(({data}) => {
+            this.$router.push({
+              path: '/flowable/task/TaskFormDetail',
+              query: {
+                isShow: 'false',
+                readOnly: true,
+                title: '报告签章-公章' + '流程详情',
+                formTitle: '报告签章-公章' + '流程详情',
+                businessId: row.sid1,
+                status: 'reback',
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'title', 'businessId')
+              }
+            })
+          })
+        }
+      },
+      // 撤回报告签章-公章的申请流程
+      rebackS (row) {
+        this.$confirm(`确定要撤回该申请吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          await this.projectReportService.findBySignatureId(row.sid1).then(({data}) => {
+            if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+              this.$message.error('数据已发生改变或不存在，请刷新数据')
+              this.refreshList()
+            } else {
+              this.processService.revokeProcIns(row.procInsId1).then(({data}) => {
+                let form = {status: '3', id: row.sid1}
+                this.projectReportService.updateSignatureStatusById(form)
+                this.$message.success(data)
+                this.refreshList()
+              })
+            }
+          })
+        })
+      },
+      // 发起报告签章-公章+执业章流程
+      pushS2 (row) {
+        // 读取流程表单
+        let title = `发起流程【报告签章-公章+执业章】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-公章+执业章]`
+        let status = 'startAndClose'
+        if (row.status2 === '3' || row.status2 === '4') {
+          status = 'startAndClose'
+        }
+        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId2,
+          businessId: row.sid2,
+          businessTable: 'cw_project_report_signature'}).then((data) => {
+            this.$router.push({
+              path: '/flowable/task/TaskForm',
+              query: {
+                procDefId: this.processDefinitionSId2,
+                procDefKey: this.procDefSKey2,
+                title: title,
+                formType: data.data.formType,
+                formUrl: data.data.formUrl,
+                formTitle: processTitle,
+                businessTable: 'cw_project_report_signature',
+                businessId: row.sid2,
+                isShow: 'false',
+                status: status,
+                routePath: '/cw/reportManagement/ReportManagementList'
+              }
+            })
+          })
+      },
+      // 查看报告签章-公章+执业章流程结果
+      detailS2 (row) {
+        if (row.status2 !== '0' && row.status2 !== '1') {
+          // eslint-disable-next-line eqeqeq
+          this.taskService.getTaskDef({
+            procInsId: row.procInsId2,
+            procDefId: this.processDefinitionSId2
+          }).then(({data}) => {
+            this.$router.push({
+              path: '/flowable/task/TaskFormDetail',
+              query: {
+                isShow: 'false',
+                readOnly: true,
+                title: '报告签章-公章+执业章' + '流程详情',
+                formTitle: '报告签章-公章+执业章' + '流程详情',
+                businessId: row.sid2,
+                status: 'reback',
+                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'title', 'businessId')
+              }
+            })
+          })
+        }
+      },
+      // 撤回报告签章-公章+执业章的申请流程
+      rebackS2 (row) {
+        this.$confirm(`确定要撤回该申请吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          await this.projectReportService.findBySignatureId(row.sid2).then(({data}) => {
+            if (data.status !== row.status2) { // status的值不等于“审核中”，就弹出提示
+              this.$message.error('数据已发生改变或不存在，请刷新数据')
+              this.refreshList()
+            } else {
+              this.processService.revokeProcIns(row.procInsId2).then(({data}) => {
+                let form = {status: '3', id: row.sid2}
+                this.projectReportService.updateSignatureStatusById(form)
+                this.$message.success(data)
+                this.refreshList()
+              })
+            }
+          })
+        })
+      },
+      // 自定义服务端导出
+      exportMethod ({ options }) {
+        // 传给服务端的参数
+        const params = {
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm,
+          filename: options.filename,
+          sheetName: options.sheetName,
+          isHeader: options.isHeader,
+          original: options.original,
+          mode: options.mode,
+          selectIds: options.mode === 'selected' ? options.data.map(item => item.id) : [],
+          exportFields: options.columns.map(column => column.property)
+        }
+        return this.projectReportService.exportExcel(params).then((res) => {
+          // 将二进制流文件写入excel表，以下为重要步骤
+          this.$utils.downloadExcel(res.data, options.filename + '.xls')
+        }).catch(function (err) {
+          if (err.response) {
+            console.log(err.response)
+          }
+        })
+      }
     }
   }
 </script>

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -0,0 +1,772 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+  <div>
+    <el-row>
+      <el-col :span="24">
+
+        <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="true"
+                 label-width="135px" @submit.native.prevent>
+          <el-row  :gutter="15">
+            <el-col :span="12">
+              <el-form-item label="单据编号" prop="documentNo"
+                            :rules="[
+
+                   ]">
+                <el-input :disabled="true" v-model="inputForm.documentNo" placeholder="自动生成" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="项目名称" prop="projectName"
+                            :rules="[
+                              {required: true, message:'项目名称不能为空', trigger:'blur'},
+                              {required: true, message:'项目名称不能为空', trigger:'change'}
+                   ]">
+<!--                <el-input v-model="inputForm.projectName" placeholder="请填写项目名称" clearable></el-input>-->
+                <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.projectName" placeholder="请选择项目名称">
+                  <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="项目编号" prop="projectNumber"
+                            :rules="[
+                   ]">
+                <el-input :disabled="true" v-model="inputForm.projectNumber" placeholder="请填写项目编号" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="报告所属部门" prop="officeId"
+                            :rules="[
+                   ]">
+                <SelectTree
+                  ref="officeTree"
+                  :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+
+                  :url="`/sys/office/treeData?type=2`"
+                  :value="inputForm.officeId"
+                  :accordion="true"
+                  @getValue="(value) => {inputForm.officeId=value}"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item v-if="inputForm.status !=='2'" label="项目经理" prop="projectMasterName"
+                            :rules="[
+                   ]">
+                <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="盖章类型" prop="signatureType"
+                            :rules="[
+                              {required: true, message: '盖章类型不能为空', trigger: 'blur'}
+                   ]">
+                <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
+                <el-select v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_signature_type')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+              <el-form-item label="签字注师1" prop="signatureAnnotator1"
+                            :rules="[
+                   ]">
+<!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
+                <UserSelect size="medium" ref="userSelect1" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+              </el-form-item>
+            </el-col>
+
+            <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+              <el-form-item label="签字注师2" prop="signatureAnnotator2"
+                            :rules="[
+                   ]">
+<!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
+                <UserSelect size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+              </el-form-item>
+            </el-col>
+
+            <el-col v-if="inputForm.signatureType === '2'" :span="12">
+              <el-form-item label="签字注师1" prop="signatureAnnotator1"
+                            :rules="[
+                              {required: true, message:'签字注师1不能为空', trigger:'blur'}
+                   ]">
+                <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
+                <UserSelect size="medium" ref="userSelect1" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+              </el-form-item>
+            </el-col>
+
+            <el-col v-if="inputForm.signatureType === '2'" :span="12">
+              <el-form-item label="签字注师2" prop="signatureAnnotator2"
+                            :rules="[
+                              {required: true, message:'签字注师2不能为空', trigger:'blur'}
+                   ]">
+                <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
+                <UserSelect size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="创建时间" prop="createDate"
+                            :rules="[
+                   ]">
+                <el-input :disabled="true" v-model="inputForm.createDate" placeholder="请填写创建时间" clearable></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+        <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
+          <el-tab-pane label="报告信息列表" name="newRow">
+            <el-button type="primary" style="margin-bottom: 15px" size="mini" :disabled="true" @click="openWorkClient"
+                       v-if="inputForm.projectName !== '' & inputForm.projectName !== undefined"
+            >
+              新增行
+            </el-button>
+<!--            <el-button v-if="hasPermission('cw:reportManagement:del')" type="text" size="small" @click="del()">删除</el-button>-->
+            <el-row  :gutter="15">
+              <el-form :disabled="true">
+                <vxe-table
+                  border
+                  show-overflow
+                  show-footer
+                  :column-config="{resizable: true}"
+                  ref="clientTable"
+                  :key="tableKeyClient"
+                  class="vxe-table-element"
+                  :data="inputForm.cwProjectInfoList"
+                  style=""
+                  @cell-click=""
+                  @edit-closed=""
+                  highlight-current-row
+                  :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: false}"
+                >
+                  <vxe-table-column type="seq" align="center" width="80" title="序号"></vxe-table-column>
+                  <vxe-table-column align="center" field="servedUnitName" title="被服务单位" :edit-render="{}">
+                    <template v-slot:edit="scope">
+                      <el-input :readonly="true" v-model="scope.row.servedUnitName" placeholder="被服务单位" clearable></el-input>
+                    </template>
+                  </vxe-table-column>
+                  <vxe-table-column align="center" field="reportDate" title="报告日期" :edit-render="{}">
+                    <template v-slot:edit="scope">
+                      <el-date-picker
+                        v-model="scope.row.reportDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择报告日期"
+                        style="width:100%"
+                        placement="bottom-start"
+                        clearable>
+                      </el-date-picker>
+<!--                      <el-input :readonly="true" v-model="scope.row.reportDate" placeholder="报告日期" clearable></el-input>-->
+                    </template>
+                  </vxe-table-column>
+                  <vxe-table-column align="center" field="reportType" title="报告类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_report_type')}">
+                    <template v-slot:edit="scope">
+                      <vxe-select :disabled="true" v-model="scope.row.reportType" placeholder="请选择报告类型" clearable style="width: 100%;" transfer>
+                        <vxe-option
+                          v-for="item in $dictUtils.getDictList('cw_report_type')"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </vxe-option>
+                      </vxe-select>
+                    </template>
+<!--                    <template v-slot:edit="scope">-->
+<!--                      <el-select v-model="scope.row.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">-->
+<!--                        <el-option-->
+<!--                          v-for="item in $dictUtils.getDictList('cw_report_type')"-->
+<!--                          :key="item.value"-->
+<!--                          :label="item.label"-->
+<!--                          :value="item.value">-->
+<!--                        </el-option>-->
+<!--                      </el-select>-->
+<!--&lt;!&ndash;                      <el-input v-model="scope.row.reportType" placeholder="报告类型" clearable></el-input>&ndash;&gt;-->
+<!--                    </template>-->
+                  </vxe-table-column>
+                  <vxe-table-column align="center" field="reportNumber" title="报告流水号" :edit-render="{}">
+                    <template v-slot:edit="scope">
+                      <el-input :readonly="true" v-model="scope.row.reportNumber" placeholder="报告流水号" clearable></el-input>
+                    </template>
+                  </vxe-table-column>
+                  <vxe-table-column align="center" field="reportNo" title="报告文号" :edit-render="{}">
+                    <template v-slot:edit="scope">
+                      <el-input :readonly="true" v-model="scope.row.reportNo" placeholder="报告文号" clearable></el-input>
+                    </template>
+                  </vxe-table-column>
+                  <vxe-table-column align="center" field="issueReport" title="是否出具报告" :edit-render="{}">
+                    <template v-slot:edit="scope">
+                      <el-input :readonly="true" v-model="scope.row.issueReport" placeholder="是否出具报告" clearable></el-input>
+                    </template>
+                  </vxe-table-column>
+                  <vxe-table-column align="center" field="opinionType" title="意见类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_opinion_type')}">
+                    <template v-slot:edit="scope">
+                      <el-select v-model="scope.row.opinionType" placeholder="请选择意见类型" clearable style="width: 100%;">
+                        <el-option
+                          v-for="item in $dictUtils.getDictList('cw_opinion_type')"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+<!--                      <el-input :readonly="true" v-model="scope.row.opinionType" placeholder="意见类型" clearable></el-input>-->
+                    </template>
+                  </vxe-table-column>
+                  <vxe-table-column align="center" field="sealType" title="盖章状态" :edit-render="{}">
+                    <template v-slot:edit="scope">
+                      <el-input :readonly="true" v-model="scope.row.sealType" placeholder="盖章状态" clearable></el-input>
+                    </template>
+                  </vxe-table-column>
+                  <vxe-table-column align="center" field="fileNumber" title="文件数" :edit-render="{}">
+                    <template v-slot:edit="scope">
+                      <el-input :readonly="true" v-model="scope.row.fileNumber" placeholder="文件数" clearable></el-input>
+                    </template>
+                  </vxe-table-column>
+                  <vxe-table-column align="center" title="操作" width="300">
+                    <template v-slot="scope">
+<!--                      <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'client')">删除</el-button>-->
+<!--                      <el-button size="mini" type="primary" @click="sss(scope.$rowIndex)">上传附件</el-button>-->
+<!--                      <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
+                        <el-button size="mini" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
+                    </template>
+                  </vxe-table-column>
+                </vxe-table>
+              </el-form>
+            </el-row>
+          </el-tab-pane>
+
+
+        </el-tabs>
+      </el-col>
+    </el-row>
+    <UpLoadComponentDialog ref="upLoadComponentDialog" @getUpload="getUpload"></UpLoadComponentDialog>
+<!--    <ProjectInfoForm  ref="projectInfoForm" @getContract="getContract"></ProjectInfoForm>-->
+    <ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
+    <ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
+  </div>
+</template>
+
+<script>
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import UserSelect from '../workClientInfo/clientUserSelect'
+  import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
+  import ProjectReportService from '@/api/cw/reportManagement/ProjectReportService'
+  import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
+  // import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
+  import ReportServiceUnitForm from './ReportServiceUnitForm'
+  import UpLoadComponentDialog from '@/views/common/UpLoadComponentDialog'
+  // import ProjectInfoForm from './ProjectInfoForm'
+  import ProjectRecoredChooseCom from '../projectRecords/ProjectRecordsChooseCom'
+  export default {
+    props: {
+      businessId: {
+        type: String,
+        default: ''
+      },
+      formReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      status: {
+        type: String,
+        default: ''
+      }
+    },
+    data () {
+      return {
+        title: '',
+        method: '',
+        loading: false,
+        inputForm: {
+          projectId: '',
+          id: '',
+          createDate: '',
+          createBy: {
+            id: '',
+            name: JSON.parse(localStorage.getItem('user')).name
+          },
+          remarks: '',
+          documentNo: '',
+          projectName: '',
+          projectNumber: '',
+          officeId: '',
+          signatureAnnotator1: '',
+          signatureAnnotator2: '',
+          signatureType: '',
+          projectMasterName: '',
+          cwProjectInfoList: [],
+          cwFileInfoList: [],
+          servedUnitId: '',
+          status: '',
+          status1: '',
+          status2: ''
+        },
+        keyWatch: '',
+        activeName: 'newRow',
+        tableKey: '',
+        tableKeyClient: '1'
+      }
+    },
+    projectRecordsService: null,
+    ProjectReportService: null,
+    enterpriseSearchService: null,
+    created () {
+      this.enterpriseSearchService = new EnterpriseSearchService()
+      this.projectRecordsService = new ProjectRecordsService()
+      this.projectReportService = new ProjectReportService()
+    },
+    computed: {
+      bus: {
+        get () {
+          // this.$refs.uploadComponent.setDividerName('附件', false)
+          return this.businessId
+        },
+        set (val) {
+          this.businessId = val
+        }
+      }
+    },
+    watch: {
+      'keyWatch': {
+        handler (newVal) {
+          if (this.commonJS.isNotEmpty(this.bus)) {
+            this.init('', this.bus)
+          } else {
+            console.log('bus', this.bus)
+            console.log('businessId', this.businessId)
+            this.$nextTick(() => {
+              this.$refs.inputForm.resetFields()
+            })
+          }
+        }
+      }
+    },
+    components: {
+      SelectUserTree,
+      UpLoadComponent,
+      SelectTree,
+      UserSelect,
+      ReportServiceUnitForm,
+      // ProjectInfoForm,
+      ProjectRecoredChooseCom,
+      UpLoadComponentDialog
+    },
+    methods: {
+      seeFileInfo (index) {
+        if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].cwFileInfoList)) {
+          this.inputForm.cwProjectInfoList[index].cwFileInfoList = []
+        }
+        this.$refs.upLoadComponentDialog.newUpload('view', this.inputForm.cwProjectInfoList[index].cwFileInfoList, null, null, null, null, null, false, index)
+      },
+      sss (index) {
+        if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].cwFileInfoList)) {
+          this.inputForm.cwProjectInfoList[index].cwFileInfoList = []
+        }
+        this.$refs.upLoadComponentDialog.newUpload(null, this.inputForm.cwProjectInfoList[index].cwFileInfoList, null, null, null, null, null, false, index)
+      },
+      getUpload (p, index) {
+        p.then((list) => {
+          // list为返回数据
+          this.inputForm.cwProjectInfoList[index].cwFileInfoList = list
+          this.inputForm.cwProjectInfoList[index].fileNumber = list.length
+          this.tableKeyClient = Math.random()
+        })
+      },
+      getKeyWatch (keyWatch) {
+        this.keyWatch = keyWatch
+      },
+      // 删除
+      // del (id) {
+      //   let ids = id || this.$refs.clientTable.getCheckboxRecords().map(item => {
+      //     return item.id
+      //   }).join(',')
+      //   this.$confirm(`确定删除所选项吗?`, '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() => {
+      //     this.$refs.clientTable.remove(ids)
+      //     // this.inputForm.cwProjectClientInfoDTOList.splice(ids, 1)
+      //   })
+      // },
+      changeSignatory1 (value) {
+        if (this.inputForm.signatureAnnotator2 === value && this.commonJS.isNotEmpty(value)) {
+          this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
+          this.$nextTick(() => {
+            this.inputForm.signatureAnnotator1 = ''
+            this.$refs.userSelect1.changeNameValue('')
+            this.$refs.userSelect1.clearSelectData()
+            this.$forceUpdate()
+          })
+        } else {
+          this.inputForm.signatureAnnotator1 = value
+        }
+      },
+      changeSignatory2 (value) {
+        if (this.inputForm.signatureAnnotator1 === value && this.commonJS.isNotEmpty(value)) {
+          this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
+          this.$nextTick(() => {
+            this.inputForm.signatureAnnotator2 = ''
+            this.$refs.userSelect2.changeNameValue('')
+            this.$refs.userSelect2.clearSelectData()
+            this.$forceUpdate()
+          })
+        } else {
+          this.inputForm.signatureAnnotator2 = value
+        }
+      },
+      init (method, id) {
+        this.activeName = 'newRow'
+        this.projectRecordsService = new ProjectRecordsService()
+        this.projectReportService = new ProjectReportService()
+        this.method = method
+        this.inputForm = {
+          projectId: '',
+          id: '',
+          createDate: '',
+          createBy: {
+            id: '',
+            name: JSON.parse(localStorage.getItem('user')).name
+          },
+          remarks: '',
+          documentNo: '',
+          projectName: '',
+          officeId: '',
+          projectNumber: '',
+          signatureAnnotator1: '',
+          signatureAnnotator2: '',
+          signatureType: '',
+          projectMasterName: '',
+          cwProjectInfoList: [],
+          status: '',
+          status1: '',
+          status2: ''
+        }
+        this.inputForm.id = id
+        this.loading = false
+        this.$nextTick(() => {
+          this.$refs.inputForm.resetFields()
+          this.loading = true
+          this.projectReportService.queryBySignatureId(this.inputForm.id).then(({data}) => {
+            // this.$refs.uploadComponent.clearUpload()
+            this.inputForm = this.recover(this.inputForm, data)
+            this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+            if (this.commonJS.isEmpty(this.inputForm.createDate)) {
+              this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+            }
+            this.loading = false
+          })
+          // this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
+          //   // this.$refs.uploadComponent.clearUpload()
+          //   this.inputForm = this.recover(this.inputForm, data)
+          //   this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+          //   if (this.commonJS.isEmpty(this.inputForm.createDate)) {
+          //     this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+          //   }
+          //   this.loading = false
+          // })
+        })
+      },
+      openContractForm () {
+        if (!this.commonJS.isEmpty(this.inputForm.contractId)) {
+          // this.$refs.projectInfoForm.init(this.inputForm.contractId)
+          this.$refs.projectRecoredChooseCom.init(this.inputForm.contractId)
+        } else {
+          this.$refs.projectRecoredChooseCom.init()
+          // this.$refs.projectInfoForm.init()
+        }
+      },
+      getContract (row) {
+        this.inputForm.projectName = row.projectName // 项目名称
+        this.inputForm.projectId = row.id // 项目id
+        this.inputForm.projectNumber = row.projectNumber // 项目编号
+        this.inputForm.projectMasterName = row.projectMasterName // 项目经理
+        this.clearClientList()
+        this.$forceUpdate()
+        this.inputForm.cwProjectInfoList = []
+      },
+      clearClientList () {
+        // 项目直接对接联系人列表清除
+        this.inputForm.clientList = []
+        this.$forceUpdate()
+      },
+      saveForm (callback) {
+        this.doSubmit('save', callback)
+      },
+      startForm (callback) {
+        // this.doSubmit('start', callback)
+        this.loading = true
+        this.projectReportService.saveData(this.inputForm).then(({data}) => {
+          if (this.inputForm.signatureType === '2') {
+            this.inputForm.assignee = this.inputForm.signatureAnnotator1
+          }
+          callback(data.businessTable, data.businessId, this.inputForm)
+          this.loading = false
+          throw new Error()
+        }).catch(() => {
+          this.loading = false
+          throw new Error('流程发起失败')
+        })
+      },
+      agreeOperate (callback, param) {
+        this.loading = true
+        this.inputForm.commitParamDTO = param
+        this.projectReportService.saveFlowableParam(this.inputForm).then(({data}) => {
+          // 关闭当前页面
+          this.$store.dispatch('tagsView/delView', {fullPath: this.$route.fullPath})
+          if (data === '操作成功') {
+            this.$message.success('审核完成')
+            // 跳转回指定页面
+            if (param.num === '2') {
+              this.$router.push({path: '/sys/dashboard/workBench/Pending'})
+            } else if (param.num === '3') {
+              this.$router.push({path: '/sys/dashboard/workBench/PendingList'})
+            } else {
+              this.$router.push({path: '/flowable/task/TodoList'})
+            }
+          } else {
+            // 跳转回指定页面
+            if (param.num === '2') {
+              this.$router.push({path: '/sys/dashboard/workBench/Pending', query: {signatureUrl: data}})
+            } else if (param.num === '3') {
+              this.$router.push({path: '/sys/dashboard/workBench/PendingList', query: {signatureUrl: data}})
+            } else {
+              this.$router.push({path: '/flowable/task/TodoList', query: {signatureUrl: data}})
+            }
+          }
+          this.loading = false
+          throw new Error()
+        }).catch(() => {
+          this.loading = false
+          throw new Error()
+        })
+      },
+      agreeForm (callback, param) {
+        this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
+          if (data.signatureType === '1') {
+            if (data.status1 !== '2') { // 审核状态不是“待审核”，就弹出提示
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error()
+            } else {
+              this.agreeOperate(callback, param)
+            }
+          }
+          if (data.signatureType === '2') {
+            if (data.status2 !== this.inputForm.status2) { // 审核状态不是“待审核”，就弹出提示
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error()
+            } else {
+              if (data.status2 === '2') {
+                param.assignee = this.inputForm.signatureAnnotator2
+              }
+              this.agreeOperate(callback, param)
+            }
+          }
+        })
+      },
+      // 表单提交
+      doSubmit (status, callback) {
+        if (status === 'save') {
+          // 暂存
+          this.inputForm.status = '1'
+          this.loading = true
+          // if (this.$refs.uploadComponent.checkProgress()) {
+          //   this.loading = false
+          //   return
+          // }
+          // this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
+          this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+          // 验证报告 日期报告 类型是否出具报告 意见类型 是否为空
+          // eslint-disable-next-line no-unused-expressions
+          this.projectReportService.saveForm(this.inputForm).then(({data}) => {
+            callback(data.businessTable, data.businessId, this.inputForm)
+            this.loading = false
+          }).catch(() => {
+            this.loading = false
+          })
+          // this.projectRecordsService.saveForm(this.inputForm).then(({data}) => {
+          //   callback(data.businessTable, data.businessId, this.inputForm)
+          //   this.loading = false
+          // }).catch(() => {
+          //   this.loading = false
+          // })
+          return
+        } else if (status === 'start') {
+          // 送审  待审核
+          this.inputForm.status = '2'
+        } else if (status === 'agree') {
+          // 审核同意
+          this.inputForm.agreeDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+          this.inputForm.agreeUserId = this.$store.state.user.id
+          this.inputForm.status = '5'
+        }
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            if (this.commonJS.isEmpty(this.inputForm.createDate)) {
+              this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+            }
+            this.inputForm.cwProjectInfoList.forEach((item, index) => {
+              if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].reportDate)) {
+                this.$message.error('报告日期不能为空')
+                this.loading = false
+                throw new Error('报告日期不能为空')
+              }
+              if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].reportType)) {
+                this.$message.error('报告类型不能为空')
+                this.loading = false
+                throw new Error('报告类型不能为空')
+              }
+              if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList[index].opinionType)) {
+                this.$message.error('意见类型不能为空')
+                this.loading = false
+                throw new Error('意见类型不能为空')
+              }
+            })
+            this.projectReportService.saveForm(this.inputForm).then(({data}) => {
+              callback(data.businessTable, data.businessId, this.inputForm)
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      },
+      async updateStatusById (type) {
+        if (type === 'reject' || type === 'reback') {
+          // if (await this.$refs.uploadComponent.checkProgress()) {
+          //   this.loading = false
+          //   throw new Error()
+          // }
+          await this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
+            if (data.status1 !== '2') { // status的值不等于“审核中”就弹出提示
+              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              throw new Error()
+            } else {
+              if (type === 'reject') {
+                // 驳回
+                this.inputForm.status = '4'
+                let param = {status: '4', id: this.inputForm.sid1}
+                this.projectReportService.updateSignatureStatusById(param)
+                // this.projectRecordsService.updateStatusById(param)
+              }
+              if (type === 'reback') {
+                // 撤回
+                let param = {status: '3', id: this.inputForm.sid1}
+                // this.projectRecordsService.updateStatusById(param)
+                this.projectReportService.updateSignatureStatusById(param)
+              }
+            }
+          })
+          // await this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
+          //   if (data.status !== '2') { // status的值不等于“审核中”就弹出提示
+          //     this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          //     throw new Error()
+          //   } else {
+          //     if (type === 'reject') {
+          //       // 驳回
+          //       this.inputForm.status = '4'
+          //       let param = {status: '4', id: this.inputForm.id}
+          //       this.projectRecordsService.updateStatusById(param)
+          //     }
+          //     if (type === 'reback') {
+          //       // 撤回
+          //       let param = {status: '3', id: this.inputForm.id}
+          //       // this.projectRecordsService.updateStatusById(param)
+          //       this.projectReportService.updateStatusById(param)
+          //     }
+          //   }
+          // })
+        }
+      },
+      close () {
+        this.inputForm = {
+          id: '',
+          createDate: '',
+          createBy: {
+            id: '',
+            name: JSON.parse(localStorage.getItem('user')).name
+          },
+          remarks: '',
+          documentNo: '',
+          projectName: '',
+          officeId: '',
+          projectNumber: '',
+          signatureAnnotator1: '',
+          signatureAnnotator2: '',
+          signatureType: '',
+          projectMasterName: '',
+          status: '',
+          status1: '',
+          status2: ''
+        }
+        // this.$refs.uploadComponent.clearUpload()
+        this.$refs.inputForm.resetFields()
+      },
+      tabHandleClick (event) {
+        // console.log(event)
+      },
+      // 删除
+      removeEvent (row, rowIndex, type) {
+        if (type === 'client') {
+          this.$refs.clientTable.remove(row)
+          this.inputForm.cwProjectInfoList.splice(rowIndex, 1)
+        }
+      },
+      openWorkClient () {
+        this.$refs.reportServiceUnitForm.init(this.inputForm.projectId)
+      },
+      getWorkClientChoose (list) {
+        if (this.commonJS.isEmpty(this.inputForm.cwProjectInfoList)) {
+          this.inputForm.cwProjectInfoList = []
+        }
+        let _this = this
+        let _list = list
+        const waitForEach = function () {
+          return new Promise(function (resolve, reject) {
+            _list.forEach((item) => {
+              _this.inputForm.cwProjectInfoList.forEach(client => {
+                if (item.id === client.servedUnitId) {
+                  // _this.$message.error('已存在客户 “' + client.servedUnitName + '”，请重新选择')
+                  // throw new Error('已存在客户 “' + client.servedUnitName + '”，请重新选择')
+                }
+              })
+            })
+            resolve()
+          })
+        }
+        waitForEach().then(() => {
+          list.forEach(item => {
+            // eslint-disable-next-line no-unused-vars
+            let d = {
+              servedUnitName: item.name, // 被服务单位名称
+              // reportNumber: this.inputForm.projectNumber + '-0' + (this.inputForm.cwProjectInfoList.length + 1), // 报告流水号
+              issueReport: '是',
+              sealType: '未盖章',
+              id: this.uuid,
+              servedUnitId: item.id
+            }
+            this.$refs.clientTable.insertAt(d)
+            this.inputForm.cwProjectInfoList.push(d)
+            this.tableKeyClient = Math.random()
+          })
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
+</style>

src/views/modules/cw/workClientInfo/WorkClientForm.vue

@@ -951,7 +951,12 @@
         this.doSubmit('save', callback)
       },
       startForm (callback) {
-        this.doSubmit('start', callback)
+        if (this.commonJS.isEmpty(this.inputForm.cwWorkClientContactDTOList)) {
+          this.$message.error('“客户联系人”信息中至少有一条数据')
+          throw new Error('“客户联系人”信息中至少有一条数据')
+        } else {
+          this.doSubmit('start', callback)
+        }
       },
       async agreeForm (callback) {
         await this.workClientService.queryById(this.inputForm.id).then(({data}) => {
@@ -969,6 +974,14 @@
           // 暂存
           // this.inputForm.status = '1'
           this.loading = true
+          if (this.commonJS.isEmpty(this.inputForm.cwWorkClientContactDTOList)) {
+            this.$message.error('“客户联系人”信息中至少有一条数据')
+            this.loading = false
+            throw new Error('“客户联系人”信息中至少有一条数据')
+          }
+          this.billingSubmit()
+          this.contactSubmit()
+          this.baseSubmit()
           if (this.$refs.uploadComponent.checkProgress()) {
             this.loading = false
             return
@@ -1106,6 +1119,7 @@
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
+        this.$emit('refreshList')
         this.visible = false
       },
       tabHandleClick (event) {
@@ -1340,6 +1354,31 @@
               throw new Error('客户联系人中，第' + (index + 1) + '条数据的“邮箱”填写错误')
             }
           }
+          if (this.commonJS.isEmpty(item.name)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“姓名”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“姓名”未填写')
+          }
+          if (this.commonJS.isEmpty(item.sex)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“性别”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“性别”未填写')
+          }
+          if (this.commonJS.isEmpty(item.officeId)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“部门”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“部门”未填写')
+          }
+          if (this.commonJS.isEmpty(item.position)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“职务”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“职务”未填写')
+          }
+          if (this.commonJS.isEmpty(item.contactFirst)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“联系方式1”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“联系方式1”未填写')
+          }
         })
       }
     }

src/views/modules/cw/workClientInfo/WorkClientList.vue

@@ -70,10 +70,11 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top" style="">
-      <vxe-toolbar :refresh="{query: refreshList}" custom>
+      <vxe-toolbar :refresh="{query: refreshList}" export custom>
         <template #buttons>
           <el-button v-if="hasPermission('cw_work_client:info:add')" type="primary" size="small" icon="el-icon-plus" @click="start()">新建</el-button>
           <!--          <el-button v-if="hasPermission('klg:question:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.questionsTable && $refs.questionsTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
+<!--          <el-button type="warning" size="small" icon="el-icon-download" @click="exportFile()" plain>导出</el-button>-->
         </template>
       </vxe-toolbar>
       <div style="height: calc(100% - 90px)">
@@ -91,10 +92,19 @@
           highlight-hover-row
           :menu-config="{}"
           @sort-change="sortChangeHandle"
+          :export-config="{
+                    remote: true,
+                    filename: `客户信息数据${moment(new Date()).format('YYYY-MM-DD')}`,
+                    sheetName: `客户信息数据${moment(new Date()).format('YYYY-MM-DD')}`,
+                    exportMethod: exportMethod,
+                    types: ['xlsx'],
+                    modes: ['current', 'selected', 'all']
+                  }"
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column min-width="230" align="center" title="客户名称" field="name">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cw_work_client:info:view')" @click="view(scope.row.id)">{{scope.row.name}}</el-link>
@@ -148,11 +158,11 @@
           </vxe-column>
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text" icon="el-icon-edit" size="small" @click="push(scope.row)">修改</el-button>
-              <el-button v-else-if="hasPermission('cw_work_client:info:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='2'" type="text" icon="el-icon-edit" size="small" @click="reback(scope.row)">撤回</el-button>
-              <el-button v-if="hasPermission('cw_work_client:info:del')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
-              <el-button v-else-if="hasPermission('cw_work_client:info:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"  size="small" @click="push(scope.row)">修改</el-button>
+              <el-button v-else-if="hasPermission('cw_work_client:info:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
+              <el-button v-if="hasPermission('cw_work_client:info:del')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-else-if="hasPermission('cw_work_client:info:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -168,7 +178,7 @@
         </vxe-pager>
       </div>
     </div>
-    <WorkClientForm ref="workClientForm"></WorkClientForm>
+    <WorkClientForm ref="workClientForm" @refreshList="refreshList"></WorkClientForm>
   </div>
 </template>
 
@@ -269,7 +279,6 @@
         }).then(({data}) => {
           this.dataList = data.records
           this.tablePage.total = data.total
-          this.tableKey = Math.random()
           this.loading = false
         })
         this.checkIsAdmin()
@@ -413,6 +422,31 @@
             }
           })
         })
+      },
+      // 自定义服务端导出
+      exportMethod ({ options }) {
+        // 传给服务端的参数
+        const params = {
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm,
+          filename: options.filename,
+          sheetName: options.sheetName,
+          isHeader: options.isHeader,
+          original: options.original,
+          mode: options.mode,
+          selectIds: options.mode === 'selected' ? options.data.map(item => item.id) : [],
+          exportFields: options.columns.map(column => column.property)
+        }
+        return this.workClientService.exportFile(params).then((res) => {
+          // 将二进制流文件写入excel表，以下为重要步骤
+          this.$utils.downloadExcel(res.data, options.filename)
+        }).catch(function (err) {
+          if (err.response) {
+            console.log(err.response)
+          }
+        })
       }
     }
   }

src/views/modules/cw/workClientInfo/WorkClientTaskForm.vue

@@ -931,7 +931,12 @@
         this.doSubmit('save', callback)
       },
       startForm (callback) {
-        this.doSubmit('start', callback)
+        if (this.commonJS.isEmpty(this.inputForm.cwWorkClientContactDTOList)) {
+          this.$message.error('“客户联系人”信息中至少有一条数据')
+          throw new Error('“客户联系人”信息中至少有一条数据')
+        } else {
+          this.doSubmit('start', callback)
+        }
       },
       async agreeForm (callback) {
         await this.workClientService.queryById(this.inputForm.id).then(({data}) => {
@@ -1319,6 +1324,31 @@
               throw new Error('客户联系人中，第' + (index + 1) + '条数据的“邮箱”填写错误')
             }
           }
+          if (this.commonJS.isEmpty(item.name)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“姓名”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“姓名”未填写')
+          }
+          if (this.commonJS.isEmpty(item.sex)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“性别”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“性别”未填写')
+          }
+          if (this.commonJS.isEmpty(item.officeId)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“部门”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“部门”未填写')
+          }
+          if (this.commonJS.isEmpty(item.position)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“职务”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“职务”未填写')
+          }
+          if (this.commonJS.isEmpty(item.contactFirst)) {
+            this.$message.error('客户联系人中，第' + (index + 1) + '条数据的“联系方式1”未填写')
+            this.loading = false
+            throw new Error('客户联系人中，第' + (index + 1) + '条数据的“联系方式1”未填写')
+          }
         })
       }
     }

src/views/modules/flowable/task/TodoList.vue

@@ -3,6 +3,7 @@
       <el-form size="small" :inline="true"  class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
         <el-form-item label="创建时间" prop="searchDates">
           <el-date-picker
+            placement="bottom-start"
             v-model="searchDates"
             type="daterange"
             size="small"
@@ -163,7 +164,22 @@
     created () {
       this.taskService = new TaskService()
     },
+    mounted () {
+    },
     activated () {
+      // 判断是否有签章页面带过来
+      if (this.commonJS.isNotEmpty(this.$route.query.signatureUrl)) {
+        this.$confirm(`确定要前往签章页面吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log('前往签章页面')
+          window.open(this.$route.query.signatureUrl, '_blank')
+        }).catch(() => {
+          console.log('取消前往签章页面')
+        })
+      }
       this.refreshList()
     },
     components: {

src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -348,6 +348,19 @@
       this.noticeService = new NoticeService()
     },
     activated () {
+      // 判断是否有签章页面带过来
+      if (this.commonJS.isNotEmpty(this.$route.query.signatureUrl)) {
+        this.$confirm(`确定要前往签章页面吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log('前往签章页面')
+          window.open(this.$route.query.signatureUrl, '_blank')
+        }).catch(() => {
+          console.log('取消前往签章页面')
+        })
+      }
       this.refreshList()
     },
     components: {
@@ -358,6 +371,7 @@
     // watch: {
     // },
     mounted () {
+      console.log('123')
       // 页面加载后
       // 1.在执行定时器前先执行一次获取接口数据的操作函数, 否则接口会1秒钟后才调用
       // 2.为了避免退出当前页面后,在其他页面也继续调用接口,退出前需要清除定时器.

src/views/modules/sys/dashboard/workBench/PendingList.vue

@@ -37,7 +37,6 @@
     data () {
       // eslint-disable-next-line no-unused-expressions,no-unused-vars
       var num = this.$route.query.num
-      console.log(num)
       return {
         activeName: 'todoList',
         num: num