From 546ec55486dc598de013812b9a3c9b947b06b798 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 8 Dec 2022 09:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AE=80=E6=98=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/dictcommons/dictcommons.js        |   9 +
 .../xunidingdanFlow/dingjinshouqu.vue         |  65 ++++---
 .../xunidingdanFlow/dingjinshouquEdit.vue     | 158 ++++++++---------
 .../xunidingdanFlow/dingjinshouquInfo.vue     |  73 +++++---
 .../xunidingdan/xunidingjinAdd.vue            | 162 +++++++++---------
 .../xunidingdan/xunidingjininfo.vue           |  73 +++++---
 6 files changed, 297 insertions(+), 243 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
index 4128471010..8dd5c55eb5 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
@@ -28,6 +28,15 @@ export function typeValues(data) {
   })
 }
 
+// 根据用户sid获取本分公司下的银行账号
+export function selAccountByOrgSid(data) {
+  return request({
+    url: '/fin/v1/finmanufacturerbank/selAccountByOrgSid',
+    method: 'get',
+    params: data
+  })
+}
+
 // 品牌下拉
 export function brandDown(data) {
   return request({
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
index 13a6c2ba36..91e8a31278 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
@@ -12,12 +12,7 @@
       <div class="">
         <div class="titwu">销售简易订单</div>
         <el-form ref="dataForm" :model="temp" class="formadd">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colStyle">
-              <span>金额单位: 元</span>
-            </el-col>
-          </el-row>
-          <el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="3" class="tleftb">
               <span>分公司</span>
             </el-col>
@@ -71,17 +66,25 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆台数</span>
+              <span>付款方式</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.carNumber }}</span>
+                <span>{{ temp.payTypeValue }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>订金金额</span>
+              <span>付款日期</span>
             </el-col>
-            <el-col :span="13">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.payDate }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>订金金额(元)</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.deposit }}</span>
               </el-form-item>
@@ -89,29 +92,43 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>付款日期</span>
+              <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payDate }}</span>
+                <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>付款方式</span>
+              <span>开户银行</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payTypeValue }}</span>
+                <span>{{ temp.depositBank }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>付款银行账号</span>
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>车辆台数</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payNumber }}</span>
+                <span>{{ temp.carNumber }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
@@ -122,10 +139,18 @@
                 <span>{{ temp.collectionNumber }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>收款银行名称</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.collectionAccountName }}</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="3" class="tleftb">
               <span>收款银行</span>
             </el-col>
-            <el-col :span="13">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.collectionBank }}</span>
               </el-form-item>
@@ -492,12 +517,6 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.rowStyle {
-  border-left: 0px !important;
-}
-.colStyle {
-  border-right: 0px !important;
-}
 .rowClass{
   border-top: 1px solid #E0E3EB;
 }
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
index f8df25ce4c..62386cebe5 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
@@ -11,12 +11,7 @@
       <div class="">
         <div class="titwu">销售简易订单</div>
         <el-form ref="dataForm" :model="temp" class="formadd" :rules="rules">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colStyle">
-              <span>金额单位: 元</span>
-            </el-col>
-          </el-row>
-          <el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="3" class="tleftb">
               <span>分公司</span>
             </el-col>
@@ -70,17 +65,27 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆台数</span>
+              <span><span class="icon">*</span>付款方式</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
-                <el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/>
+              <el-form-item prop="payType">
+                <el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
+                  <el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>订金金额</span>
+              <span><span class="icon">*</span>付款日期</span>
             </el-col>
-            <el-col :span="13">
+            <el-col :span="5">
+              <el-form-item prop="payDate">
+                <el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>订金金额(元)</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item prop="deposit">
                 <el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -88,53 +93,71 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>付款日期</span>
