对账科目

src/assets/common/lang/EN/fill.js

@@ -8167,6 +8167,8 @@ export const obj = {
     kaihuzhih: 'Opening Branch',
     xiaosousjkb: 'Sales Data Dashboard',
   },
+  seeMySelfCompany:' Only view the company information you have filled in. ',
+  duizhnagkm: 'Reconciliation Accounts',
   //#endregion
 }
 export default obj;

src/assets/common/lang/Japan/fill.js

@@ -8167,6 +8167,8 @@ export const obj = {
     kaihuzhih: '口座開設します',
     xiaosousjkb: '販売データ看板',
   },
+  seeMySelfCompany: '自分が記入した会社の情報だけを見ます',
+  duizhnagkm: '帳簿科目」です',
   //#endregion
 }
 export default obj;

src/assets/common/lang/zhCN/fill.js

@@ -8168,6 +8168,7 @@ export const obj = {
     xiaosousjkb: '销售数据看板',
   },
   seeMySelfCompany:'只查看自己填写的公司信息',
+  duizhnagkm: '对账科目',
   //#endregion
 }
 export default obj;

src/assets/common/lang/zhTW/fill.js

@@ -8167,6 +8167,8 @@ export const obj = {
     kaihuzhih: '開戶支行',
     xiaosousjkb: '銷售數據看板',
   },
+  seeMySelfCompany:'只查看自己填寫的公司信息',
+  duizhnagkm: '對賬科目',
   //#endregion
 }
 export default obj;

src/components/FinancialModule/BankStatementReconciliation/comm/addSubject.vue

