Merge remote-tracking branch 'origin/master'

src/api/cw/reportManagement/ProjectReportService.js

@@ -129,4 +129,18 @@ export default class ProjectReportService {
       params: {clientId: clientId, ...reportForm}
     })
   }
+  saveSignFiles (data) {
+    return request({
+      url: '/cwProjectReport/saveSignFiles',
+      method: 'post',
+      data: data
+    })
+  }
+  saveReportArchive (reportId) {
+    return request({
+      url: '/cwProjectReport/saveReportArchive',
+      method: 'get',
+      params: {reportId: reportId}
+    })
+  }
 }

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

@@ -110,7 +110,7 @@
 <!--          <vxe-column min-width="160" align="center" title="报告主办人" field="reportSponsor"></vxe-column>-->
           <vxe-column min-width="160" align="center" title="创建人" field="userName"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建时间" field="createDate"></vxe-column>
-          <vxe-column  min-width="110px"align="center" fixed="right" title="复核状态" field="reviewStatus" >
+          <vxe-column  min-width="120px"align="center" fixed="right" title="复核状态" field="reviewStatus" >
             <template slot-scope="scope">
               <el-button  type="text" @click="detail(scope.row)" effect="dark" size="mini"
                           :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.reviewStatus, '-')">
@@ -118,7 +118,7 @@
               </el-button>
             </template>
           </vxe-column>
-          <vxe-column  min-width="110px"align="center" fixed="right" title="签章状态" >
+          <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, '-')">
@@ -129,8 +129,8 @@
                 {{$dictUtils.getDictLabel("cw_project_report_sign_status", scope.row.status2, '-')}}
               </el-button>
               <el-button v-if="scope.row.signatureType === '3'" type="text" @click="detailS3(scope.row)" effect="dark" size="mini"
-                         :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status3, '-')">
-                {{$dictUtils.getDictLabel("cw_status", scope.row.status3, '-')}}
+                         :type="$dictUtils.getDictLabel('cw_project_report_sign_status_flag', scope.row.status3, '-')">
+                {{$dictUtils.getDictLabel("cw_project_report_sign_status", scope.row.status3, '-')}}
               </el-button>
             </template>
           </vxe-column>
@@ -608,15 +608,15 @@
         } else if (row.status3 === '4') {
           status = 'reapplyFlag'
         }
-        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId,
+        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId2,
           businessId: row.sid3,
           businessTable: 'cw_project_report_signature'}).then((data) => {
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
                 ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
-                procDefId: this.processDefinitionSId,
-                procDefKey: this.procDefSKey,
+                procDefId: this.processDefinitionSId2,
+                procDefKey: this.procDefSKey2,
                 title: title,
                 formType: data.data.formType,
                 formUrl: data.data.formUrl,
@@ -659,7 +659,7 @@
           // eslint-disable-next-line eqeqeq
           this.taskService.getTaskDef({
             procInsId: row.procInsIds3,
-            procDefId: this.processDefinitionSId
+            procDefId: this.processDefinitionSId2
           }).then(({data}) => {
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -833,7 +833,7 @@
                 this.inputForm.taskName = data
               })
             }
-            if(data.reviewBys){
+            if (data.reviewBys) {
               data.reviewBys.forEach(re => {
                 let va = {
                   label: re.name,

src/views/modules/sys/mould/SerialnumTplForm.vue

@@ -306,7 +306,7 @@
       },
       // 变量值处理
       variableValue (row, type) {
-        if (type === '1' || type === '2') {
+        if (type === '1' || type === '2' || type === '11') {
           row.value = ''
           row.showType = true
         }
@@ -372,6 +372,10 @@
             i = i + '{day}'
             j = j + obj.value
           }
+          // 公司简称
+          if (obj.type === '11') {
+            i = i + '{replacement}'
+          }
         })
         this.inputForm.serialTpl = i
         this.inputForm.serialTplEx = j