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

史婷婷
2 parents cf7b802d f2a0ff66
Showing 2 changed files with 42 additions and 16 deletions
pages/contract_foreign_stock/detail.vue
pages/contract_foreign_unplan/detail.vue
--- a/pages/contract_foreign_stock/detail.vue
View file @1113915
+++ b/pages/contract_foreign_stock/detail.vue
View file @1113915
@@ -86,7 +86,7 @@
         <uni-popup ref="uploadPopup" type="bottom" :mask-click="false" :safe-area="true">
             <view class="upload-dialog">
                 <view class="upload-header">
-                    <text class="title">上传规范性合同</text>
+                    <text class="title">{{ uploadType === 'seal' ? '上传双方盖章合同' : '上传规范性合同' }}</text>
                     <uni-icons type="closeempty" style="position: absolute; right: 16px;" size="22"
                         @click="$refs.uploadPopup.close()" />
                 </view>
@@ -96,7 +96,7 @@
                         <FileUpload v-model="fileInfo" />
                     </view>
                     <view v-if="fileInfo && fileInfo.name" class="upload-show">{{ fileInfo.name }}</view>
-                    <view class="row1" @click="openStandardizedSheet">
+                    <view class="row1" @click="openStandardizedSheet" v-if="uploadType !== 'seal'">
                         <view class="label1">合同是否规范</view>
                         <uni-icons type="right" size="18" v-if="!standardStandardizedName"></uni-icons>
                         <view class="value" v-else>{{ standardStandardizedName }}</view>
@@ -113,7 +113,7 @@
 </template>
 <script>
-import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract } from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
@@ -246,6 +246,12 @@ export default {
                 variant: 'primary',
                 event: 'auditDetail3'
             },
+            {
+                text: '上传双方盖章合同',
+                visible: true,
+                variant: 'outline',
+                event: 'uploadSeal'
+            },
             ],
         }
     },
@@ -270,6 +276,7 @@ export default {
                 { ...this.buttons[9], visible: (s === 'FORMAL' && t) }, 
                 { ...this.buttons[10], visible: (s === 'STANDARD' && t) },
                 { ...this.buttons[11], visible: (s === 'STANDARD' && a) },
+                { ...this.buttons[12], visible: (s === 'STANDARD') }, 
             ]
         }
     },
@@ -326,14 +333,19 @@ export default {
                 })
                 return
             }
