From f0ec68d7ea6453c6c947e4098a51ee44abfff82b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 11 Nov 2022 15:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=94=B6=E6=AC=BE=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acknowledgementReceipt.vue                |  92 +++---
 .../acknowledgementReceiptAdd.vue             | 278 ++++++++----------
 2 files changed, 182 insertions(+), 188 deletions(-)

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 ccbd845e5e..02f0fafa48 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
@@ -1,17 +1,11 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <div class="tab-header webtop">
-        <div>收款确认管理</div>
-        <div>
-          <el-button type="primary" size="small" @click="handleCreate()">新增</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-        </div>
-      </div>
-      <div class="webcon">
+      <button-bar view-title="收款确认管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-          <div v-show="isSearchShow">
+          <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">
@@ -36,15 +30,15 @@
               <el-row>
                 <el-form-item label="收款日期:" class="searchlist">
                   <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.collectionStartDate" clearable style="width: 160px" type="date" placeholder="开始日期"/>
-                  <div class="line">至</div>
+                  <span style="padding: 0 8px">至</span>
                   <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.collectionEndDate" clearable style="width: 160px" type="date" placeholder="结束日期"/>
                 </el-form-item>
               </el-row>
-              <div class="searchbtns">
-                <el-button type="primary" size="small" @click="handleFilter">查询</el-button>
-                <el-button type="primary" size="small" @click="handReset">重置</el-button>
-              </div>
             </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="handReset">重置</el-button>
+            </div>
           </div>
         </div>
         <div>
@@ -123,6 +117,7 @@
 <script>
 import { listPage, dataDictionary } from '@/api/anruifinmanagement/paymentConfirmation.js'
 import Pagination from '@/components/pagination'
+import ButtonBar from '@/components/ButtonBar'
 import pageye from '@/components/pagination/pageye'
 import acknowledgementReceiptAdd from './acknowledgementReceiptAdd.vue'
 import acknowledgementReceiptInfo from './acknowledgementReceiptInfo.vue'
