‘新增资金调拨 新增 （一点点）列表（没数据已完成） 详情（空白页）’

src/components/Details.vue

@@ -536,6 +536,12 @@ export default {
           case "/SalesFinancialDetail": //销售
           path = "/groupTourOrder";
           break;
+          case "/addCapitalAllocation": //资金调拨
+          path = "/CapitalAllocation";
+          break;
+          case "/CapitalAllocationDetail": //资金调拨
+          path = "/CapitalAllocation";
+          break;
       }
 
       //找到Root
@@ -744,6 +750,12 @@ export default {
           case "/SalesFinancialDetail": //销售
           path = "/groupTourOrder";
           break;
+          case "/addCapitalAllocation": //资金调拨
+          path = "/CapitalAllocation";
+          break;
+          case "/CapitalAllocationDetail": //资金调拨
+          path = "/CapitalAllocation";
+          break;
       }
 
       //找到Root

src/components/FinancialModule/CapitalAllocation.vue

+<style>
+.page_CapitalAllocation .query-box{
+  padding: 0;
+}
+.page_CapitalAllocation .form{
+  padding-top: 15px;
+}
+.page_CapitalAllocation .el-date-editor .el-range-separator {
+  padding: 0;
+  line-height: 29px;
+}
+.page_CapitalAllocation .el-select{
+  width: 100%;
+}
+.page_CapitalAllocation .page_CapitalAllocation_list {
+  width: 100%;
+}
+.page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;}
+.page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97}
+.page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79}
+</style>
+<template>
+  <div class="page_CapitalAllocation">
+    <div class="query-box">
+      <ul>
+        <li>
+          <input type="button" class="normalBtn" value="新增" @click="goURL"/>
+          <input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
+        </li>
+      </ul>
+    </div>
+    <el-form label-width="100px" class="form">
+      <el-row :gutter="20">
+        <el-col :span="4">
+          <el-form-item label="单据编号">
+            <el-input v-model="msg.FrID"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="公司">
+            <el-select v-model="msg.RB_Branch_Id" placeholder="请选择公司" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
+              <el-option :value="-1" label="不限"></el-option>
+              <el-option v-for='item in CompanyList'
+                :label='item.BName'
+                :value='item.Id'
+                :key='item.Id'>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="部门">
+            <el-select v-model="msg.RB_Depart_Id" placeholder="请选择部门" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
+              <el-option :value="-2" label="不限"></el-option>
+              <el-option v-for='item in DepartmentList'
+                :label='item.DepartmentName'
+                :value='item.DepartmentID'
+                :key='item.DepartmentID'>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="制单人">
+            <el-select  filterable  v-model='msg.UpdateBy'>
+              <el-option value="-1" label="不限"></el-option>
+              <el-option v-for='item in EmployeeList'
+                :label='item.EmName'
+                :value='item.EmployeeId'
+                :key='item.EmployeeId'>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="制单日期">
+            <el-date-picker
+              @change="timeAdd(1)"
+              v-model="productionDate"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select  v-model="msg.Status" filterable>
+              <el-option value="-1" label="不限"></el-option>
+              <el-option v-for='item in StatusList'
+                :label='item.Name'
+                :value='item.ID'
+                :key='item.ID'>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="交易日期">
+            <el-date-picker
+              @change="timeAdd(2)"
+              v-model="productionDate2"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div class="page_CapitalAllocation_list">
+      <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
+        <tr>
+          <th>单号</th>
+          <th>金额</th>
+          <th>实付</th>
+          <th>原币金额</th>
+          <th>交易日期</th>
+          <th>创建时间</th>
+          <th>创建人</th>
+          <th>备注</th>
+          <th>状态</th>
+          <th>操作</th>
+        </tr>
+        <tr v-for="(item, index) in dataList">
+          <td>{{item.FrID}}</td>
+          <td>{{item.Money}}</td>
+          <td>{{item.PayMoney}}</td>
+          <td>{{item.OriginalMoney}}</td>
+          <td>{{item.TradeDate}}</td>
+          <td>{{item.CreateDate}}</td>
+          <td>{{item.EmName}}</td>
+          <td>{{item.Description}}</td>
+          <td>{{item.StatusStr}}</td>
+          <td>
+            <i class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data(){
+    return {
+      msg: {
+        pageIndex: 1,
+        pageSize: 15,
+        FrID: '',
+        UpdateBy: '-1',
+        RB_Branch_Id: -1,
+        RB_Depart_Id: -2,
+        sDate: '',
+        eDate: '',
+        Status: '-1',
+        sTradeDate: '',
+        eTradeDate: '',
+      },
+      getCompanyMsg:{  // 公司
+        RB_Group_Id:'0',
+        Status:'0',
+      },
+      getDepartmentMsg:{// 部门
+        RB_Group_Id:'',
+        RB_Branch_Id:'',
+        Status:0,
+        ParentId:-1,
+        Tier:0,
+      },
+      employeeMsg:{ // 员工
+        GroupId:'',
+        BranchId:-1,
+        DepartmentId:0,
+        PostId:0,
+        IsLeave:0,
+      },
+      dataList: [],
+      CompanyList: [],
+      DepartmentList: [],
+      productionDate: [],
+      productionDate2: [],
+      StatusList: [],
+      EmployeeList: [],
+      loading: true,
+    }
+  },
+  created(){
+    this.getList()
+    let userInfo = this.getLocalStorage();    // 读取缓存数据
+    this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    // 集团ID
+  },
+  methods:{
+    getList: function () {  // 获取列表数据
+      if (this.msg.FrID === '') {
+        this.msg.FrID = 0
+      }
+      this.loading= true
+      this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{
+        if (res.resultCode ===1){
+          this.dataList = res.data.data.pageData
+        } else {
+          this.$message.error(res.data.message)
+        }
+        if (this.msg.FrID===0) {
+          this.msg.FrID = ''
+        }
+        this.loading= false
+      }, null)
+    },
+    getCompanyList: function () { //获取公司列表
+      this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
+        if(res.data.resultCode==1){
+          this.CompanyList=res.data.data;
+        }else{}
+      },err=>{})
+    },
+    getDepartment: function () {  //获取部门列表
+      this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
+        if(res.data.resultCode == 1) {
+          this.DepartmentList = res.data.data;
+        }
+      }, err => {})
+    },
+    timeAdd: function (t) {  // 日期格式
+      if (t===1) {
+        if(!this.productionDate){
+          this.msg.sDate = '';
+          this.msg.eDate = '';
+          return
+        }
+        this.msg.sDate = this.productionDate[0];
+        this.msg.eDate = this.productionDate[1];
+      } else if (t===2){
+        if(!this.productionDate2){
+          this.msg.sTradeDate = '';
+          this.msg.eTradeDate = '';
+          return
+        }
+        this.msg.sTradeDate = this.productionDate2[0];
+        this.msg.eTradeDate = this.productionDate2[1];
+      }
+    },
+    GetStatusList: function () {  // 获取审核状态枚举
+      this.apipost('FinancialFlowTemplate_post_GetStatusList',{}, res => {
+        if(res.data.resultCode == 1) {
+          this.StatusList = res.data.data;
+        }
+      }, err => {})
+    },
+    getEmployee() { //员工
+      this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
+        if(res.data.resultCode == 1) {
+          this.EmployeeList = res.data.data;
+        }
+      }, err => {})
+    },
+    goURL: function () {
+       this.$router.push({ name: "addCapitalAllocation",query:{blank:'y',tab:'新增资金调拨'} })
+    }
+  },
+  mounted(){
+    this.getCompanyList()
+    this.getDepartment()
+    this.GetStatusList()
+    this.getEmployee()
+  }
+}
+</script>