-            if (!this.standardStandardized) {
+            if (!this.standardStandardized && this.uploadType !== 'seal') {
                 uni.showToast({
                     title: '请选择合同是否规范',
                     icon: 'error'
                 })
                 return
             }
-            const data = this.uploadType === 'formal' ? {
+            const data = this.uploadType === 'seal' ? 
+            {
+                id: this.id,
+                signedContractFileId: this.fileInfo.id,
+                signedContractFileName: this.fileInfo.name,
+            } :this.uploadType === 'formal' ? {
                 id: this.id,
                 formalFileId: this.fileInfo.id,
                 formalFileName: this.fileInfo.name,
@@ -344,15 +356,15 @@ export default {
                 standardFileName: this.fileInfo.name,
                 standardStandardized: this.standardStandardized
             }
-            const api = this.uploadType === 'formal' ? uploadFormalContract : uploadStandardContract
+            const api = this.uploadType === 'seal' ? uploadSignedContractFile : this.uploadType === 'formal' ? uploadFormalContract : uploadStandardContract
             uni.showModal({
                 title: '确认提交',
-                content: this.uploadType === 'formal' ? '确定提交正式合同吗？' : '确定提交标准合同吗？',
+                content: this.uploadType === 'seal' ? '确定提交双方盖章合同吗？' : this.uploadType === 'formal' ? '确定提交正式合同吗？' : '确定提交标准合同吗？',
                 success: (res) => {
                     if (res.confirm) {
                         api({ ...this.detail, ...data }).then(() => {
                             uni.showToast({
-                                title: this.uploadType === 'formal' ? '上传正式合同成功' : '上传标准合同成功',
+                                title: this.uploadType === 'seal' ? '上传双方盖章合同成功' : this.uploadType === 'formal' ? '上传正式合同成功' : '上传标准合同成功',
                                 icon: 'success'
                             })
                             setTimeout(() => {
@@ -402,6 +414,8 @@ export default {
             if (e === 'auditDetail1') return this.onAuditDetail(this.detail.id || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
+            if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
+
         },
         onAudit(id, type) {
             const CACHE_KEY = 'sourceBusinessId'
--- a/pages/contract_foreign_unplan/detail.vue
View file @1113915
+++ b/pages/contract_foreign_unplan/detail.vue
View file @1113915
@@ -87,7 +87,7 @@
         <uni-popup ref="uploadPopup" type="bottom" :mask-click="false" :safe-area="true">
             <view class="upload-dialog">
                 <view class="upload-header">
-                    <text class="title">上传规范性合同</text>
+                    <text class="title">{{ uploadType === 'seal' ? '上传双方盖章合同' : '上传规范性合同' }}</text>
                     <uni-icons type="closeempty" style="position: absolute; right: 16px;" size="22"
                         @click="$refs.uploadPopup.close()" />
                 </view>
@@ -97,7 +97,7 @@
                         <FileUpload v-model="fileInfo" />
                     </view>
                     <view v-if="fileInfo && fileInfo.name" class="upload-show">{{ fileInfo.name }}</view>
-                    <view class="row1" @click="openStandardizedSheet">
+                    <view class="row1" @click="openStandardizedSheet" v-if="uploadType !== 'seal'">
                         <view class="label1">合同是否规范</view>
                         <uni-icons type="right" size="18" v-if="!standardStandardizedName"></uni-icons>
                         <view class="value" v-else>{{ standardStandardizedName }}</view>
@@ -114,7 +114,7 @@
 </template>
 <script>
-import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract } from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
@@ -252,6 +252,12 @@ export default {
                 variant: 'primary',
                 event: 'auditDetail3'
             },
+            {
+                text: '上传双方盖章合同附件',
+                visible: true,
+                variant: 'outline',
+                event: 'uploadSeal'
+            },
             ],
         }
     },
@@ -277,6 +283,7 @@ export default {
                 { ...this.buttons[10], visible: (s === 'FORMAL' && a) }, //正式合同审核详情
                 { ...this.buttons[11], visible: (s === 'STANDARD' && a) }, //正式合同审核详情
                 { ...this.buttons[12], visible: (s === 'STANDARD' && t) },         //标准合同审核详情
+                { ...this.buttons[13], visible: (s === 'STANDARD') }, //上传双方盖章合同附件
             ]
         }
     },
@@ -343,14 +350,18 @@ export default {
                 })
                 return
             }
-            if (!this.standardStandardized) {
+            if (!this.standardStandardized && this.uploadType !== 'seal') {
                 uni.showToast({
                     title: '请选择合同是否规范',
                     icon: 'error'
                 })
                 return
             }
-            const data = this.uploadType === 'formal' ? {
+            const data = this.uploadType === 'seal' ? {
+                id: this.id,
+                signedContractFileId: this.fileInfo.id,
+                signedContractFileName: this.fileInfo.name,
+            } : this.uploadType === 'formal' ? {
                 id: this.id,
                 formalFileId: this.fileInfo.id,
                 formalFileName: this.fileInfo.name,
@@ -361,15 +372,15 @@ export default {
                 standardFileName: this.fileInfo.name,
                 standardStandardized: this.standardStandardized
             }
-            const api = this.uploadType === 'formal' ? uploadFormalContract : uploadStandardContract
+            const api = this.uploadType === 'seal' ? uploadSignedContractFile : this.uploadType === 'formal' ? uploadFormalContract : uploadStandardContract
             uni.showModal({
                 title: '确认提交',
-                content: this.uploadType === 'formal' ? '确定提交正式合同吗？' : '确定提交标准合同吗？',
+                content: this.uploadType === 'formal' ? '确定提交正式合同吗？' : this.uploadType === 'seal' ? '确定提交双方盖章合同吗？' : '确定提交标准合同吗？',
                 success: (res) => {
                     if (res.confirm) {
                         api({ ...this.detail, ...data }).then(() => {
                             uni.showToast({
-                                title: this.uploadType === 'formal' ? '上传正式合同成功' : '上传标准合同成功',
+                                title: this.uploadType === 'seal' ? '上传双方盖章合同成功' : this.uploadType === 'formal' ? '上传正式合同成功' : '上传标准合同成功',
                                 icon: 'success'
                             })
                             setTimeout(() => {
@@ -415,6 +426,7 @@ export default {
             if (e === 'auditDetail1') return this.onAuditDetail(this.detail.id || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
+            if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
         },
         onAudit(id, type) {
             const CACHE_KEY = 'sourceBusinessId'