+<style scoped>
+/deep/.cdForm .el-input--small .el-input__inner {
+  line-height: 28px;
+  height: 32px;
+}
+</style>
+<template>
+    <el-dialog :title="title+$t('objFill.duizhnagkm')" width="400px" :visible.sync="showState" 
+    center @close="close" :close-on-click-modal="false">
+      <el-form class="cdForm" label-width="90px"
+      :model="msg" :rules="rules" ref="msg">
+            <el-form-item :label="$t('objFill.duizhnagkm')" prop="Name">
+              <el-input class="w220"
+              v-model="msg.Name"></el-input>
+            </el-form-item>
+            <el-form-item :label="$t('system.table_rank')" prop="Sort">
+              <el-input-number class="w220" v-model="msg.Sort" :min="Number(0)" :step="1" size="small"/>
+            </el-form-item>
+        </el-form>
+          <div slot="footer" class="dialog-footer">
+            <button class="hollowFixedBtn" @click="close()">{{$t('pub.cancelBtn')}}</button>
+            <el-button :loading="loading" class="normalBtn" type="primary" @click="editSubmit('msg')">{{$t('pub.sureBtn')}}</el-button>
+          </div>
+    </el-dialog>
+  </template>
+
+  <script>
+
+  export default {
+    props: ['obj'],
+    data() {
+      return {
+        loading: false,
+        SubjectList: [],
+        showState: false,
+        msg:{
+            Id: 0,
+            Status: 0,
+            Name: '',
+            Sort: 0,
+        },
+        title: '',
+        rules: {
+          Name: [{
+            required: true,
+            message: this.$t('system.ph_name'),
+            trigger: "blur"
+          }]
+        }
+      }
+    },
+    watch: {
+        obj: {
+            handler(newValue,onldValue) {
+              this.msg = JSON.parse(JSON.stringify(newValue))
+              if(this.msg.Id==0){
+                this.title = this.$t('pub.addBtn')
+              }else{
+                this.title = this.$t('pub.edit')
+              }
+            },
+            deep:true,
+            immediate: true,
+        },
+    },
+    mounted() {
+        this.showState = true
+    },
+    methods: {
+        editSubmit(formName){
+          this.$refs[formName].validate((valid) => {
+            if (valid) {
+              this.loading = true
+              this.apipost("Financial_post_SetBankSubject", this.msg, res => {
+              if (res.data.resultCode === 1) {
+                this.close()
+              }
+              this.loading = false
+              }, null)
+            }
+          })
+            
+        },
+        close(){
+          this.showState = false
+          this.$emit('change',false)
+        },
+    }
+  }
+  </script>
+
+  <style>
+    .el-dialog__header {
+      background-color: #E95252 !important;
+      padding: 20px 40px 10px;
+    }
+
+    .el-dialog__header .el-dialog__title {
+      color: white;
+    }
+
+    .hollowFixedBtn {
+      background: #fff;
+      color: #E95252;
+      padding: 0 15px;
+      height: 30px;
+      border: 1px solid #E95252;
+      cursor: pointer;
+      border-radius: 15px;
+      margin-left: 10px;
+    }
+
+    .hollowFixedBtn:hover {
+      box-shadow: 2px 0px 4px rgba(144, 6, 6, 0.25)
+    }
+
+    .hollowFixedBtn:active {
+      border-color: #CD2929;
+    }
+
+    .normalBtn {
+      color: #fff;
+      padding: 0 15px;
+      height: 30px;
+      background: #E95252;
+      border: 1px solid #E95252;
+      cursor: pointer;
+      border-radius: 15px;
+      margin-left: 10px;
+      outline: none;
+    }
+
+    .normalBtn:hover {
+      background: #E95252;
+      box-shadow: 2px 0px 4px rgba(144, 6, 6, 0.25)
+    }
+
+    .normalBtn:active {
+      background: #CD2929;
+    }
+
+    .leaderPayTable {
+      width: 100%;
+      margin: 10px auto;
+      text-align: center;
+      font-size: 12px;
+      color: #333;
+      border-collapse: collapse;
+      background-color: #fff;
+      border: 1px solid #d1d1d1;
+    }
+
+    .leaderPayTable th {
+      background: #e6e6e6;
+      padding: 8px 0;
+      color: #333;
+      border: 1px solid #d1d1d1;
+      font-weight: bold;
+    }
+
+    .leaderPayTable tr td {
+      background-color: #fff;
+      padding: 8px 0;
+      height: 32px;
+      border: 1px solid #d1d1d1;
+    }
+
+    .leaderPayTable2 tr td {
+      border: 1px solid #ccc;
+      line-height: 17px;
+      height: 25px;
+      font-size: 12px;
+      background: #fff;
+      text-align: center;
+      padding: 0;
+      ;
+      margin: 0;
+    }
+
+    .LeaderPrintDiv .LeaderTitle {
+      padding: 10px;
+      text-align: left;
+    }
+
+    .leaderPayTable .itemName {
+      text-align: left;
+      padding: 0 10px;
+    }
+
+    @media print {
+      .LeaderPrintDiv .btnListDiv {
+        display: none;
+      }
+    }
+
+    .comTotal {
+      text-align: left;
+      padding-left: 30px !important;
+    }
+
+    .LeaderPrintDiv {
+      width: 100%;
+      background: #f8f8f8;
+      position: absolute;
+    }
+
+    .LeaderPrintDiv .childDiv {
+      width: 1000px;
+      margin: 0 auto;
+    }
+
+    .LeaderPrintDiv .childDiv ._Titles {
+      font-size: 14px;
+    }
+
+    .wLeader2 .el-textarea__inner {
+      height: 130px;
+    }
+
+    .LeaderPrintDiv .btnListDiv {
+      margin: 20px auto;
+      text-align: center;
+    }
+
+    .LeaderPrintDiv .leader2Btn {
+      color: #fff;
+      padding: 0 15px;
+      height: 30px;
+      background: #e95252;
+      border: 1px solid #e95252;
+      cursor: pointer;
+      border-radius: 15px;
+      outline:none;
+    }
+
+    .cursorpointer {
+      cursor: pointer;
+    }
+
+    .text-decoration {
+      text-decoration: underline;
+    }
+
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+      -webkit-appearance: none;
+    }
+
+    input[type="number"] {
+      -moz-appearance: textfield;
+    }
+
+    .w150 {
+      width: 150px !important;
+    }
+
+    .Receipt_box {
+      padding: 15px;
+      color: #c94052;
+      width: 614px;
+      background-color: rgba(242, 242, 242, 1);
+      border: 1px solid rgba(228, 228, 228, 1)
+    }
+
+    .Receipt_box.color_blur {
+      color: #106BAF;
+    }
+
+    .Receipt_box.color_blur .rb_stit span {
+      display: inline-block;
+      border-bottom: 2px solid #106BAF;
+      padding: 0 20px
+    }
+
+    .rb_tit {
+      font-size: 18px;
+      text-align: center
+    }
+
+    .rb_stit {
+      font-size: 14px;
+      text-align: center
+    }
+
+    .rb_stit span {
+      display: inline-block;
+      border-bottom: 2px solid #C94052;
+      padding: 0 20px
+    }
+
+    .rb_top_row {
+      display: flex;
+      justify-content: space-between;
+      font-size: 12px;
+    }
+
+    .rb_top_row span._r_name {
+      color: #333333
+    }
+
+    .rb_top_row span._r_bold {
+      font-weight: bold
+    }
+
+    .rb_top_row ._r_time span {
+      color: #333333
+    }
+
+    ._r_mb5 {
+      margin-bottom: 5px;
+    }
+
+    .Receipt_table {
+      width: 100%;
+      font-size: 14px;
+      text-align: center
+    }
+
+    .Receipt_table .th {
+      font-weight: 200 !important
+    }
+
+    ._r_mt10 {
+      margin-top: 10px;
+    }
+
+    ._bg__ {
+      display: inline-block;
+      padding: 2px 8px;
+      color: white;
+      border-radius: 4px
+    }
+
+    ._bg_red {
+      background-color: #E95252;
+    }
+
+    ._bg_green {
+      background-color: #2BB87C
+    }
+
+    .text_d {
+      text-decoration: underline;
+      cursor: pointer;
+    }
+
+    .PingFangSC {
+      font-weight: bold
+    }
+
+    .Bill_par {
+      position: relative;
+    }
+
+    tr._item_list {
+      border-bottom: 1px solid #E5E5E5;
+      height: 78px;
+    }
+
+    tr._item_list td {
+      border-bottom: 1px solid #e5e5e5;
+      padding: 10px;
+    }
+
+    /* tr._t_head th{border-top: 1px solid #e5e5e5;} */
+    tr._item_list td:first-child {
+      border-left: 1px solid #e5e5e5;
+    }
+
+    tr._item_list td:last-child {
+      border-right: 1px solid #e5e5e5;
+    }
+
+    ._head_img {
+      width: 28px;
+      height: 28px;
+      border-radius: 50%;
+      vertical-align: middle;
+    }
+
+    ._btn_group {
+      font-size: 14px;
+    }
+
+    .icon-daiqueren {
+      color: #4BCA81
+    }
+
+    .icon-yiqueren {
+      color: #4BCA81
+    }
+
+    .icon-yiquxiao {
+      color: #959595
+    }
+
+    .icon-shenhebohui {
+      color: #E95252
+    }
+
+    .icon-icon-zancun {
+      color: #FF9C01
+    }
+
+    .singeRowTable tr:hover {
+      background-color: white
+    }
+
+    ._TradeWayList {
+      padding: 5px 10px;
+      background-color: #EEEEEE;
+      border-radius: 4px;
+      margin: 10px 0;
+      width: 230px
+    }
+
+    ._bold {
+      font-weight: bold
+    }
+
+    ._bank_name,
+    ._bank_type {
+      display: inline-block;
+      background-color: #333333;
+      color: white;
+      padding: 2px 4px;
+      border-radius: 4px;
+      margin-left: 10px;
+    }
+
+    ._bank_name {
+      margin-left: 10px;
+      cursor: pointer;
+    }
+
+    ._bank_type {
+      background-color: #2AAEF2
+    }
+
+    ._bank_type2 {
+      background-color: #FF9C01
+    }
+  .cdForm .el-form-item{
+    display: inline-block;
+  }
+  .leader2Btn {
+    color: #fff;
+    padding: 0 15px;
+    height: 30px;
+    background: #e95252;
+    border: 1px solid #e95252;
+    cursor: pointer;
+    border-radius: 15px;
+    outline:none;
+  }
+  </style>

src/plug/index.js

@@ -122,7 +122,9 @@ export default {
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
-        domainUrl = "http://192.168.5.214";
+        // domainUrl = "http://192.168.5.214";
+        domainUrl = "http://192.168.5.39:8083"
+        // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";

src/router/config.js

@@ -5826,6 +5826,14 @@ export default {
                 title: 'op提成明细'
               }
             },
+            {
+              path: '/BankStatementReconciliation',
+              name: 'BankStatementReconciliation',
+              component: resolve => require(['@/components/FinancialModule/BankStatementReconciliation/index'], resolve),
+              meta: {
+                title: '银行流水对账'
+              }
+            },
             {
               path: '/CouponList',
               name: 'CouponList',