@@ -132,16 +127,34 @@ export default {
   components: {
     Pagination,
     pageye,
+    ButtonBar,
     acknowledgementReceiptAdd,
     acknowledgementReceiptInfo
   },
   data() {
     return {
+      btndisabled: false,
       isSearchShow: false,
       searchxianshitit: '隐藏查询条件',
       viewState: 1,
       tableKey: 0,
       list: [],
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
       receiptBank_list: [],
       collectionType_list: [],
       subscriptionState_list: [
@@ -170,7 +183,7 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: window.sessionStorage.getItem('staffSid')
+          createBySid: ''
         },
         total: 0
       }
@@ -180,6 +193,9 @@ export default {
     this.getList()
     this.DataDictionary()
   },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
   methods: {
     DataDictionary() {
       dataDictionary({ type: 'receiptBank' }).then((res) => {
@@ -202,6 +218,19 @@ export default {
         this.searchxianshitit = '显示查询条件'
       }
     },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
     // ----------功能打开结束--------
     // 序号
     indexMethod(index) {
@@ -212,6 +241,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.code === '200') {
@@ -222,6 +252,7 @@ export default {
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getList()
     },
     handReset() {
@@ -235,13 +266,13 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: window.sessionStorage.getItem('staffSid')
+          createBySid: ''
         },
         total: 0
       }
       this.getList()
     },
-    handleCreate() {
+    toAdd() {
       this.viewState = 2
       this.$refs['divAdd'].showAdd()
     },
@@ -255,30 +286,13 @@ export default {
     },
     resetState() {
       this.viewState = 1
-      this.handReset()
-    }
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    },
   }
 }
 </script>
 <style scoped>
-.listtop {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
-}
-.tit {
-  margin-bottom: -10px;
-}
-.pagination {
-  margin-bottom: -10px;
-}
-.line {
-  display: inline-block;
-  margin: 0px 15px;
-}
-.searchlist{
-  margin: 10px 0;
-}
 </style>
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 9da3daf793..4a61b4a871 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
@@ -9,9 +9,9 @@
       </div>
     </div>
     <div class="listconadd">
-      <div class="wlInfo"><span>收款确认申请</span></div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" label-width="300px" class="formadd">
-        <el-row>
+      <div class="titwu"><span>收款确认申请</span></div>
+      <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>
           </el-col>
@@ -101,121 +101,129 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-      <div class="tableStyle">
-        <div>
-          <div>
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-row>
-                <el-form-item label="合同编号:">
-                  <el-input v-model="listQuery.contractNo" placeholder="" style="width: 110px" clearable/>
-                </el-form-item>
-                <el-form-item label="客户名称:">
-                  <el-input v-model="listQuery.customerName" placeholder="" style="width: 100px" clearable/>
-                </el-form-item>
-                <el-form-item label="联系电话:">
-                  <el-input v-model="listQuery.customerPhone" placeholder="" style="width: 140px" clearable/>
-                </el-form-item>
-              </el-row>
-              <div class="searchbtns">
-                <el-button type="primary" @click="handleFilter">查询</el-button>
-                <el-button type="primary" @click="handReset">重置</el-button>
+        <el-row>
+          <el-col :span="12">
+            <div>
+              <div>
+                <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+                  <el-form-item label="合同编号:">
+                    <el-input v-model="listQuery.contractNo" placeholder="" style="width: 110px" clearable/>
+                  </el-form-item>
+                  <el-form-item label="客户名称:">
+                    <el-input v-model="listQuery.customerName" placeholder="" style="width: 100px" clearable/>
+                  </el-form-item>
+                  <el-form-item label="联系电话:">
+                    <el-input v-model="listQuery.customerPhone" placeholder="" style="width: 140px" clearable/>
+                  </el-form-item>
+                </el-form>
+                <div style="text-align: center;padding: 5px 0;border: 1px solid #e0e3eb">
+                  <el-button type="primary" size="mini" @click="handleFilter">查询</el-button>
+                  <el-button type="primary" size="mini" @click="handReset">重置</el-button>
+                </div>
               </div>
-            </el-form>
-          </div>
-          <div class="tableTitle">应收未收款款项明细</div>
-          <el-table border :key="overduereceivableKey" style="width: 720px" :data="overduereceivable_list">
-            <el-table-column label="合同编号" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.contractNo }}
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.VIN }}
-              </template>
-            </el-table-column>
-            <el-table-column label="客户名称" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.customerName }}
-              </template>
-            </el-table-column>
-            <el-table-column label="联系电话" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.customerPhone }}
-              </template>
-            </el-table-column>
-            <el-table-column label="应收项目名称" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.receivablesName }}
-              </template>
-            </el-table-column>
-            <el-table-column label="当前应收金额" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.currentReceivableMoney }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="80">
-              <template slot-scope="scope">
-                <el-button type="primary" size="small" @click="handAdd(scope.row)">添加</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div>
-          <div class="balanceStyle">
-            <span style="margin-right: 20px">余额：{{ balance }}</span>
-          </div>
-          <div class="tableTitle">已选应收款项明细</div>
-          <el-table border :key="selectedreceivableKey" style="width: 880px" :data="formobj.finSelectedReceivablesDetaileds">
-            <el-table-column label="操作" align="center" width="70">
-              <template slot-scope="scope">
-                <el-button type="danger" size="small" @click="handDelete(scope.row)">移除</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="合同编号" align="center" width="95">
-              <template slot-scope="scope">
-                {{ scope.row.contractNo }}
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center" width="75">
-              <template slot-scope="scope">
-                {{ scope.row.VIN }}
-              </template>
-            </el-table-column>
-            <el-table-column label="客户名称" align="center" width="80">
-              <template slot-scope="scope">
-                {{ scope.row.customerName }}
-              </template>
-            </el-table-column>
-            <el-table-column label="联系电话" align="center" width="90">
-              <template slot-scope="scope">
-                {{ scope.row.customerPhone }}
-              </template>
-            </el-table-column>
-            <el-table-column label="应收项目名称" align="center" width="105">
-              <template slot-scope="scope">
-                {{ scope.row.receivablesName }}
-              </template>
-            </el-table-column>
-            <el-table-column label="当前应收金额" align="center" width="105">
-              <template slot-scope="scope">
-                {{ scope.row.currentReceivableMoney }}
-              </template>
-            </el-table-column>
-            <el-table-column label="认款金额" align="center" width="95">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.subscriptionMoney" @change="changeSubscriptionMoney" placeholder="" clearable/>
-              </template>
-            </el-table-column>
-            <el-table-column label="认款申请日期" align="center">
-              <template slot-scope="scope">
-                <el-date-picker value-format="yyyy-MM-dd" v-model="scope.row.subscriptionDate" clearable style="width: 140px" type="date" placeholder="请选择"/>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
+              <div class="tableTitle">应收未收款款项明细</div>
+              <el-table border :key="overduereceivableKey" width="100%" :data="overduereceivable_list">
+                <el-table-column fixed label="操作" align="center" width="80">
+                  <template slot-scope="scope">
+                    <el-button type="primary" size="small" @click="handAdd(scope.row)">添加</el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label="合同编号" align="center" width="100">
+                  <template slot-scope="scope">
+                    {{ scope.row.contractNo }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="车架号" align="center" width="200">
+                  <template slot-scope="scope">
+                    {{ scope.row.VIN }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="客户名称" align="center" width="100">
+                  <template slot-scope="scope">
+                    {{ scope.row.customerName }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="联系电话" align="center" width="100">
+                  <template slot-scope="scope">
+                    {{ scope.row.customerPhone }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="应收项目名称" align="center" width="120">
+                  <template slot-scope="scope">
+                    {{ scope.row.receivablesName }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="当前应收金额" align="center" width="120">
+                  <template slot-scope="scope">
+                    {{ scope.row.currentReceivableMoney }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div>
+              <div>
+                <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+                  <el-form-item>
+                  </el-form-item>
+                </el-form>
+                <div style="text-align: right;border-left: 1px solid #e0e3eb;border-left: 1px solid #e0e3eb">
+                  <span>余额:</span><el-input v-model="balance" placeholder="" style="width: 120px" readonly/>
+                </div>
+              </div>
+              <div class="tableTitle">已选应收款项明细</div>
+              <el-table border :key="selectedreceivableKey" width="100%" :data="formobj.finSelectedReceivablesDetaileds">
+                <el-table-column fixed label="操作" align="center" width="70">
+                  <template slot-scope="scope">
+                    <el-button type="danger" size="small" @click="handDelete(scope.row)">移除</el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label="合同编号" align="center" width="95">
+                  <template slot-scope="scope">
+                    {{ scope.row.contractNo }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="车架号" align="center" width="200">
+                  <template slot-scope="scope">
+                    {{ scope.row.VIN }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="客户名称" align="center" width="100">
+                  <template slot-scope="scope">
+                    {{ scope.row.customerName }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="联系电话" align="center" width="90">
+                  <template slot-scope="scope">
+                    {{ scope.row.customerPhone }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="应收项目名称" align="center" width="120">
+                  <template slot-scope="scope">
+                    {{ scope.row.receivablesName }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="当前应收金额" align="center" width="120">
+                  <template slot-scope="scope">
+                    {{ scope.row.currentReceivableMoney }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="认款金额" align="center" width="95">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.subscriptionMoney" @change="changeSubscriptionMoney" placeholder="" clearable/>
+                  </template>
+                </el-table-column>
+                <el-table-column label="认款申请日期" align="center" width="120">
+                  <template slot-scope="scope">
+                    <el-date-picker value-format="yyyy-MM-dd" v-model="scope.row.subscriptionDate" clearable style="width: 140px" type="date" placeholder="请选择"/>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
   </div>
 </template>
@@ -267,7 +275,7 @@ export default {
         customerName: '',
         customerPhone: '',
         sids: [],
-        createBySid: window.sessionStorage.getItem('staffSid')
+        createBySid: ''
       },
       rules: {},
       submitdisabled: false,
@@ -394,6 +402,7 @@ export default {
       this.balance = parseInt(this.balance) - parseInt(resNum)
     },
     getlist() {
+      this.listQuery.createBySid = window.sessionStorage.getItem('userSid')
       listAll(this.listQuery).then((res) => {
         if (res.code === '200') {
           this.overduereceivable_list = res.data
@@ -409,7 +418,7 @@ export default {
         customerName: '',
         customerPhone: '',
         sids: [],
-        createBySid: window.sessionStorage.getItem('staffSid')
+        createBySid: ''
       }
       this.getlist()
     },
@@ -587,31 +596,9 @@ export default {
 </script>
 
 <style scoped>
-.formadd {
-  margin-right: -14px;
-  margin-left: -14px;
-}
-.wlInfo {
-  padding-top: 20px;
-  font-size: 24px;
-  font-weight: bold;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.tableStyle {
-  margin-right: -14px;
-  margin-left: -14px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.tleftb {
-  text-align: right;
-}
 .tableTitle{
   border: 1px solid #e0e3eb;
-  line-height: 45px;
+  line-height: 42px;
   text-align: center;
   font-weight: bold;
   font-size: 18px;
@@ -620,12 +607,5 @@ export default {
   display: flex;
   justify-content: flex-end;
   align-items: center;
-  line-height: 100px;
-}
-/deep/ .tableStyle .tab-header .el-form-item{
-  padding: 0;
-}
-/deep/ .tableStyle .tab-header {
-  margin-bottom: 0;
 }
 </style>