Selaa lähdekoodia

徐珊业务需求 评估显示,项目归档待办

sangwenwei 1 vuosi sitten
vanhempi
commit
1ebbd19ede

+ 2 - 2
src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -500,8 +500,8 @@
       // 发起项目归档
       push (row) {
         // 读取流程表单
-        let title = `发起流程【会计-项目报告归档】`
-        let processTitle = `${this.$store.state.user.name} 发起了 ${row.reportNo} - ${row.projectName} [会计-项目报告归档]`
+        let title = `发起流程[会计-项目报告归档]`
+        let processTitle = `${this.$store.state.user.name} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ${row.reportNo} - ${row.projectName} [会计-项目报告归档]`
         let status = 'startAndHold'
         if (row.status === '3' || row.status === '4') {
           status = 'startAndClose'

+ 6 - 6
src/views/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -800,9 +800,9 @@
                               this.inputForm.procDefId = data.id
                               this.inputForm.procDefKey = data.key
                             }
-                            let processTitle = `${this.$store.state.user.name} 发起了 ${this.inputForm.reportNo} - ${this.inputForm.cwProjectRecordsDTO.projectName} ` + `[会计-项目报告归档-苏州分部]`
-                            this.inputForm.formTitle = processTitle
-                            this.inputForm.title = `发起流程【会计-项目报告归档-苏州分部】`
+                            let processTitle = `${this.$store.state.user.name} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ${this.inputForm.reportNo} - ${this.inputForm.cwProjectRecordsDTO.projectName} ` + `[会计-项目报告归档-苏州分部]`
+                            this.inputForm.formTitle = `发起流程【会计-项目报告归档-苏州分部】`
+                            this.inputForm.title = processTitle
                           }
                           callback(saveDate.businessTable, saveDate.businessId, this.inputForm)
                           this.loading = false
@@ -816,9 +816,9 @@
                               this.inputForm.procDefId = data.id
                               this.inputForm.procDefKey = data.key
                             }
-                            let processTitle = `${this.$store.state.user.name} 发起了 ${this.inputForm.reportNo} - ${this.inputForm.cwProjectRecordsDTO.projectName} ` + `[会计-项目报告归档]`
-                            this.inputForm.formTitle = processTitle
-                            this.inputForm.title = `发起流程【会计-项目报告归档】`
+                            let processTitle = `${this.$store.state.user.name} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ${this.inputForm.reportNo} - ${this.inputForm.cwProjectRecordsDTO.projectName} ` + `[会计-项目报告归档]`
+                            this.inputForm.formTitle = `发起流程【会计-项目报告归档】`
+                            this.inputForm.title = processTitle
                           }
                           callback(saveDate.businessTable, saveDate.businessId, this.inputForm)
                           this.loading = false

+ 4 - 0
src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue

@@ -1026,6 +1026,10 @@
                 this.inputForm.taskName = data
               })
             }
+            //当前登录人是苏州报告签字盖章代办且签章附件不为空的时候,进入页面展示已签章附件
+			  if (this.commonJS.isNotEmpty(data.signatureFileList) && data.isXs === '1'){
+				  this.signatureName = 'signatureFile'
+			  }
             if (data.reviewBys) {
               data.reviewBys.forEach(re => {
                 let va = {

+ 1 - 0
src/views/flowable/task/NoticePageList.vue

@@ -131,6 +131,7 @@
           'orders': this.tablePage.orders,
           ...this.searchForm
         }).then((data) => {
+        	console.log('data',data.records)
           this.dataList = data.records
           this.tablePage.total = data.total
           this.loading = false

+ 26 - 1
src/views/program/registered/ProofreadForm.vue

@@ -52,6 +52,9 @@
 				<vxe-table
 					border
 					show-overflow
+					show-header-overflow
+					highlight-hover-row
+					:tooltip-config="{ zIndex: 9999 }"
 					ref="detailFor1010"
 					class="vxe-table-element"
 					:data="inputForm.detailFor1010"
@@ -117,6 +120,9 @@
           		<vxe-table
             border
             show-overflow
+			show-header-overflow
+			highlight-hover-row
+			:tooltip-config="{ zIndex: 9999 }"
             ref="details"
             class="vxe-table-element"
             :data="inputForm.detailFor2010"
@@ -180,6 +186,9 @@
           		<vxe-table
             border
             show-overflow
+			show-header-overflow
+			highlight-hover-row
+			:tooltip-config="{ zIndex: 9999 }"
             ref="details"
             class="vxe-table-element"
             :data="inputForm.detailFor2020"
@@ -243,6 +252,9 @@
           		<vxe-table
             border
             show-overflow
+			show-header-overflow
+			highlight-hover-row
+			:tooltip-config="{ zIndex: 9999 }"
             ref="details"
             class="vxe-table-element"
             :data="inputForm.detailFor2030"
@@ -306,6 +318,9 @@
           		<vxe-table
             border
             show-overflow
+			show-header-overflow
+			highlight-hover-row
+			:tooltip-config="{ zIndex: 9999 }"
             ref="details"
             class="vxe-table-element"
             :data="inputForm.detailFor2040"
@@ -369,6 +384,9 @@
           		<vxe-table
             border
             show-overflow
+			show-header-overflow
+			highlight-hover-row
+			:tooltip-config="{ zIndex: 9999 }"
             ref="details"
             class="vxe-table-element"
             :data="inputForm.detailFor2050"
@@ -432,6 +450,9 @@
           		<vxe-table
             border
             show-overflow
+			show-header-overflow
+			:tooltip-config="{ zIndex: 9999 }"
+			highlight-hover-row
             ref="details"
             class="vxe-table-element"
             :data="inputForm.detailFor2060"
@@ -494,8 +515,12 @@
 			<el-col :span="24">
           		<vxe-table
             border
+			auto-resize
+			resizable
             show-overflow
+			show-header-overflow
             ref="details"
+			:tooltip-config="{ zIndex: 9999 }"
             class="vxe-table-element"
             :data="inputForm.detailFor30"
             style="margin-left: 5em"
@@ -506,7 +531,7 @@
           >
             <vxe-table-column field="typeName" title="审核要点" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
+                <el-input :disabled="true"  v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
 <!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->