diff --git a/public/favicon.ico b/public/favicon.ico index 121ffe2..a4462c3 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/components/pro-tabs/bns-file-list-tabs.vue b/src/components/pro-tabs/bns-file-list-tabs.vue index e4c6e88..c939b11 100644 --- a/src/components/pro-tabs/bns-file-list-tabs.vue +++ b/src/components/pro-tabs/bns-file-list-tabs.vue @@ -3,35 +3,21 @@
文件图标
-
-
- 文件图标 - 文件图标 - 文件图标 - 文件图标 - 文件图标 - 文件图标 - +
+
+ 文件图标 + 文件图标 + 文件图标 + 文件图标 + 文件图标 + 文件图标
- {{ item.fileName.length > 8 ? item.fileName.substring(0, 8) + '....' + item.fileName.split('.').pop().toLowerCase() : item.fileName + {{ + item.fileName.length > 8 + ? item.fileName.substring(0, 8) + '....' + item.fileName.split('.').pop().toLowerCase() + : item.fileName }}
{{ (item.fileSize / 1024).toFixed(2) + 'Kb' }}
@@ -40,14 +26,30 @@
- -
- + +
+ + +
+ +
+
+ +
+ +
+
+
- - + diff --git a/src/views/pro/preCommencementWorks/ContractorAdmissionQualification/index.vue b/src/views/pro/preCommencementWorks/ContractorAdmissionQualification/index.vue index f0f85b5..b1a59e9 100644 --- a/src/views/pro/preCommencementWorks/ContractorAdmissionQualification/index.vue +++ b/src/views/pro/preCommencementWorks/ContractorAdmissionQualification/index.vue @@ -7,28 +7,19 @@ placeholder="请输入关键字" maxlength="60" show-word-limit - clearable v-no-whitespace + clearable + v-no-whitespace @keyup.enter.native="handleQuery" /> - + - + @@ -36,10 +27,13 @@ 重置 - + - @@ -57,51 +51,49 @@ - - + + { this.approvalStatus = response.data @@ -189,7 +180,7 @@ export default { /** 获取工程下拉选 */ getProOption() { const params = { - id: '' + id: '', } getProOptions(params).then(res => { this.proNameDict = res.data @@ -200,8 +191,8 @@ export default { getList() { this.loading = false // this.queryParams.proId = this.$store.state.user.thisIds.proId; - this.queryParams.supUuid = this.$store.state.user.thisIds.supUuid; - this.queryParams.userType = this.$store.state.user.userType; + this.queryParams.supUuid = this.$store.state.user.thisIds.supUuid + this.queryParams.userType = this.$store.state.user.userType getConsEntranceList(this.queryParams).then(response => { this.proList = response.rows this.total = response.total @@ -213,36 +204,51 @@ export default { /** 打开审核页面 */ examine(row, type) { if (type === 1) { - this.$router.push('/system/cons-approval-auth/consEntranceApproval/' + encryptCBC(JSON.stringify({ - proId: row.proId, - taskId: row.taskId, - procInstId:row.procInsId, - finalCheck: row.finalCheck, - consUuid: row.consUuid, - isExamine: true, - btnShow: true, - showType: 2 - }))) + this.$router.push( + '/system/cons-approval-auth/consEntranceApproval/' + + encryptCBC( + JSON.stringify({ + proId: row.proId, + taskId: row.taskId, + procInstId: row.procInsId, + finalCheck: row.finalCheck, + consUuid: row.consUuid, + isExamine: true, + btnShow: true, + showType: 2, + }) + ) + ) } else { - this.$router.push('/system/cons-approval-auth/consEntranceApproval/' + encryptCBC(JSON.stringify({ - proId: row.proId, - taskId: row.taskId, - procInstId:row.procInsId, - finalCheck: row.finalCheck, - consUuid: row.consUuid, - isExamine: false, - btnShow: false, - showType: 1 - }))) + this.$router.push( + '/system/cons-approval-auth/consEntranceApproval/' + + encryptCBC( + JSON.stringify({ + proId: row.proId, + taskId: row.taskId, + procInstId: row.procInsId, + finalCheck: row.finalCheck, + consUuid: row.consUuid, + isExamine: false, + btnShow: false, + showType: 1, + }) + ) + ) } }, /** 打开审核记录页面 */ auditRecord(row) { - this.$router.push("/flow/auditRecord/" + encryptCBC(JSON.stringify({ - taskId: row.taskId, - checkType:'2', - taskType: '存在' - }))); + this.$router.push( + '/flow/auditRecord/' + + encryptCBC( + JSON.stringify({ + taskId: row.taskId, + checkType: '2', + taskType: '存在', + }) + ) + ) }, /** 搜索按钮操作 */ handleQuery() { @@ -259,7 +265,7 @@ export default { this.ids = selection.map(item => item.proId) this.single = selection.length !== 1 this.multiple = !selection.length - } - } + }, + }, } diff --git a/src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue b/src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue index fe98ed8..6dec25e 100644 --- a/src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue +++ b/src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue @@ -1,10 +1,7 @@