Commit fb42745207b4c8ef202a6d540ce8a6eca5f3a0ba

Authored by gesilong
2 parents f5d83d57 432f82c3

Merge branch 'cjerp-1.0_20260116' of http://gitlab.qgutech.com/zhuyuanliang/erp-…

…mobile into cjerp-1.0_20260116
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 }}</text></view> 60 }}</text></view>
61 </view> 61 </view>
62 <view class="section" v-if="detail.status === 'STANDARD'"> 62 <view class="section" v-if="detail.status === 'STANDARD'">
63 - <view class="row"><text class="label">双方盖章合同</text><text class="value" style="color: #3D48A3;">{{ 63 + <view class="row"><text class="label">双方盖章合同</text><text class="value act" @click="downloadFile(detail.signedContractFileId, detail.signedContractFileName)">{{
64 detail.signedContractFileName || '-' }}</text></view> 64 detail.signedContractFileName || '-' }}</text></view>
65 <view class="row"><text class="label">规范性合同</text><text class="value act" @click="downloadFile(detail.standardFileId, detail.standardFileName)">{{ 65 <view class="row"><text class="label">规范性合同</text><text class="value act" @click="downloadFile(detail.standardFileId, detail.standardFileName)">{{
66 detail.standardFileName || '-' }}</text></view> 66 detail.standardFileName || '-' }}</text></view>
@@ -121,6 +121,7 @@ import DetailButtons from '@/components/detail-buttons/index.vue' @@ -121,6 +121,7 @@ import DetailButtons from '@/components/detail-buttons/index.vue'
121 import FileUpload from '@/components/file-upload/index.vue' 121 import FileUpload from '@/components/file-upload/index.vue'
122 import SingleSelectSheet from '@/components/single-select/index.vue' 122 import SingleSelectSheet from '@/components/single-select/index.vue'
123 import { fillStandardApprovedName } from '@/utils/dic.js' 123 import { fillStandardApprovedName } from '@/utils/dic.js'
  124 +import { downloadFile } from '@/utils/downloadFile.js'
124 125
125 export default { 126 export default {
126 name: 'ContractForeignStdDetail', 127 name: 'ContractForeignStdDetail',
@@ -376,6 +377,7 @@ export default { @@ -376,6 +377,7 @@ export default {
376 uni.setStorageSync(CACHE_KEY, this.getBusinessId()) 377 uni.setStorageSync(CACHE_KEY, this.getBusinessId())
377 uni.navigateTo({ url: '/pages/flow/audit_detail' }) 378 uni.navigateTo({ url: '/pages/flow/audit_detail' })
378 }, 379 },
  380 + downloadFile,
379 async loadDetail() { 381 async loadDetail() {
380 if (!this.id) return 382 if (!this.id) return
381 try { 383 try {
@@ -488,10 +490,13 @@ export default { @@ -488,10 +490,13 @@ export default {
488 font-size: 28rpx; 490 font-size: 28rpx;
489 white-space: pre-wrap; 491 white-space: pre-wrap;
490 word-break: break-all; 492 word-break: break-all;
491 - .act { 493 +
  494 +}
  495 +
  496 +.act {
492 color: $theme-primary; 497 color: $theme-primary;
493 } 498 }
494 -} 499 +
495 500
496 .customer { 501 .customer {
497 font-weight: 600; 502 font-weight: 600;
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 detail.standardStandardized ? '是' : '否' }}</text></view> 81 detail.standardStandardized ? '是' : '否' }}</text></view>
82 </view> 82 </view>
83 <view class="section" v-if="detail.status === 'FORMAL'"> 83 <view class="section" v-if="detail.status === 'FORMAL'">
84 - <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{ 84 + <view class="row"><text class="label">规范性合同</text><text class="value act" @click="downloadFile(detail.formalFileId, detail.formalFileName)">{{
85 detail.formalFileName || '-' }}</text></view> 85 detail.formalFileName || '-' }}</text></view>
86 <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized 86 <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized
87 ? '是' : '否' }}</text></view> 87 ? '是' : '否' }}</text></view>
@@ -140,6 +140,7 @@ import DetailButtons from '@/components/detail-buttons/index.vue' @@ -140,6 +140,7 @@ import DetailButtons from '@/components/detail-buttons/index.vue'
140 import FileUpload from '@/components/file-upload/index.vue' 140 import FileUpload from '@/components/file-upload/index.vue'
141 import SingleSelectSheet from '@/components/single-select/index.vue' 141 import SingleSelectSheet from '@/components/single-select/index.vue'
142 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js' 142 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
  143 +import { downloadFile } from '@/utils/downloadFile.js'
143 144
144 export default { 145 export default {
145 name: 'ContractForeignStockDetail', 146 name: 'ContractForeignStockDetail',
@@ -467,6 +468,7 @@ export default { @@ -467,6 +468,7 @@ export default {
467 uni.setStorageSync(CACHE_KEY, id) 468 uni.setStorageSync(CACHE_KEY, id)
468 uni.navigateTo({ url: '/pages/flow/audit_detail' }) 469 uni.navigateTo({ url: '/pages/flow/audit_detail' })
469 }, 470 },
  471 + downloadFile,
470 async loadDetail() { 472 async loadDetail() {
471 if (!this.id) return 473 if (!this.id) return
472 try { 474 try {
@@ -567,7 +569,8 @@ export default { @@ -567,7 +569,8 @@ export default {
567 } 569 }
568 570
569 .label { 571 .label {
570 - width: 310rpx; 572 + max-width: 310rpx;
  573 + margin-right: 20rpx;
571 color: rgba(0, 0, 0, 0.6); 574 color: rgba(0, 0, 0, 0.6);
572 font-size: 28rpx; 575 font-size: 28rpx;
573 } 576 }
@@ -579,6 +582,9 @@ export default { @@ -579,6 +582,9 @@ export default {
579 font-size: 28rpx; 582 font-size: 28rpx;
580 white-space: pre-wrap; 583 white-space: pre-wrap;
581 word-break: break-all; 584 word-break: break-all;
  585 + &.act {
  586 + color: $theme-primary;
  587 + }
582 } 588 }
583 589
584 .customer { 590 .customer {