提交查询退还保证金

ruoyi-ui/src/components/tender/components/CompPurchase.vue

@@ -595,6 +595,11 @@ export default {
     /** 提交审核 */
     handleSubmitApproval () {
       const _this = this;
+      if (!this.dialogDetail.detail.bankAccount) {
+        this.$message.error('请先获取虚拟子账户');
+        return;
+      }
+      
       this.$modal.confirm('是否确认发起审核标题为【' + this.dialogDetail.detail.uTitle + '】的招标公告？').then(function () {
         const formData = {
           uid: _this.dialogDetail.detail.uid,

ruoyi-ui/src/views/guarantee/examine/index.vue

@@ -1,30 +1,24 @@
 <template>
     <div class="app-container">
-      <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-        <el-form-item label="开始时间" prop="enrollStarttime">
-            <el-date-picker
-              v-model="queryParams.enrollStarttime"
-              type="date"
-              placeholder="请输入开始时间">
-            </el-date-picker>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-form-item label="公告标题" prop="title">
+          <el-input v-model.trim="queryParams.title" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="结束时间" prop="enrollEndtime">
-          <el-date-picker
-            v-model="queryParams.enrollEndtime"
-            type="date"
-            placeholder="请输入结束时间">
-          </el-date-picker>
+        <el-form-item label="项目编号" prop="code">
+          <el-input v-model.trim="queryParams.code" placeholder="请输入项目编号" clearable @keyup.enter.native="handleQuery"></el-input>
+        </el-form-item>
+        <el-form-item label="招标项目" prop="projName">
+          <el-input v-model.trim="queryParams.projName" placeholder="请输入招标项目" clearable @keyup.enter.native="handleQuery"></el-input>
+        </el-form-item>
+        <el-form-item label="供应商公司" prop="supplier">
+          <el-input v-model.trim="queryParams.supplier" placeholder="请输入供应商" clearable @keyup.enter.native="handleQuery"></el-input>
         </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>
         </el-form-item>
-      </el-form> -->
-      
-      <!-- <el-row :gutter="10" class="mb8">
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row> -->
+      </el-form>
    
       <el-table v-loading="loading" :data="guaranteeList">
         <el-table-column type="index" label="序号" align="center" />
@@ -48,6 +42,9 @@
           </template>
         </el-table-column>
       </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </div>
   </template>
   
@@ -66,9 +63,14 @@ import { checkRole } from "@/utils/permission";
         // 显示搜索条件
         showSearch: true,
         
+        total: 0,
         queryParams: {
           pageNum: 1,
-          pageSize: 10
+          pageSize: 10,
+          title:"",
+          code:"",
+          projName:"",
+          supplier:""
         },
 
         // 开票列表
@@ -101,6 +103,11 @@ import { checkRole } from "@/utils/permission";
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
+        this.queryParams.supplier = null
+        this.queryParams.projName = null
+        this.queryParams.code = null
+        this.queryParams.title = null
+        
         this.handleQuery();
       },
 

ruoyi-ui/src/views/guarantee/list/components/bank.vue

@@ -1,21 +1,28 @@
 <template>
   <div>
-
     <el-table v-loading="loading" :data="data">
       <el-table-column type="index" label="序号" align="center" />
       <el-table-column label="银行流水号" align="center" prop="rtnSerialno" />
-      <el-table-column label="供应商名称" align="center" prop="rtnOppassetname" />
-      <el-table-column label="供应商银行账号" align="center" prop="rtnOppassetno" />
-      <el-table-column label="供应商开户行" align="center" prop="rtnOppbankname" />
+      <el-table-column label="入账账号" align="center" prop="rtnOppassetno"/>
+			<el-table-column label="入账账户名" align="center" prop="rtnOppassetname"/>
+			<el-table-column label="入账账号行名" align="center" prop="rtnOppbankname"/>
       <el-table-column label="交易日期" align="center" prop="rtnTradedate" />
       <el-table-column label="交易金额" align="center" prop="rtnAmt" />
       <el-table-column label="可退款金额" align="center" prop="rtnSelfbal" />
       <el-table-column label="摘要" align="center" prop="rtnSummary" />
       <el-table-column label="进入不明原因" align="center" prop="rtnAdjustreason" />
+      <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleBackGuarantee(scope.row)"
-            v-hasPermi="['invoice:kaipiao:edit']">退不明保证金</el-button>
+          <el-button
+            v-if="scope.row.status == '未申请退款'"
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleBackGuarantee(scope.row)"
+						v-hasPermi="['bank:uncleardeposit:edit']"
+            :loading="backLoading"
+					>退还保证金</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -49,8 +56,13 @@ export default {
       total: 0,
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        rtnOppassetno: null,
+        rtnOppassetname: null,
+        rtnOppbankno: null
       },
+
+      backLoading: false
     }
   },
 
@@ -74,19 +86,34 @@ export default {
 
     handleQuery (queryParams) {
       this.queryParams.pageNum = 1
-      //   this.queryParams.aCode = queryParams.aCode
-      //   this.queryParams.aName = queryParams.aName
-      //   this.queryParams.projectId = queryParams.projectId
+      this.queryParams.rtnOppassetno = queryParams.rtnOppassetno
+      this.queryParams.rtnOppassetname = queryParams.rtnOppassetname
+      this.queryParams.rtnOppbankno = queryParams.rtnOppbankno
       this.getList()
     },
 
+    // 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.uncleardepositid)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+		},
+
     handleBackGuarantee (row) {
+      this.backLoading = true
       const uncleardepositid = row.uncleardepositid || this.ids
-      getUncleardeposit(uncleardepositid).then(response => {
-        console.log(response);
-        this.$message.success('退不明保证金成功')
-        this.getList()
-      });
+      
+      this.$modal.confirm('是否确认退还保证金入账明细编号为"' + uncleardepositid + '"的数据项？')
+        .then(() => {
+          getUncleardeposit(uncleardepositid).then(response => {
+            this.$message.success('退不明保证金成功')
+            this.getList()
+            this.backLoading = false
+          })
+          .catch(err => {
+            this.backLoading = false
+          })
+      })
     },
 
   }

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

@@ -8,7 +8,7 @@
                     icon="el-icon-delete"
                     size="mini"
                     :disabled="multiple"
-                    @click="handleDelete"
+                    @click="handleBackGuarantee"
                     v-hasPermi="['bank:depositdesc:remove']"
                 >批量退还保证金
                 </el-button>
@@ -18,22 +18,24 @@
             <el-table-column type="selection" width="55" align="center"/>
             <el-table-column type="index" label="序号" align="center" />
             <el-table-column label="银行流水号" align="center" prop="rtnTrnuid" />
-            <el-table-column label="供应商名称" align="center" prop="rtnTdracctnm" />
-            <el-table-column label="供应商银行账号" align="center" prop="rtnTdracctno" />
-            <el-table-column label="供应商开户行" align="center" prop="rtnTdracctnobnknm" />
+            <el-table-column label="入账账户名" align="center" prop="rtnTdracctnm" />
+            <el-table-column label="入账账号" align="center" prop="rtnTdracctno" />
+            <el-table-column label="入账账号行名" align="center" prop="rtnTdracctnobnknm" />
             <el-table-column label="交易日期" align="center" prop="rtnTdrdt" />
             <el-table-column label="交易金额" align="center" prop="rtnMrgnamt" />
-            <!-- <el-table-column label="可退款金额" align="center" prop="rtnSelfbal" /> -->
             <el-table-column label="摘要" align="center" prop="rtnRemark"/>
             <el-table-column label="进入不明原因" align="center" prop="reason"/>
+            <el-table-column label="状态" align="center" prop="status" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
                 <el-button
+                v-if="scope.row.status != '退款成功'"
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
                 @click="handleBackGuarantee(scope.row)"
-                v-hasPermi="['invoice:kaipiao:edit']"
+				v-hasPermi="['bank:depositdesc:remove']"
+                :loading="backLoading"
                 >退不明保证金</el-button>
             </template>
             </el-table-column>
@@ -72,8 +74,13 @@ export default {
             total: 0,
             queryParams: {
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                rtnTdracctnm: null,
+                rtnTdracctno: null,
+                rtnTdracctnobnknm: null
             },
+
+            backLoading: false
         }
     },
 
@@ -89,8 +96,6 @@ export default {
 
             getUnknownBond(this.queryParams).then(response => {
                 this.data = response.rows;
-
-                console.log(this.data);
                 
                 this.total = response.total;
                 this.loading = false;
@@ -99,29 +104,34 @@ export default {
 
         handleQuery (queryParams) {
             this.queryParams.pageNum = 1
-            //   this.queryParams.aCode = queryParams.aCode
-            //   this.queryParams.aName = queryParams.aName
-            //   this.queryParams.projectId = queryParams.projectId
+            this.queryParams.rtnTdracctnm = queryParams.rtnOppassetname
+            this.queryParams.rtnTdracctno = queryParams.rtnOppassetno
+            this.queryParams.rtnTdracctnobnknm = queryParams.rtnOppbankno
             this.getList()
         },
 
         // 多选框选中数据
 		handleSelectionChange(selection) {
-            console.log(selection);
 			this.ids = selection.map(item => item.depositdescid)
 			this.single = selection.length !== 1
 			this.multiple = !selection.length
 		},
 
-        /** 删除按钮操作 */
-		handleDelete(row) {
+        /** 退还保证金 */
+		handleBackGuarantee(row) {
+            this.backLoading = true
 			const depositdescids = row.depositdescid || this.ids;
+
 			this.$modal.confirm('是否确认退还保证金入账明细编号为"' + depositdescids + '"的数据项？')
             .then(() => {
 				delDepositdesc(depositdescids)
                 .then(res => {
                     this.getList();
 				    this.$modal.msgSuccess("成功");
+                    this.backLoading = false
+                })
+                .catch(err => {
+                    this.backLoading = false
                 })
 			})
 		},

ruoyi-ui/src/views/guarantee/list/index.vue

@@ -1,26 +1,36 @@
 <template>
     <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-        <el-form-item label="开始时间" prop="enrollStarttime">
-            <el-date-picker
-              v-model="queryParams.enrollStarttime"
-              type="date"
-              placeholder="请输入开始时间">
-            </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="enrollEndtime">
-          <el-date-picker
-            v-model="queryParams.enrollEndtime"
-            type="date"
-            placeholder="请输入结束时间">
-          </el-date-picker>
-        </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>
-        </el-form-item>
-      </el-form>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+				 label-width="68px">
+			<el-form-item label="入账账号" prop="rtnOppassetno">
+				<el-input
+					v-model="queryParams.rtnOppassetno"
+					placeholder="请输入入账账号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="入账账户名" prop="rtnOppassetname" label-width="120">
+				<el-input
+					v-model="queryParams.rtnOppassetname"
+					placeholder="请输入入账账户名"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="入账账号行号" prop="rtnOppbankno" label-width="120">
+				<el-input
+					v-model="queryParams.rtnOppbankno"
+					placeholder="请输入入账账号行号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</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>
+			</el-form-item>
+		</el-form>
 
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="银行自动不明" name="first">
@@ -66,7 +76,37 @@ import CompCustom from './components/custom.vue'
         
         queryParams: {
           pageNum: 1,
-          pageSize: 10
+          pageSize: 10,
+				  ppid: null,
+          trnuid: null,
+          rqbody: null,
+          acctno: null,
+          ccycd: null,
+          begdt: null,
+          enddt: null,
+          rtnTrnuid: null,
+          rtnStatus: null,
+          rtnCode: null,
+          rtnSeverity: null,
+          rtnMessage: null,
+          rtnRsbody: null,
+          rtnRcrdtotnum: null,
+          rtnCrnpgno: null,
+          rtnPgrcrdnum: null,
+          rtnTotpgnum: null,
+          rtnContent: null,
+          rtnTradedate: null,
+          rtnSerialno: null,
+          rtnAssetno: null,
+          rtnAssetname: null,
+          rtnOppassetno: null,
+          rtnOppassetname: null,
+          rtnOppbankno: null,
+          rtnOppbankname: null,
+          rtnAmt: null,
+          rtnSelfbal: null,
+          rtnSummary: null,
+          rtnAdjustreason: null
         }
       };
     },
@@ -90,12 +130,19 @@ import CompCustom from './components/custom.vue'
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
-        this.getList();
+
+        if (this.activeName == 'first') {
+          this.$refs.refBank.handleQuery(this.queryParams)
+        } else {
+          this.$refs.refCustom.handleQuery(this.queryParams)
+        }
       },
 
       /** 重置按钮操作 */
       resetQuery() {
-        this.resetForm("queryForm");
+        this.queryParams.rtnOppassetno = null
+        this.queryParams.rtnOppassetname = null
+        this.queryParams.rtnOppbankno = null
         this.handleQuery();
       },