+              <span v-show="temp.payTypeKey === '03'"><span class="icon">*</span>付款账号后4位</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="payDate">
-                <el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker>
+              <el-form-item prop="payNumber">
+                <el-input v-show="temp.payTypeKey === '03'" v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>付款方式</span>
+              <span>开户银行</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="payType">
-                <el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
-                  <el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-                </el-select>
+              <el-form-item>
+                <el-input v-model="temp.depositBank" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>付款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="payNumber">
-                <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>收款银行</span>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="13">
-              <el-form-item prop="collectionBank">
-                <el-select v-model="temp.collectionBank" class="addinputw" placeholder="" @change="changeproBank">
-                  <el-option v-for="item in proBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-                </el-select>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>收款银行账号</span>
             </el-col>
             <el-col :span="5">
               <el-form-item prop="collectionNumber">
                 <el-select v-model="temp.collectionNumber" class="addinputw" placeholder="" @change="changeProBankAccValue">
-                  <el-option v-for="item in ProBankAcc_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                  <el-option v-for="item in ProBankAcc_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>收款银行名称</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.collectionAccountName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>收款银行</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item prop="collectionBank">
+                <span>{{ temp.collectionBank }}</span>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
@@ -196,7 +219,7 @@
 
 <script>
 import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
-import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
+import { fetchBySid, getPathSidByUserSid, selAccountByOrgSid } from '@/api/dictcommons/dictcommons'
 import Upload from '@/components/uploadFile/upload.vue' // 上传文件
 import xuanzekehu from './relation/xuanzekehu'
 
@@ -222,7 +245,6 @@ export default {
       viewState: 1,
       listLoading: false,
       paymentType_list: [],
-      proBank_list: [],
       ProBankAcc_list: [],
       temp: {
         departmentName: '',
@@ -247,7 +269,10 @@ export default {
         userSid: window.sessionStorage.getItem('userSid'), // 用户Sid
         virtualOrderSid: '', // 订单Sid
         taskId: '', // 任务Id
-        procInsId: '' // 流程实例ID
+        procInsId: '', // 流程实例ID
+        depositBank: '',
+        collectionAccountName: '',
+        accountSid: ''
       },
       customerName: [],
       rules: {
@@ -256,7 +281,6 @@ export default {
         deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }],
         payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }],
         payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
-        payNumber: [{ required: true, message: '付款银行账号不能为空', trigger: 'blur' }],
         collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }],
         collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }]
       }
