Merge remote-tracking branch 'origin/master'

bidding-ui/src/views/bidnoticedetail.vue

@@ -44,7 +44,9 @@
         &nbsp;&nbsp; ( 汇款时必须注明：保证金 <strong>{{ detail.sCode }}</strong> )
       </el-descriptions-item>
       <el-descriptions-item label="投标保证金递交方式" :span="3"  v-if="detail.fjType == 1">
-        投标保证金必须从投标人基本账户转出至代理公司规定的保证金专用账户，且投标保证金的付款人名称、账户信息等与投标人名称、基本账户信息必须一致
+        投标保证金必须从投标人基本账户转出至代理公司规定的保证金专用账户，且投标保证金的付款人名称、账户信息等与投标人名称、基本账户信息必须一致。
+        <br />
+        <strong><span style="color: red">* </span>由于使用借方卡号或单位结算卡号打款，导致系统无法自动审核的情况，我方不予处理。</strong>
       </el-descriptions-item>
     </el-descriptions>
 

bidding-ui/src/views/mine/tenderDetail.vue

@@ -52,7 +52,9 @@
         &nbsp;&nbsp; ( 汇款时必须注明：保证金 <strong>{{ detail.aCode }}</strong> )
       </el-descriptions-item>
       <el-descriptions-item label="投标保证金递交方式" :span="3">
-        投标保证金必须从投标人基本账户转出至代理公司规定的保证金专用账户，且投标保证金的付款人名称、账户信息等与投标人名称、基本账户信息必须一致
+        投标保证金必须从投标人基本账户转出至代理公司规定的保证金专用账户，且投标保证金的付款人名称、账户信息等与投标人名称、基本账户信息必须一致。
+        <br />
+        <strong><span style="color: red">* </span>由于使用借方卡号或单位结算卡号打款，导致系统无法自动审核的情况，我方不予处理。</strong>
       </el-descriptions-item>
     </el-descriptions>
     <h4 style="margin: 20px 0;">公告内容</h4>

ruoyi-ui/src/views/expert/ewh/components/fuijanTable.vue

@@ -21,8 +21,8 @@
         <el-dialog title="附件管理" :visible.sync="dialogFormVisible">
             <el-form :model="fujianForm">
                 <el-form-item label="附件" prop="fjAnnex">
-                    <file-upload-json @input="handleUploadUpdate" :limit="4" :value="fjAnnex.uploadFiles" :file-size="500"
-                        :file-type="['doc', 'docx', 'xls', 'xlsx', 'ppt', 'txt', 'pdf', 'rar', 'png', 'jpg']" />
+                    <file-upload-json @input="handleUploadUpdate" :limit="4" :value="fjAnnex.uploadFiles" :file-size="5"
+                        :file-type="['pdf', 'png', 'jpg']" />
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -91,9 +91,28 @@ export default {
 
     methods: {
         handleShowFile(type) {
-            this.dialogFormVisible = true
-            this.fjAnnex.uploadFiles = this.totalFjData[type]
-            this.fujianForm.type = type
+            if (this.jShState != 0) {
+                this.$confirm('修改信息需通过审核，审核期间将暂时无法进行相关业务操作。是否确认提交修改？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                })
+                .then(res => {
+                    this.dialogFormVisible = true
+                    this.fjAnnex.uploadFiles = this.totalFjData[type]
+                    this.fujianForm.type = type
+                })
+                .catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消'
+                    });          
+                });
+            } else {
+                this.dialogFormVisible = true
+                this.fjAnnex.uploadFiles = this.totalFjData[type]
+                this.fujianForm.type = type
+            }
         },
         
         /** 上传组件数据更新 */
