Merge remote-tracking branch 'origin/master'

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/bank/refund/index.vue

@@ -103,7 +103,7 @@
       <el-table-column label="标段名称" align="center" prop="rtnSgtnm" width="120"/>
       <el-table-column label="投标编号" align="center" prop="rtnTdrno" width="150"/>
       <el-table-column label="项目编号" align="center" prop="rtnPrjno" width="100"/>
-      <el-table-column label="项目名称" align="center" prop="rtnPrjnm" width="150"/>
+      <!-- <el-table-column label="项目名称" align="center" prop="rtnPrjnm" width="150"/> -->
       <el-table-column label="退款状态" align="center" prop="rtnRfndst" width="100">
         <template slot-scope="scope">
           <el-tag type="info" v-if="scope.row.rtnRfndst === '5'">退款成功</el-tag>

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,6 +371,7 @@ export default {
         this.$message.error('提交失败');
       }).finally(() => {
         this.fullscreenLoading = false;
+        this.$tab.closePage();
       });
     },
 

ruoyi-ui/src/views/guarantee/defeat/components/custom.vue

@@ -5,7 +5,7 @@
             <el-table-column label="采购公告" align="center" prop="cggg"/>
             <el-table-column label="标段名称" align="center" prop="rtnSgtnm"/>
             <el-table-column label="项目编号" align="center" prop="rtnPrjno"/>
-            <el-table-column label="项目名称" align="center" prop="rtnPrjnm"/>
+            <!-- <el-table-column label="项目名称" align="center" prop="rtnPrjnm"/> -->
             <el-table-column label="退款状态" align="center" prop="rtnRfndst">
                 <template slot-scope="scope">
                     <el-tag type="info" v-if="scope.row.rtnRfndst === '5'">退款成功</el-tag>

ruoyi-ui/src/views/tender/tender1/components/CompEval.vue

@@ -1,7 +1,13 @@
 <template>
   <div>
-    <el-button type="primary" icon="el-icon-download" size="mini" :disabled="canDownload"
+    <el-button type="primary" icon="el-icon-download" size="mini"
       @click="handleDownloadExcel">下载专家评审表</el-button>
+    <!-- <el-button type="primary" icon="el-icon-download" size="mini"
+      @click="testExcel">下载</el-button> -->
+    <div style="margin-left: 12px; display: inline">
+      <el-tag v-if="pingshenState">评审状态：评审已完成</el-tag>
+      <el-tag v-else type="info">评审状态：未评完</el-tag>
+    </div>
 
     <div class="app-container">
       <el-descriptions class="margin-top" title="" :column="2" border>
@@ -127,11 +133,13 @@ export default {
       ZjNames: [],
       yuzhongbiao: [],
 
-      canDownload: true,
       ideas: [],
       examines: [],
       responds: [],
       techs: [],
+
+      // 评审状态
+      pingshenState: false
     };
   },
   created () {
@@ -191,7 +199,7 @@ export default {
       this.sName = data.sName
       this.uKaiPosition = data.uKaiPosition
       this.uKaiTime = data.uKaiTime
-
+      this.pingshenState = data.state;
 
       //所有供应商
       const bidQuotes = data.bidQuotes
@@ -423,7 +431,6 @@ export default {
             }
             this.totalScore = data
             this.ZjNames = ZjNames
-            this.canDownload = false
           }
         })
     },
@@ -450,7 +457,6 @@ export default {
           }
           this.totalScore = data
           this.ZjNames = ZjNames
-          this.canDownload = false
         }
       })
     },

ruoyi-ui/src/views/winfile/components/CompWinFile.vue

@@ -124,6 +124,11 @@
           <el-form-item label="供货地点" prop="gongAdress">
             <el-input v-model="formCreate.gongAdress"></el-input>
           </el-form-item>
+          <el-form-item label="落款时间" prop="luokuanTime">
+            <template>
+              <span>{{ formCreate.luokuanTime }}</span>
+            </template>
+          </el-form-item>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -140,8 +145,8 @@ import htmlDocx from 'html-docx-js/dist/html-docx';
 import moment from "moment";
 import { fileList, addFile, updateFile } from "@/api/system/winfile";
 import CompSearchWinner from './CompSearchWinner.vue'
-
 import { checkRole } from "@/utils/permission";
+
 export default {
   name: "CompWinFile",
   dicts: ["winflie_status"],
@@ -203,7 +208,8 @@ export default {
         loading: false,
       },
       formCreate: {
-        hName: ''
+        hName: '',
+        luokuanTime: ''
       }
     };
   },
@@ -243,9 +249,6 @@ export default {
       this.getList();
     },
 
-
-
-
     // 表单重置
     resetForm () {
       this.form.bid = null
@@ -284,11 +287,13 @@ export default {
       this.form.hName = null;
       this.dialogSelectedWinner.visible = true;
     },
-    handleSelectedWinner (row) {
+    handleSelectedWinner(row) {
       this.form.wid = row.wid;
       this.form.hName = row.hName;
 
-      this.formCreate = row
+      this.formCreate = row;
+      const uKaiTime = moment(row.uKaiTime);
+      this.formCreate.luokuanTime = uKaiTime.add(2, 'days').format("YYYY-MM-DD");
       this.dialogSelectedWinner.visible = false;
     },
     handleUploadUpdate (fileList) {
@@ -451,7 +456,7 @@ export default {
             供货地点<span style="text-decoration: underline;">${fileData.gongAdress}</span>。</p>`
       content += `<p style="text-indent: 42px;line-height:38px">接到本通知后，请与<span style="text-decoration: underline;">${fileData.sUnit}</span>联系，并于30日内按照采购需求内容签订书面合同。</p>`;
       content += `<p style="width: 100%;text-align: right">采购代理机构:黑龙江省国辰工程项目管理有限责任公司</p>`
-      content += `<p style="width: 100%;text-align: right">${moment().format("YYYY-MM-DD")}</p></div>`
+      content += `<p style="width: 100%;text-align: right">${fileData.luokuanTime}</p></div>`
       let blob = htmlDocx.asBlob(content);
 
       saveAs(blob, `${fileData.hName}成交通知书.docx`);