@@ -283,21 +307,15 @@ export default {
   methods: {
     getType() {
       // 付款方式
-      typeValues({
-        type: 'customerPayType'
-      }).then((res) => {
+      typeValues({ type: 'customerPayType' }).then((res) => {
         if (res.code === '200') {
           this.paymentType_list = res.data
           console.log('下拉框请求111', res.data)
         }
       })
-      // 收款银行
-      typeValues({
-        type: 'receiptBank'
-      }).then((res) => {
-        if (res.code === '200') {
-          this.proBank_list = res.data
-          console.log('下拉框请求111', res.data)
+      selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: '' }).then((resp) => {
+        if (resp.success) {
+          this.ProBankAcc_list = resp.data
         }
       })
     },
@@ -319,47 +337,23 @@ export default {
       this.temp.payTypeKey = bb.key
       console.log('name', this.temp.payType, 'key', this.temp.payTypeKey)
     },
-    changeproBank(value) {
-      console.log('触发下拉框按钮')
-      let bb = null
-      this.proBank_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            type: e.dictType,
-            name: e.dictValue,
-            key: e.dictKey,
-            sid: e.sid
-          }
-        }
-      })
-      this.temp.collectionBank = bb.name
-      this.temp.collectionBankKey = bb.key
-      this.getProBankAcc(bb.sid)
-    },
-    getProBankAcc(sid) {
-      typeValues({ psid: sid, type: 'receiptAccount' }).then((res) => {
-        if (res.code === '200') {
-          this.ProBankAcc_list = res.data
-          console.log('下拉框请求111', res.data)
-        }
-      })
-    },
     changeProBankAccValue(value) {
       console.log('触发下拉框按钮')
       let bb = null
       this.ProBankAcc_list.forEach((e) => {
-        if (e.dictValue === value) {
+        if (e.bankAccount === value) {
           bb = {
-            type: e.dictType,
-            name: e.dictValue,
-            key: e.dictKey,
-            sid: e.sid
+            accountSid: e.accountSid,
+            accountName: e.accountName,
+            depositBank: e.depositBank,
+            bankAccount: e.bankAccount
           }
         }
       })
-      this.temp.collectionNumber = bb.name
-      this.temp.collectionNumberKey = bb.key
-      console.log('name', this.temp.collectionNumber, 'key', this.temp.collectionNumberKey)
+      this.temp.collectionNumber = bb.bankAccount
+      this.temp.collectionAccountName = bb.accountName
+      this.temp.accountSid = bb.accountSid
+      this.temp.collectionBank = bb.depositBank
     },
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
@@ -466,6 +460,10 @@ export default {
     // 提交
     handleSubmit() {
       this.getUrl()
+      if (this.temp.payTypeKey === '03' && this.temp.payNumber === '') {
+        this.$message({ showClose: true, type: 'error', message: '因付款方式为转账,则付款账号不能为空' })
+        return
+      }
       if (this.temp.payImages.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
         return
@@ -533,12 +531,6 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
-.rowStyle {
-  border-left: 0px !important;
-}
-.colStyle {
-  border-right: 0px !important;
-}
 .tips {
   font-size: 12px;
   color: #606266;
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
index 656c5f2600..5190df42ee 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
@@ -10,12 +10,7 @@
       <div class="">
         <div class="titwu">销售简易订单</div>
         <el-form ref="dataForm" :model="temp" class="formadd">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colStyle">
-              <span>金额单位: 元</span>
-            </el-col>
-          </el-row>
-          <el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="3" class="tleftb">
               <span>分公司</span>
             </el-col>
@@ -69,17 +64,25 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆台数</span>
+              <span>付款方式</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.carNumber }}</span>
+                <span>{{ temp.payTypeValue }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>订金金额</span>
+              <span>付款日期</span>
             </el-col>
-            <el-col :span="13">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.payDate }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>订金金额(元)</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.deposit }}</span>
               </el-form-item>
@@ -87,39 +90,45 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>付款日期</span>
+              <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payDate }}</span>
+                <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>付款方式</span>
+              <span>开户银行</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payTypeValue }}</span>
+                <span>{{ temp.depositBank }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>付款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
-                <span>{{ temp.payNumber }}</span>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>收款银行</span>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="13">
+            <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.collectionBank }}</span>
+                <span>{{ temp.carNumber }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="3" class="tleftb">
               <span>收款银行账号</span>
             </el-col>
@@ -128,6 +137,22 @@
                 <span>{{ temp.collectionNumber }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>收款银行名称</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.collectionAccountName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>收款银行</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.collectionBank }}</span>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
@@ -298,10 +323,4 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.rowStyle {
-  border-left: 0px !important;
-}
-.colStyle {
-  border-right: 0px !important;
-}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
index e403b79102..cfb4f83fbb 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
@@ -12,12 +12,7 @@
       <div class="listconadd">
         <div class="titwu">销售简易订单</div>
         <el-form ref="dataForm" :model="temp" class="formadd" :rules="rules">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colStyle">
-              <span>金额单位: 元</span>
-            </el-col>
-          </el-row>
-          <el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="3" class="tleftb">
               <span>分公司</span>
             </el-col>
@@ -71,17 +66,27 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆台数</span>
+              <span><span class="icon">*</span>付款方式</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
-                <el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/>
+              <el-form-item prop="payType">
+                <el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
+                  <el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>订金金额</span>
+              <span><span class="icon">*</span>付款日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item prop="payDate">
+                <el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker>
+              </el-form-item>
             </el-col>