src/components/FinancialModule/CapitalAllocationDetail.vue

+<style>
+
+</style>
+<template>
+  
+</template>
+<script>
+export default {
+  data(){
+    return {
+      
+    }
+  },
+  create(){
+
+  },
+  methods:{
+
+  },
+  mounted(){
+
+  }
+}
+</script>

src/components/FinancialModule/FinancialDocuments.vue

@@ -201,11 +201,162 @@
                   </el-date-picker>
                 </span>
               </li>
+                <template v-if="heightQueryBox">
+                     <li>
+                        <span>
+                        <em>所属公司</em>
+                            <el-select  filterable  v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()"  class="w150">
+                                <el-option :value="-1" label="不限"></el-option>
+                                <el-option v-for='item in CompanyList'
+                                    :label='item.BName'
+                                    :value='item.Id'
+                                    :key='item.Id'>
+                                </el-option>
+                            </el-select>
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                        <em>费用部门</em>
+                            <el-select  filterable  v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="w150">
+                                <el-option :value="0" label="不限"></el-option>
+                                <el-option v-for='item in DepartmentList'
+                                    :label='item.DepartmentName'
+                                    :value='item.DepartmentID'
+                                    :key='item.DepartmentID'>
+                                </el-option>
+                            </el-select>
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                        <em>制单人员</em>
+                            <el-select  filterable  v-model='msg.UpdateBy'  class="w150">
+                                <el-option :value="0" label="不限"></el-option>
+                                <el-option v-for='item in EmployeeList'
+                                    :label='item.EmName'
+                                    :value='item.EmployeeId'
+                                    :key='item.EmployeeId'>
+                                </el-option>
+                            </el-select>
+                        </span>
+                    </li>
+                        <li>
+                            <span>
+                                <em>账户类型</em>
+                                <el-select  filterable  v-model='msg.AccountType' class="w150">
+                                    <el-option value="" label="不限"></el-option>
+                                    <el-option v-for='item in AccList'
+                                        :label='item.Name'
+                                        :value='item.ID'
+                                        :key='item.ID'>
+                                    </el-option>
+                                </el-select>
+                            </span>
+                    </li>
+                    <li>
+                        <span>
+                            <em>交易方式</em>
+                            <el-select  filterable  v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''"  class="w150">
+                                <el-option :value="0" label="不限"></el-option>
+                                <el-option v-for='item in BranchAccountList'
+                                    :label='item.Name'
+                                    :value='item.ID'
+                                    :key='item.ID'>
+                                </el-option>
+                            </el-select> 
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                            <em>收付款账户</em> 
+                            <el-select  filterable  v-model='msg.BankID'  class="w150">
+                                <el-option value="" label="不限"></el-option>
+                                <el-option v-for='item in accountList'
+                                    :label='item.Name'
+                                    :value='item.ID'
+                                    :key='item.ID'>
+                                </el-option>
+                            </el-select>
+                        </span>
+                    </li>
+                    <li v-show="msg.Type==2">
+                        <span>
+                            <em>对象类型</em>
+                            <el-select  filterable  v-model='msg.ClientType' @change="financeinfo_post_GetClientAccountList(msg.ClientType),msg.ClientID=''" class="w150">
+                                <el-option value="" label="不限"></el-option>
+                                <el-option v-for='item in ClientTypeList'
+                                    :label='item.Name'
+                                    :value='item.ID'
+                                    :key='item.ID'>
+                                </el-option>
+                            </el-select> 
+                        </span>
+                    </li>
+                    <li v-show="msg.Type==2">
+                        <span>
+                            <em>付款对象</em> 
+                            <el-select  filterable  v-model='msg.ClientID' class="w150">
+                                <el-option value="" label="不限"></el-option>
+                                <el-option v-for='item in ClientAccountList'
+                                    :label='item.Name'
+                                    :value='item.ID'
+                                    :key='item.ID'>
+                                </el-option>
+                            </el-select> 
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                            <em>团队编号</em>
+                            <el-input v-model="msg.TCID" class="w150"></el-input> 
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                            <em>订单编号</em>
+                            <el-input v-model="msg.OrderID" class="w150"></el-input> 
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                            <em>币种类型</em>
+                            <el-select  filterable  v-model='msg.CurrencyId'  class="w150">
+                                <el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
+                            </el-select>
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                            <em>费用类型</em> 
+                            <el-select  filterable  v-model='msg.CostTypeID'  class="w150">
+                                <el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
+                            </el-select> 
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                            <em>单据金额</em>
+                            <el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
+                        </span>
+                    </li>
+                    <li>
+                        <span>
+                            <em>发团日期</em>
+                            <el-date-picker class="h34"
+                                v-model="missionDate"
+                                @change="timeAdd(4)"
+                                type="daterange"
+                                value-format="yyyy-MM-dd">
+                            </el-date-picker>
+                        </span>
+                    </li>
+                </template>
                 <li class="hight_query">
                     <span>
                         <em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
                     </span>
