Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiaochebanliFlow/deliveryconfirmationDaiBanInfo.vue

@@ -11,7 +11,7 @@
       </div>
     </div>
     <div class="">
-      <div class="titwu">交车确认</div>
+      <div class="titwu">交付确认</div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="8">

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiaochebanliFlow/deliveryconfirmationEdit.vue

@@ -12,7 +12,7 @@
       </div>
     </div>
     <div class="">
-      <div class="titwu">交车确认</div>
+      <div class="titwu">交付确认</div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="8">

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiaochebanliFlow/deliveryconfirmationYiBanInfo.vue

@@ -9,7 +9,7 @@
       </div>
     </div>
     <div class="">
-      <div class="titwu">交车确认</div>
+      <div class="titwu">交付确认</div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="8">

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochebanli/cardelivery.vue

@@ -5,8 +5,8 @@
       <button-bar view-title="交车办理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="switch_btn">
-          <el-button class="" @click="handleClick">待交车车辆列表</el-button>
-          <el-button :class="{btn_style:viewState === 1}">交车办理列表</el-button>
+          <el-button class="" @click="handleClick">待交付</el-button>
+          <el-button :class="{btn_style:viewState === 1}">交付</el-button>
         </div>
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@@ -288,7 +288,7 @@ export default {
       }
       this.getList()
     },
-    // 办理（交车确认）
+    // 办理（交付确认）
     toEdit(row) {
       this.viewState = 2
       this.$refs['divQueRen'].showInfo(row)

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochebanli/cartobedelivered.vue

@@ -5,8 +5,8 @@
       <button-bar view-title="交车办理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="switch_btn">
-          <el-button :class="{btn_style:viewState === 1}">待交车车辆列表</el-button>
-          <el-button class="" @click="handleClick">交车办理列表</el-button>
+          <el-button :class="{btn_style:viewState === 1}">待交付</el-button>
+          <el-button class="" @click="handleClick">交付</el-button>
         </div>
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@@ -110,7 +110,7 @@ export default {
           size: 'small',
           icon: '',
           btnKey: 'doTransact',
-          btnLabel: '交车办理'
+          btnLabel: '办理'
         },
         {
           type: 'info',

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochebanli/deliveryconfirmation.vue

@@ -13,7 +13,7 @@
       </div>
     </div>
     <div class="listconadd">
-      <div class="titwu">交车确认</div>
+      <div class="titwu">交付确认</div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="8">

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochebanli/deliveryconfirmationInfo.vue

@@ -9,7 +9,7 @@
       </div>
     </div>
     <div class="listconadd">
-      <div class="titwu">交车确认</div>
+      <div class="titwu">交付确认</div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="8">

anrui-riskcenter-ui/src/views/financialdetails/financialdetails.vue

@@ -51,6 +51,7 @@
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;">
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
             <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="180" />
             <el-table-column prop="bankName" label="资方" align="center" min-width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="180" />
@@ -122,7 +123,9 @@ export default {
           loanContractNo: '',
           period: '',
           vinNo: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
         }
       }
     }
@@ -163,7 +166,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then(response => {
         this.listLoading = false
         if (response.success) {
@@ -196,7 +201,9 @@ export default {
           loanContractNo: '',
           period: '',
           vinNo: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
         }
       }
       this.getList()

anrui-riskcenter-ui/src/views/provisionoffunds/provisionoffunds.vue

@@ -35,6 +35,7 @@
                 <el-button type="primary" size="mini" @click="toDownload(scope.row)">下载</el-button>
               </template>
             </el-table-column>
+            <el-table-column prop="useOrgName" label="分公司" align="center" />
             <el-table-column prop="times" label="计提时间" align="center" />
             <el-table-column prop="money" label="本次计提金额" align="center" />
           </el-table>
@@ -93,7 +94,9 @@ export default {
         params: {
           startTimes: '',
           endTimes: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
         }
       }
     }
@@ -134,7 +137,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then(response => {
         this.listLoading = false
         if (response.success) {
@@ -160,7 +165,9 @@ export default {
         params: {
           startTimes: '',
           endTimes: '',
-          orgPath: ''
+          orgPath: '',
+          menuUrl: '',
+          userSid: ''
         }
       }
       this.getList()