-            <el-col :span="13">
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>订金金额(元)</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item prop="deposit">
                 <el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -89,53 +94,71 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>付款日期</span>
+              <span v-show="temp.payTypeKey === '03'"><span class="icon">*</span>付款账号后4位</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="payDate">
-                <el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker>
+              <el-form-item>
+                <el-input v-show="temp.payTypeKey === '03'" v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>付款方式</span>
+              <span>开户银行</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="payType">
-                <el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
-                  <el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-                </el-select>
+              <el-form-item>
+                <el-input v-model="temp.depositBank" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>付款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="payNumber">
-                <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>收款银行</span>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="13">
-              <el-form-item prop="collectionBank">
-                <el-select v-model="temp.collectionBank" placeholder="" @change="changeproBank">
-                  <el-option v-for="item in proBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-                </el-select>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>收款银行账号</span>
             </el-col>
             <el-col :span="5">
               <el-form-item prop="collectionNumber">
                 <el-select v-model="temp.collectionNumber" class="addinputw" placeholder="" @change="changeProBankAccValue">
-                  <el-option v-for="item in ProBankAcc_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                  <el-option v-for="item in ProBankAcc_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>收款银行名称</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.collectionAccountName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>收款银行</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item prop="collectionBank">
+                <span>{{ temp.collectionBank }}</span>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
@@ -198,7 +221,7 @@
 
 <script>
 import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
-import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
+import { fetchBySid, getPathSidByUserSid, selAccountByOrgSid } from '@/api/dictcommons/dictcommons'
 import Upload from '@/components/uploadFile/upload.vue' // 上传文件
 import xuanzekehu from '@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu'
 
@@ -224,7 +247,6 @@ export default {
       viewState: 1,
       listLoading: false,
       paymentType_list: [],
-      proBank_list: [],
       ProBankAcc_list: [],
       temp: {
         departmentName: '',
@@ -249,7 +271,10 @@ export default {
         userSid: window.sessionStorage.getItem('userSid'), // 用户Sid
         virtualOrderSid: '', // 订单Sid
         taskId: '', // 任务Id
-        procInsId: '' // 流程实例ID
+        procInsId: '', // 流程实例ID
+        depositBank: '',
+        collectionAccountName: '',
+        accountSid: ''
       },
       customerName: [],
       rules: {
@@ -258,7 +283,6 @@ export default {
         deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }],
         payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }],
         payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
-        payNumber: [{ required: true, message: '付款银行账号不能为空', trigger: 'blur' }],
         collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }],
         collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }]
       }