-                    <div class="hight_query_box"   @click.stop>
+                    <!-- <div class="hight_query_box"   @click.stop>
                         <el-collapse-transition>
                             <div v-show="heightQueryBox">
                                 <p class="hqb_t">财务单据高级查询</p>
@@ -353,7 +504,7 @@
                                 </el-form>
                             </div>
                         </el-collapse-transition>
-                    </div>
+                    </div> -->
                     <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
                     <button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">新增</button>
                     <button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">批量提交</button>

src/components/FinancialModule/addCapitalAllocation.vue

+<style>
+.page_addCapitalAllocation{
+  width: 800px;
+  /* position: absolute; */
+  padding: 15px;
+  background-color: white;
+  color: #c94052;
+  margin: 0 auto;
+}
+.page_addCapitalAllocation ._top{
+  text-align: center
+}
+.page_addCapitalAllocation ._top p{
+  font-size: 20px;
+  padding: 5px 0;
+}
+.page_addCapitalAllocation ._top p:last-child{
+  font-size: 18px;
+  padding:0 0 10px 0
+}
+.page_addCapitalAllocation ._top p:last-child span{
+  display: inline-block;
+  border-bottom: 2px solid #c94052;
+  padding: 0 20px;
+}
+.page_addCapitalAllocation table{
+  padding: 5px;
+  height: 34px;
+  border:1px solid #E6E6E6;
+  width: 100%;
+  border-collapse: collapse;
+  text-align: center;
+  border-color: #c94052;
+}
+</style>
+<template>
+  <div class="page_addCapitalAllocation">
+    <div class="_top">
+      <p>四川和平国际旅行社有限公司</p>
+      <p><span>资金调拨单</span></p>
+    </div>
+    <table border="1" v-loading="loading">
+      <tr>
+        <th>收款方式</th>
+        <th>账户</th>
+        <th>金额</th>
+        <th>币种</th>
+        <th>汇率</th>
+        <th>本位币金额</th>
+      </tr>
+      <tr>
+        <td>
+          <el-select  filterable  v-model='bankType' placeholder="" @change="getAccountList(bankType)" class="w100 _border_b_1">
+              <el-option v-for='item in AccList'
+                  :label='item.Name'
+                  :value='item.ID'
+                  :key='item.ID'>
+              </el-option>
+          </el-select>
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+<script>
+export default {
+  data(){
+    return {
+      msg: {
+        FrID: 0,
+        TemplateId: 27,
+        Status: 1,
+        IsPublic: 0,
+        RB_Depart_Id: 0,
+        RB_Branch_Id: 0,
+        Description: '',
+        IsHave: 1,
+        emList: [],
+        BankList: []
+      },
+      BankList: {
+        ID: 0,
+        Type: '',
+        AccountId: '',
+        OriginalMoney: 0,
+        Rate: 0,
+        Money: 0,
+        CurrencyId: '',
+        Description: '',
+        AllotDate: '',
+        AllotType: '',
+        Sort: '',
+        VorcherInos: [
+          {
+            ID: 0,
+            Type: 0,
+            Content: 0
+          }
+        ]
+      },
+      AccList: [],
+      loading: false,
+      bankType: ''
+    }
+  },
+  create(){
+    
+  },
+  methods:{
+    AccountType_post_GetList: function () {  //获取账户类型下拉
+      this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
+        if(res.data.resultCode==1){
+          let AccList = res.data.data;
+          this.AccList = AccList;
+        }else{
+            this.$message.error(res.data.message);
+        }
+      },err=>{})
+    },
+    getAccountList(i){  //获取账户类型对应下的账户列表
+      this.msg.BankList[0].AccountId = '';
+      this.AccountNumber = '';
+      this.apipost('FinancialInstitutions_post_GetALLAccountList',{TypeId:i}, res => {
+        if(res.data.resultCode == 1) {
+          let data = res.data.data;
+          data.forEach(x=>{
+            x.allName = x.BackNo+"("+x.Alias+")";
+            x.Name = x.Alias;
+          })
+          this.accountList = data;
+          // if(this.$route.query.edit){
+          //   this.getAccName(this.msg.BankList[0].AccountId)
+          // }
+        }
+      }, err => {})
+    },
+  },
+  mounted(){
+    this.AccountType_post_GetList()
+  }
+}
+</script>

src/router/config.js

@@ -2059,6 +2059,27 @@ export default {
               meta: {
                 title: '银行日报表'
               },
+            }, { //财务 资金调拨
+              path: '/CapitalAllocation',
+              name: 'CapitalAllocation',
+              component: resolve => require(['@/components/FinancialModule/CapitalAllocation'], resolve),
+              meta: {
+                title: '资金调拨'
+              },
+            }, { //财务 资金调拨 新增
+              path: '/addCapitalAllocation',
+              name: 'addCapitalAllocation',
+              component: resolve => require(['@/components/FinancialModule/addCapitalAllocation'], resolve),
+              meta: {
+                title: '新增资金调拨'
+              },
+            }, { //财务 资金调拨 详情
+              path: '/CapitalAllocationDetail',
+              name: 'CapitalAllocationDetail',
+              component: resolve => require(['@/components/FinancialModule/CapitalAllocationDetail'], resolve),
+              meta: {
+                title: '资金调拨详情'
+              },
             }, { //财务 银行账户
               path: '/CompanyAccount',
               name: 'CompanyAccount',