@@ -110,11 +129,13 @@ export default {
             
             updateExpertInfo({
                 jid: this.totalFjData.jid,
+                jShState: 0,
                 ...file
             })
             .then(res => {
                 if (res.code == 200) {
                     this.$message.success("保存成功！")
+                    this.$emit('updateInfo')
                 } else {
                     this.$message.error(res.msg)
                 }

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

@@ -58,7 +58,7 @@
                     </el-form>
                     <el-row style="text-align: center">
                         <el-button v-if="checkRole(['centerAdjunct'])" @click="submitApproval(2)" type="primary">通过</el-button>
-                        <el-button v-if="checkRole(['operate'])" @click="submitApproval(3)" type="primary">通过</el-button>
+                        <el-button v-if="checkRole(['operate', 'commander'])" @click="submitApproval(3)" type="primary">通过</el-button>
                         <el-button @click="submitApproval(0)" type="danger">驳回</el-button>
                     </el-row>
                 </template>

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

@@ -1,5 +1,9 @@
 <template>
     <div class="export-info" style="padding: 20px;">
+        <el-alert v-if="jShState == 0" title="待提交审核/已驳回" type="info" center></el-alert>
+        <el-alert v-if="jShState == 1 || jShState == 2" title="审核中" type="warning" center></el-alert>
+        <el-alert v-if="jShState == 3" title="审核通过" type="success" center></el-alert>
+
         <el-tabs v-model="tabActiveName">
             <el-tab-pane label="基本资料" name="first">
                 <el-form ref="exportForm" :model="form" :rules="rules" label-width="160px">
@@ -150,7 +154,7 @@
                 </template>
             </el-tab-pane>
             <el-tab-pane label="扫描件管理" name="second" :lazy="true">
-                <fujianTable :exportFujianData="exportFujianData" :jShState="jShState"></fujianTable>
+                <fujianTable :exportFujianData="exportFujianData" :jShState="jShState" @updateInfo="handleUpdateInfo"></fujianTable>
             </el-tab-pane>
             <el-tab-pane label="审批进度" name="third">
                 <el-table :data="bsExpertRecordList" border style="width: 100%">
@@ -264,6 +268,10 @@ export default {
     },
     
     methods: {
+        handleUpdateInfo() {
+            this.handleGetExpertInfo()
+        },
+
         // 提交审核
         submitReview(formName) {
             if (this.exportFujianData.jIdentityPhoto.length < 1 ||
@@ -365,12 +373,35 @@ export default {
 
         // 修改专家信息
         handleSetExpertInfo(formName) {
+            if (this.jShState != 0) { // 0为已驳回/待提交
+                this.$confirm('修改信息需通过审核，审核期间将暂时无法进行相关业务操作。是否确认提交修改？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                })
+                .then(res => {
+                    this.submitSaveInfo(formName)
+                })
+                .catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消'
+                    });          
+                });
+            } else {
+                this.submitSaveInfo(formName)
+            }
+        },
+
+        // 提交信息
+        submitSaveInfo(formName) {
             const form = this.form;
             this.$refs[formName].validate((valid) => {
                 if (valid) {
                     updateExpertInfo({
                         ...form,
-                        jMain: JSON.stringify(form.jMain)
+                        jMain: JSON.stringify(form.jMain),
+                        jShState: 0
                     })
                     .then(res => {
                         if (res.code == 200) {

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

@@ -4,12 +4,12 @@
             <el-form-item label="专家姓名" prop="jName">
                 <el-input v-model="queryParams.jName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="审核状态" prop="jShState" label-width="120px">
+            <!-- <el-form-item label="审核状态" prop="jShState" label-width="120px">
                 <el-select v-model="queryParams.jShState" placeholder="请输入专家审核状态" @keyup.enter.native="handleQuery">
                     <el-option v-for="(dict, key) in dict.type.bs_expert_status" :key="key" :label="dict.label"
                         :value="dict.value"></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -46,7 +46,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <el-button v-if="scope.row.jShState == 3 || (checkRole(['centerAdjunct']) && scope.row.jShState == 1) || (checkRole(['operate']) && scope.row.jShState == 2)" 
+                    <el-button v-if="scope.row.jShState == 3 || (checkRole(['centerAdjunct']) && scope.row.jShState == 1) || (checkRole(['operate', 'commander']) && scope.row.jShState == 2)" 
                         @click="turnExpertDetail(scope.row)" size="small" type="primary">查看</el-button>
                     <el-popconfirm :title="`确定要删除专家【${scope.row.jName}】吗？`" @confirm="handleDelete(scope.row.jid)">
                         <el-button v-if="scope.row.jShState == 3" size="small" slot="reference" 
@@ -114,7 +114,8 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
-            this.resetForm("queryForm");
+            this.queryParams.pageNum = 1;
+            this.queryParams.jName = '';
             this.handleQuery();
         },