@@ -267,21 +291,15 @@ export default {
   methods: {
     getType() {
       // 付款方式
-      typeValues({
-        type: 'customerPayType'
-      }).then((res) => {
+      typeValues({ type: 'customerPayType' }).then((res) => {
         if (res.code === '200') {
           this.paymentType_list = res.data
           console.log('下拉框请求111', res.data)
         }
       })
-      // 收款银行
-      typeValues({
-        type: 'receiptBank'
-      }).then((res) => {
-        if (res.code === '200') {
-          this.proBank_list = res.data
-          console.log('下拉框请求111', res.data)
+      selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: '' }).then((resp) => {
+        if (resp.success) {
+          this.ProBankAcc_list = resp.data
         }
       })
     },
@@ -301,45 +319,22 @@ export default {
       this.temp.payTypeKey = bb.key
       console.log('name', this.temp.payType, 'key', this.temp.payTypeKey)
     },
-    changeproBank(value) {
-      let bb = null
-      this.proBank_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            type: e.dictType,
-            name: e.dictValue,
-            key: e.dictKey,
-            sid: e.sid
-          }
-        }
-      })
-      this.temp.collectionBank = bb.name
-      this.temp.collectionBankKey = bb.key
-      this.getProBankAcc(bb.sid)
-    },
-    getProBankAcc(sid) {
-      typeValues({ psid: sid, type: 'receiptAccount' }).then((res) => {
-        if (res.code === '200') {
-          this.ProBankAcc_list = res.data
-          console.log('下拉框请求111', res.data)
-        }
-      })
-    },
     changeProBankAccValue(value) {
       let bb = null
       this.ProBankAcc_list.forEach((e) => {
-        if (e.dictValue === value) {
+        if (e.bankAccount === value) {
           bb = {
-            type: e.dictType,
-            name: e.dictValue,
-            key: e.dictKey,
-            sid: e.sid
+            accountSid: e.accountSid,
+            accountName: e.accountName,
+            depositBank: e.depositBank,
+            bankAccount: e.bankAccount
           }
         }
       })
-      this.temp.collectionNumber = bb.name
-      this.temp.collectionNumberKey = bb.key
-      console.log('name', this.temp.collectionNumber, 'key', this.temp.collectionNumberKey)
+      this.temp.collectionNumber = bb.bankAccount
+      this.temp.collectionAccountName = bb.accountName
+      this.temp.accountSid = bb.accountSid
+      this.temp.collectionBank = bb.depositBank
     },
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
@@ -462,6 +457,10 @@ export default {
     // 提交
     handleSubmit() {
       this.getUrl()
+      if (this.temp.payTypeKey === '03' && this.temp.payNumber === '') {
+        this.$message({ showClose: true, type: 'error', message: '因付款方式为转账,则付款账号不能为空' })
+        return
+      }
       if (this.temp.payImages.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
         return
@@ -522,7 +521,10 @@ export default {
         userSid: '', // 用户Sid
         virtualOrderSid: '', // 订单Sid
         taskId: '', // 任务Id
-        procInsId: '' // 流程实例ID
+        procInsId: '', // 流程实例ID
+        depositBank: '',
+        collectionAccountName: '',
+        accountSid: ''
       } // 添加和修改
       this.submitdisabled = false
       this.$refs['uploadImg'].stateName = '' // 必写项
@@ -557,10 +559,4 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
-.rowStyle {
-  border-left: 0px !important;
-}
-.colStyle {
-  border-right: 0px !important;
-}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
index d7868fde12..f2d8f955cd 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
@@ -10,12 +10,7 @@
       <div class="listconadd">
         <div class="titwu">销售简易订单</div>
         <el-form ref="dataForm" :model="temp" class="formadd">
-          <el-row class="rowStyle">
-            <el-col :span="24" class="tleftb colStyle">
-              <span>金额单位: 元</span>
-            </el-col>
-          </el-row>
-          <el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="3" class="tleftb">
               <span>分公司</span>
             </el-col>
@@ -69,17 +64,25 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆台数</span>
+              <span>付款方式</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.carNumber }}</span>
+                <span>{{ temp.payTypeValue }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>订金金额</span>
+              <span>付款日期</span>
             </el-col>
-            <el-col :span="13">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.payDate }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>订金金额(元)</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.deposit }}</span>
               </el-form-item>
@@ -87,39 +90,45 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>付款日期</span>
+              <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payDate }}</span>
+                <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>付款方式</span>
+              <span>开户银行</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payTypeValue }}</span>
+                <span>{{ temp.depositBank }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>付款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
-                <span>{{ temp.payNumber }}</span>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>收款银行</span>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="13">
+            <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.collectionBank }}</span>
+                <span>{{ temp.carNumber }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+            <el-col :span="3" class="tleftb">
+            </el-col>
+            <el-col :span="5">
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="3" class="tleftb">
               <span>收款银行账号</span>
             </el-col>
@@ -128,6 +137,22 @@
                 <span>{{ temp.collectionNumber }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>收款银行名称</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.collectionAccountName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>收款银行</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.collectionBank }}</span>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
@@ -229,10 +254,4 @@ export default {
 </script>
 
 <style scoped>
-.rowStyle {
-  border-left: 0px !important;
-}
-.colStyle {
-  border-right: 0px !important;
-}
 </style>