From a294e8f06623f87713c03fcbb781b3be3617bd0f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 8 Dec 2022 09:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=BE=E9=A1=B9=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4--=E6=94=B6=E6=AC=BE=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anruifinmanagement/paymentConfirmation.js |  10 +-
 .../src/api/jichuxinxi/dictcommons.js         |   9 +
 .../acknowledgementReceipt.vue                |  70 ++++--
 .../acknowledgementReceiptAdd.vue             | 200 ++++++++++++------
 .../acknowledgementReceiptInfo.vue            |  93 +++++---
 .../cashierConfirmationInfo.vue               |   4 +-
 6 files changed, 267 insertions(+), 119 deletions(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js
index 314817d8ef..8fd7c82925 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js
+++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js
@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-import qs from 'querystring'
 
 // 收款确认管理和出纳款项管理分页列表条件查询
 export function listPage(data) {
@@ -24,11 +23,11 @@ export function listAll(data) {
   })
 }
 
-// 收款确认管理h和出纳款项确认管理--回显、详情
-export function fetchBySid(data) {
+// 收款确认管理和出纳款项确认管理--回显、详情
+export function fetchDetailBySid(data) {
   return request({
     url: '/fin/fincollectionconfirmation/fetchBySid/' + data,
-    method: 'get',
+    method: 'get'
   })
 }
 
@@ -111,7 +110,8 @@ export function dataDictionary(data) {
 // 上传文件
 export function upload(data) {
   return request({
-    url: '/fin/file/upload',data,
+    url: '/fin/file/upload',
+    data,
     method: 'post',
     headers: {
       'Content-Type': 'multipart/form-data'
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
index 987b79bcd2..bfc96fa673 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
+++ b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
@@ -64,6 +64,15 @@ export function selectAccountByUseOrgSid(data) {
   })
 }
 
+// 根据用户sid获取本分公司下的银行账号
+export function selAccountByOrgSid(data) {
+  return request({
+    url: '/fin/v1/finmanufacturerbank/selAccountByOrgSid',
+    method: 'get',
+    params: data
+  })
+}
+
 // 获取厂家回款通路
 export function selectNameByOrg(data) {
   return request({
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
index f2ff190c8e..c0bcbf0a42 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
@@ -8,7 +8,7 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-row>
-                <el-form-item label="付款方名称:" class="searchlist">
+                <el-form-item label="付款方:" class="searchlist">
                   <el-input v-model="listQuery.params.payerName" placeholder="" clearable/>
                 </el-form-item>
                 <el-form-item label="收款方式:" class="searchlist">
@@ -17,9 +17,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="收款银行:" class="searchlist">
-                  <el-select v-model="listQuery.params.collectionBank" placeholder="请选择" style="width: 300px" filterable clearable>
-                    <el-option v-for="item in receiptBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                  </el-select>
+                  <el-input v-model="listQuery.params.collectionBank" placeholder="" clearable/>
                 </el-form-item>
                 <el-form-item label="认款状态:" class="searchlist">
                   <el-select v-model="listQuery.params.subscriptionState" placeholder="请选择" filterable clearable>
@@ -48,54 +46,84 @@
           </div>
           <div class="">
             <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
-              <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-              <el-table-column label="操作" align="center" width="180px">
+              <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+              <el-table-column fixed label="操作" align="center" width="180">
                 <template slot-scope="scope">
-                  <el-button type="primary" :disabled="!scope.row.showHandle" size="small" @click="handUpdate(scope.row)">认款</el-button>
-                  <el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button>
+                  <el-button type="primary" :disabled="!scope.row.showHandle" size="mini" @click="handUpdate(scope.row)">认款</el-button>
+                  <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
                 </template>
               </el-table-column>
-              <el-table-column label="审核状态" align="center">
+              <el-table-column label="审核状态" align="center" width="120">
                 <template slot-scope="scope">
                   <span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '其他' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="认款状态" align="center">
+              <el-table-column label="认款状态" align="center" width="120">
                 <template slot-scope="scope">
                   <span>{{ scope.row.subscriptionState == 1 ? '未认款' : scope.row.subscriptionState == 2 ? '部分认款' : scope.row.subscriptionState == 3 ? '已认款' : '其他' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款日期" align="center">
+              <el-table-column label="申请部门" align="center" width="150">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.collectionDate }}</span>
+                  <span>{{ scope.row.createDept }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款银行" align="center">
+              <el-table-column label="申请人" align="center" width="130">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.collectionBank }}</span>
+                  <span>{{ scope.row.createByName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款银行账号" align="center">
+              <el-table-column label="申请日期" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.createDate }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="收款银行账号" align="center" width="200">
                 <template slot-scope="scope">
                   <span>{{ scope.row.collectionBankNum }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款方式" align="center">
+              <el-table-column label="收款银行名称" align="center" width="200">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.collectionTypeValue }}</span>
+                  <span>{{ scope.row.receivingName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="收款金额" align="center">
+              <el-table-column label="收款银行" align="center" width="200">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.collectionBank }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="收款金额" align="center" width="200">
                 <template slot-scope="scope">
                   <span>{{ scope.row.collectionMoney }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="付款方名称" align="center">
+              <el-table-column label="收款日期" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.collectionDate }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="收款方式" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.collectionTypeValue }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="付款方" align="center" width="150">
                 <template slot-scope="scope">
                   <span>{{ scope.row.payerName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="备注" align="center">
+              <el-table-column label="付款账号后4位" align="center" width="200">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.payAccount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="付款银行" align="center" width="200">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.payBank }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="备注" align="center" width="300">
                 <template slot-scope="scope">
                   <span>{{ scope.row.remarks }}</span>
                 </template>
@@ -204,7 +232,7 @@ export default {
           this.receiptBank_list = res.data
         }
       })
-      dataDictionary({ type: 'receiptType' }).then((res) => {
+      dataDictionary({ type: 'customerPayType' }).then((res) => {
         if (res.code === '200') {
           this.collectionType_list = res.data
         }
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
index 51af126a8b..9559179988 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
@@ -13,59 +13,109 @@
       <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
         <el-row style="border-top: 1px solid #e0e3eb">
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款日期</span></el-form-item>
+            <span>申请部门</span>
           </el-col>
-          <el-col :span="4" class="trightb">
+          <el-col :span="4">
             <el-form-item>
-              <el-date-picker value-format="yyyy-MM-dd" v-model="formobj.collectionDate" :disabled="forbidden" clearable type="date" style="width: 93%" placeholder="请选择"/>
+              <span>{{ formobj.createDept }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款银行</span></el-form-item>
+            <span>申请人</span>
           </el-col>
-          <el-col :span="4" class="trightb">
+          <el-col :span="4">
             <el-form-item>
-              <el-select v-model="formobj.collectionBank" :disabled="forbidden" placeholder="请选择" @change="changeCollectionBank" filterable clearable>
-                <el-option v-for="item in receiptBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
+              <span>{{ formobj.createByName }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款银行账号</span></el-form-item>
+            <span>申请日期</span>
           </el-col>
-          <el-col :span="4" class="trightb">
+          <el-col :span="4">
             <el-form-item>
+              <span>{{ formobj.createDate }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span><span class="icon">*</span>收款银行账号</span>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item prop="collectionBankNum">
               <el-select v-model="formobj.collectionBankNum" placeholder="请选择" :disabled="forbidden" @change="changeCollectionBankNum" filterable clearable>
-                <el-option v-for="item in collectionBankNum_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                <el-option v-for="item in collectionBankNum_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>收款银行名称</span>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item>
+              <span>{{ formobj.receivingName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span><span class="icon">*</span>收款银行</span>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item>
+              <span>{{ formobj.collectionBank }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款方式</span></el-form-item>
+            <span><span class="icon">*</span>收款金额(元)</span>
           </el-col>
           <el-col :span="4" class="trightb">
-            <el-form-item>
+            <el-form-item prop="collectionMoney">
+              <el-input v-model="formobj.collectionMoney" @keyup.native="UpNumber" @keydown.native="UpNumber" :disabled="forbidden" @change="changeCollectionMoney" placeholder="" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span><span class="icon">*</span>收款日期</span>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item prop="collectionDate">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="formobj.collectionDate" :disabled="forbidden" clearable type="date" style="width: 93%" placeholder="请选择"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span><span class="icon">*</span>收款方式</span>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item prop="collectionTypeValue">
               <el-select v-model="formobj.collectionTypeValue" placeholder="请选择" :disabled="forbidden" @change="changeCollectionType" filterable clearable>
                 <el-option v-for="item in receiptType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>付款方名称</span></el-form-item>
+            <span><span class="icon">*</span>付款方</span>
           </el-col>
           <el-col :span="4" class="trightb">
-            <el-form-item>
+            <el-form-item prop="payerName">
               <el-input v-model="formobj.payerName" :disabled="forbidden" placeholder="" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款金额</span></el-form-item>
+            <span><span class="icon">*</span>付款账号后4位</span>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item prop="payAccount">
+              <el-input v-model="formobj.payAccount" :disabled="forbidden" placeholder="" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <el-form-item><span>付款银行</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>
-              <el-input v-model="formobj.collectionMoney" @keyup.native="UpNumber" @keydown.native="UpNumber" :disabled="forbidden" @change="changeCollectionMoney" placeholder="" clearable/>
+              <el-input v-model="formobj.payBank" :disabled="forbidden" placeholder="" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -234,8 +284,9 @@
 </template>
 
 <script>
-import { save, dataDictionary, listAll, fetchBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
+import { save, dataDictionary, listAll, fetchDetailBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
 import Upload from '@/components/uploadFile/filesUpload' // 上传文件
+import { getPathSidByUserSid, fetchBySid, selAccountByOrgSid } from '@/api/jichuxinxi/dictcommons'
 
 export default {
   name: 'acknowledgementReceiptAdd',
@@ -256,8 +307,10 @@ export default {
       list2: [],
       formobj: {
         sid: '',
-        createByName: window.sessionStorage.getItem('name'),
-        staffSid: window.sessionStorage.getItem('staffSid'),
+        createDept: '',
+        createDate: '',
+        createByName: '',
+        staffSid: '',
         collectionDate: '',
         collectionBank: '',
         collectionBankKey: '',
@@ -272,6 +325,10 @@ export default {
         balance: '',
         useOrgSid: '',
         userSid: '',
+        receivingName: '',
+        payBank: '',
+        payAccount: '',
+        accountSid: '',
         finSelectedReceivablesDetaileds: [],
         paymentVoucherAppendixs: [],
         remittanceConfirmationAppendixs: []
@@ -283,15 +340,18 @@ export default {
         sids: [],
         createBySid: ''
       },
-      rules: {},
+      rules: {
+        collectionBankNum: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }],
+        collectionMoney: [{ required: true, message: '收款金额不能为空', trigger: 'blur' }],
+        collectionDate: [{ required: true, message: '收款日期不能为空', trigger: 'change' }],
+        collectionTypeValue: [{ required: true, message: '收款方式不能为空', trigger: 'change' }],
+        payerName: [{ required: true, message: '付款方不能为空', trigger: 'blur' }],
+        payAccount: [{ required: true, message: '付款账号不能为空', trigger: 'blur' }]
+      },
       submitdisabled: false,
       balance: '' // 余额
     }
   },
-  created() {
-    this.DataDictionary()
-    this.newDate()
-  },
   methods: {
     // 获取制单日期
     newDate() {
@@ -305,6 +365,7 @@ export default {
       if (day < 10) {
         day = '0' + day
       }
+      this.formobj.createDate = year + '-' + month + '-' + day
       this.formobj.collectionDate = year + '-' + month + '-' + day
     },
     UpNumber(e) {
@@ -317,51 +378,47 @@ export default {
       }
     },
     DataDictionary() {
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+        if (resp.success) {
+          fetchBySid(resp.data).then((res) => {
+            if (res.success) {
+              this.formobj.createDept = res.data.name
+            }
+          })
+        }
+      })
       dataDictionary({ type: 'receiptBank' }).then((res) => {
         if (res.code === '200') {
           this.receiptBank_list = res.data
         }
       })
-      dataDictionary({ type: 'receiptType' }).then((res) => {
+      dataDictionary({ type: 'customerPayType' }).then((res) => {
         if (res.code === '200') {
           this.receiptType_list = res.data
         }
       })
-    },
-    collectionBankNum(sid) {
-      dataDictionary({ type: 'receiptAccount', psid: sid }).then((res) => {
-        if (res.code === '200') {
-          this.collectionBankNum_list = res.data
-        }
-      })
-    },
-    changeCollectionBank(value) {
-      let aa = null
-      this.receiptBank_list.forEach((e) => {
-        if (e.dictKey === value) {
-          aa = {
-            name: e.dictValue,
-            value: e.dictKey,
-            sid: e.sid
-          }
+      selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: '' }).then((resp) => {
+        if (resp.success) {
+          this.collectionBankNum_list = resp.data
         }
       })
-      this.formobj.collectionBank = aa.name
-      this.formobj.collectionBankKey = aa.value
-      this.collectionBankNum(aa.sid)
     },
     changeCollectionBankNum(value) {
       let aa = null
       this.collectionBankNum_list.forEach((e) => {
-        if (e.dictKey === value) {
+        if (e.bankAccount === value) {
           aa = {
-            name: e.dictValue,
-            value: e.dictKey
+            accountSid: e.accountSid,
+            accountName: e.accountName,
+            depositBank: e.depositBank,
+            bankAccount: e.bankAccount
           }
         }
       })
-      this.formobj.collectionBankNum = aa.name
-      this.formobj.collectionBankNumKey = aa.value
+      this.formobj.accountSid = aa.accountSid
+      this.formobj.collectionBankNum = aa.bankAccount
+      this.formobj.receivingName = aa.accountName
+      this.formobj.collectionBank = aa.depositBank
     },
     changeCollectionType(value) {
       let aa = null
@@ -444,12 +501,20 @@ export default {
       this.getlist()
     },
     showAdd() {
+      this.DataDictionary()
+      this.newDate()
       this.viewTitle = '【新建】收款确认申请'
+      this.formobj.createByName = window.sessionStorage.getItem('name')
+      this.formobj.staffSid = window.sessionStorage.getItem('staffSid')
       this.getlist()
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
     },
     showEdit(row) {
+      this.DataDictionary()
       this.viewTitle = '【编辑】收款确认申请'
-      fetchBySid(row.sid).then(resp => {
+      fetchDetailBySid(row.sid).then(resp => {
         if (resp.code === '200') {
           this.formobj = resp.data
           this.balance = this.formobj.balance
@@ -475,6 +540,7 @@ export default {
           this.$nextTick(() => {
             this.$refs['remit'].show(this.list1)
             this.$refs['remittance'].show(this.list2)
+            this.$refs['form_obj'].clearValidate()
           })
         }
       }).catch(e => {
@@ -556,7 +622,6 @@ export default {
       this.getlist()
     },
     submit() {
-      this.submitdisabled = true
       if (this.formobj.paymentVoucherAppendixs.length > 0) {
         var paymentVoucherUrl_list = []
         for (var i = 0; i < this.formobj.paymentVoucherAppendixs.length; i++) {
@@ -572,22 +637,28 @@ export default {
         this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',')
       }
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
-      save(this.formobj).then(resp => {
-        this.submitdisabled = false
-        if (resp.code === '200') {
-          this.$message({ showClose: true, type: 'success', message: resp.msg })
-          this.handleReturn('true')
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          save(this.formobj).then((resp) => {
+            if (resp.success) {
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
         }
-      }).catch(() => {
-        this.submitdisabled = false
       })
     },
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {
         sid: '',
-        createByName: window.sessionStorage.getItem('name'),
-        staffSid: window.sessionStorage.getItem('staffSid'),
+        createDept: '',
+        createDate: '',
+        createByName: '',
+        staffSid: '',
         collectionDate: '',
         collectionBank: '',
         collectionBankKey: '',
@@ -602,6 +673,10 @@ export default {
         balance: '',
         useOrgSid: '',
         userSid: '',
+        receivingName: '',
+        payBank: '',
+        payAccount: '',
+        accountSid: '',
         finSelectedReceivablesDetaileds: [],
         paymentVoucherAppendixs: [],
         remittanceConfirmationAppendixs: []
@@ -621,6 +696,7 @@ export default {
         this.$refs['remittance'].show(this.list2)
       })
       this.balance = ''
+      this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }
   }
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
index b80de1af43..bd46140ef1 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
@@ -7,35 +7,77 @@
       </div>
     </div>
     <div class="listconadd">
-      <div class="wlInfo"><span>收款确认申请</span></div>
+      <div class="titwu"><span>收款确认申请</span></div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" label-width="300px" class="formadd">
+        <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>申请部门</span>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item>
+              <span>{{ formobj.createDept }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>申请人</span>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item>
+              <span>{{ formobj.createByName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>申请日期</span>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item>
+              <span>{{ formobj.createDate }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款日期</span></el-form-item>
+            <el-form-item><span>收款银行账号</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>
-              {{ formobj.collectionDate }}
+              {{ formobj.collectionBankNum }}
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款银行</span></el-form-item>
+            <el-form-item><span>收款银行名称</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>
-              {{ formobj.collectionBank }}
+              {{ formobj.receivingName }}
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款银行账号</span></el-form-item>
+            <el-form-item><span>收款银行</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>
-              {{ formobj.collectionBankNum }}
+              {{ formobj.collectionBank }}
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="4" class="tleftb">
+            <el-form-item><span>收款金额(元)</span></el-form-item>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item>
+              {{ formobj.collectionMoney }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <el-form-item><span>收款日期</span></el-form-item>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item>
+              {{ formobj.collectionDate }}
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="tleftb">
             <el-form-item><span>收款方式</span></el-form-item>
           </el-col>
@@ -44,8 +86,10 @@
               {{ formobj.collectionTypeValue }}
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>付款方名称</span></el-form-item>
+            <el-form-item><span>付款方</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>
@@ -53,11 +97,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
-            <el-form-item><span>收款金额</span></el-form-item>
+            <el-form-item><span>付款账号后4位</span></el-form-item>
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item>
-              {{ formobj.collectionMoney }}
+              {{ formobj.payAccount }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <el-form-item><span>付款银行</span></el-form-item>
+          </el-col>
+          <el-col :span="4" class="trightb">
+            <el-form-item>
+              {{ formobj.payBank }}
             </el-form-item>
           </el-col>
         </el-row>
@@ -166,7 +218,7 @@
 </template>
 
 <script>
-import { fetchBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
+import { fetchDetailBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
 
 export default {
   name: 'acknowledgementReceiptInfo',
@@ -183,7 +235,7 @@ export default {
   methods: {
     showInfo(row) {
       this.viewTitle = '认款详情'
-      fetchBySid(row.sid).then(resp => {
+      fetchDetailBySid(row.sid).then(resp => {
         if (resp.code === '200') {
           this.formobj = resp.data
           if (this.formobj.paymentVoucherAppendixs.length > 0) {
@@ -218,21 +270,4 @@ export default {
 </script>
 
 <style scoped>
-.wlInfo {
-  padding-top: 20px;
-  font-size: 24px;
-  font-weight: bold;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.tleftb {
-  text-align: right;
-}
-.listadd {
-  width: 100%;
-  height: calc(100vh - 0px);
-  overflow-y: auto;
-  overflow-x: hidden;
-}
 </style>
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
index 214303a3fe..e0ad95383b 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
@@ -168,7 +168,7 @@
 </template>
 
 <script>
-import { fetchBySid, cashierConfirm, cashierReject } from '@/api/anruifinmanagement/paymentConfirmation.js'
+import { fetchDetailBySid, cashierConfirm, cashierReject } from '@/api/anruifinmanagement/paymentConfirmation.js'
 
 export default {
   name: 'cashierConfitmationInfo',
@@ -189,7 +189,7 @@ export default {
       this.viewState = viewState
       this.sid = row.sid
       this.viewTitle = '认款详情'
-      fetchBySid(row.sid).then(resp => {
+      fetchDetailBySid(row.sid).then(resp => {
         if (resp.code === '200') {
           this.formobj = resp.data
           if (this.formobj.paymentVoucherAppendixs.length > 0) {