提交上传专家签名

bidding-ui/src/views/mine/components/CompSupplier.vue

@@ -108,7 +108,7 @@
           </el-descriptions-item>
           <el-descriptions-item :span="1" label-style="text-align: center;">
             <template slot="label">
-              拒绝接收短信
+              拒绝接收短信（投标邀请短信）
             </template>
             <el-switch v-model="bs_supplier.hSms" :active-value="1" :inactive-value="0"></el-switch>
           </el-descriptions-item>

ruoyi-ui/src/views/expert/ewh/detail.vue

@@ -34,7 +34,7 @@
 
                 <span style="font-size: 18px;font-weight: bold;">扫描件管理</span>
                 <el-divider></el-divider>
-                <el-table :data="fujianData" border style="width: 100%">
+                <el-table :data="fujianData" border style="width: 100%; margin-bottom: 20px">
                     <el-table-column label="序号" type="index" width="80"></el-table-column>
                     <el-table-column prop="name" label="电子件名称" min-width="180"></el-table-column>
                     <el-table-column prop="fileList" label="电子件列表(点击查看)" min-width="180">
@@ -46,6 +46,20 @@
                     </el-table-column>
                 </el-table>
 
+                <template v-if="checkRole(['operator'])">
+                    <span style="font-size: 18px;font-weight: bold;">专家签名</span>
+                    <el-divider></el-divider>
+                    <div class="expert-sign">
+                        <div class="expert-sign-img">
+                            <el-image v-for="(sign, key) in expertSign" :key="key" 
+                                style="width: 300px; height: 200px" 
+                                :src="sign.url" fit="fill"></el-image>
+                        </div>
+                        <file-upload-json @input="handleUploadUpdate" :limit="1" :value="fjAnnex.uploadFiles" :file-size="5"
+                            :file-type="['png', 'jpg']" />
+                    </div>
+                </template>
+
                 <template v-if="basicDetail.jShState == 1 || basicDetail.jShState == 2">
                     <el-form style="margin-top: 20px" label-width="80px">
                         <el-form-item label="审核意见">
@@ -76,7 +90,7 @@
 
 <script>
 import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
-import { expertExamine } from "@/api/system/expert";
+import { expertExamine, updateExpertInfo } from "@/api/system/expert";
 import moment from "moment";
 
 export default {
@@ -119,7 +133,14 @@ export default {
                 name: '其他证明材料',
                 type: 'jOther',
                 fileList: []
-            }]
+            }],
+
+            // 专家签名
+            expertSign: [],
+            fjAnnex: {
+                filesLength: 0,
+                uploadFiles: [],
+            },
         }
     },
 
@@ -136,6 +157,8 @@ export default {
             jBankPhoto: this.basicDetail.jBankPhoto ? JSON.parse(this.basicDetail.jBankPhoto) : [],
             jOther: this.basicDetail.jOther ? JSON.parse(this.basicDetail.jOther) : []
         }
+        this.expertSign = this.basicDetail.jSign ? JSON.parse(this.basicDetail.jSign) : []
+        this.fjAnnex.uploadFiles = this.expertSign;
         this.bsExpertRecordList = this.basicDetail.bsExpertRecordList || []
     },
 
@@ -143,6 +166,26 @@ export default {
         moment,
         checkRole,
 
+        /** 上传组件数据更新 */
+        handleUploadUpdate(fileList) {
+            this.expertSign = fileList
+            this.fjAnnex.uploadFiles = fileList;
+            this.fjAnnex.filesLength = fileList.length;
+
+            updateExpertInfo({
+                jid: this.basicDetail.jid,
+                jSign: JSON.stringify(this.fjAnnex.uploadFiles)
+            })
+            .then(res => {
+                if (res.code == 200) {
+                    this.$message.success("保存成功！")
+                    this.$emit('updateInfo')
+                } else {
+                    this.$message.error(res.msg)
+                }
+            })
+        },
+
         submitApproval(state) {
             if (state == 0 && this.approvalForm.recordOpinion == '') { // 驳回
                 this.$message({
@@ -170,3 +213,15 @@ export default {
     }
 }
 </script>
+
+<style lang="scss" scoped>
+.expert-sign {
+    width: 1000px;
+}
+.expert-sign-img {
+    width: 300px;
+    height: 200px;
+    border: 1px solid #dcdfe6;
+    margin-bottom: 12px;
+}
+</style>

ruoyi-ui/src/views/expert/tender/components/excelContent.vue

@@ -371,9 +371,8 @@ export default {
         this.$message.error('提交失败');
       }).finally(() => {
         this.fullscreenLoading = false;
+        this.$tab.closePage();
       });
-
-      this.$tab.closePage();
     },
 
     handleDownloadExamine() {