Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/financial/components/PrepaymentOffset.vue

 <template>
 	<div class="">
-    <el-dialog title="预付款冲抵" width="960px" :visible.sync="yfcdState" center @close="close">
+    <el-dialog title="预付款冲抵" width="1170px" :visible.sync="yfcdState" center @close="close">
       <el-form class="cdForm row" label-width="90px">
         <el-form-item label="单号" prop="FrID">
           <el-input class="w180" @keyup.native="checkInteger(czMsg,'FrID')" v-model="czMsg.FrID"></el-input>
         </el-form-item>
         <el-form-item label="费用类型">
-          <el-select filterable v-model='czMsg.CostTypeID' class="w180">
+          <el-select filterable v-model='czMsg.CostTypeID' class="w120">
             <el-option label="不限" value=''></el-option>
             <el-option v-for="(item,index) in costList" :key="index" :label="item.Name" :value='item.ID'></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="查询类型">
-          <el-select filterable v-model='czMsg.IsDiJieSelect' class="w180">
+          <el-select filterable v-model='czMsg.IsDiJieSelect' class="w110">
             <el-option label="只看可冲抵" value='0'></el-option>
             <el-option label="查询所有" value='1'></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="交易日期">
-          <el-date-picker v-model="czdateList" type="daterange" range-separator="至"
+          <el-date-picker class="w220" v-model="czdateList" type="daterange" range-separator="至"
             start-placeholder="开始日期" end-placeholder="结束日期" size="samll">
           </el-date-picker>
         </el-form-item>
@@ -35,15 +35,15 @@
       row-key="FrID">
         <el-table-column type="selection" :selectable="selectable" :reserve-selection="true" width="55"/>
         </el-table-column>
-        <el-table-column prop="FrID" label="单号"></el-table-column>
+        <el-table-column prop="FrID" label="单号" width="80"></el-table-column>
         <el-table-column prop="BranchName" label="公司"></el-table-column>
-        <el-table-column prop="CostTypeName" label="费用类型"></el-table-column>
-        <el-table-column prop="CurrencyName" label="币种"></el-table-column>
-        <el-table-column prop="Rate" label="汇率"></el-table-column>
-        <el-table-column prop="Money" label="金额"></el-table-column>
-        <el-table-column prop="MatchMoney" label="冲抵金额"></el-table-column>
+        <el-table-column prop="CostTypeName" label="费用类型" width="120"></el-table-column>
+        <el-table-column prop="CurrencyName" label="币种" width="80"></el-table-column>
+        <el-table-column prop="Rate" label="汇率" width="80"></el-table-column>
+        <el-table-column prop="Money" label="金额" width="120"></el-table-column>
+        <el-table-column prop="MatchMoney" label="冲抵金额" width="120"></el-table-column>
         <el-table-column prop="StatusStr" label="状态"></el-table-column>
-        <el-table-column prop="" label="付款对象">
+        <el-table-column prop="" label="付款对象" width="150">
           <template slot-scope="scope">
             <el-tooltip v-if="scope.row.ClientTypeName" class="item" effect="dark"
                 :content="scope.row.ClientTypeName+':'+scope.row.RemitterName+'('+scope.row.AccountNumber+')'" placement="top-start">
@@ -136,7 +136,7 @@
 		},
     mounted(){
       let userInfo = this.getLocalStorage();
-      this.yfOutBranchId = userInfo.RB_Branch_id;
+      this.yfOutBranchId = userInfo.School_Id;
       this.yfcdState = true
       this.getCostTypeList()
       this.czgetList()

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -2212,25 +2212,6 @@ export default {
       F_Advance_Match: true,
       yfcdState: false,
       yfcheckList: [],
-      yfOutBranchId: "",
-      yfHandmsg: {
-        OtherType: 7,
-        ReFinanceId: 0,
-        Rate: 0,
-        czState: true
-      },
-      czList: [],
-      total2: 0,
-      czdateList: [],
-      czMsg: {
-        pageIndex: 1,
-        pageSize: 8,
-        FrID: "",
-        CostTypeID: "",
-        sTradeDate: "",
-        eTradeDate: "",
-        IsAdvanceFinance: 1
-      },
       costList: [],
       schoolMsg: {
         pageIndex: 1,
@@ -2297,7 +2278,6 @@ export default {
     this.GetAuth();
     this.getCostTypeList();
     let userInfo = this.getLocalStorage();
-    this.yfOutBranchId = userInfo.School_Id;
     // let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
     // this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
     this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id =
@@ -2318,7 +2298,6 @@ export default {
     this.FinancialFlowTemplate_post_GetStatusList();
     this.getPageList();
     this.AccountType_post_GetList();
-    this.czgetList();
   },
   methods: {
     GetAuth() {
@@ -2329,58 +2308,6 @@ export default {
       // }
       // });
     },
-    ZhiDanChongDi() {
-      this.yfcdState = true;
-      this.yfcheckList = [];
-    },
-    goUrlZD() {
-      let that = this;
-      let yfcheckList = JSON.parse(JSON.stringify(this.yfcheckList));
-
-      if (this.yfcheckList.length > 1) {
-        this.Error("只能选择一项！");
-        return;
-      }
-      if (this.yfcheckList.length == 0) {
-        this.Error("请选择一项");
-        return;
-      }
-
-      let arr = [];
-      // var TCArr = [this.yfHandmsg.TCNUM];
-      let orderObj = {
-        OrderID: 0,
-        OrderSource: 8,
-        Obj: {}
-        // TCIDList: TCArr
-      };
-      that.yfHandmsg.ReFinanceId = this.yfcheckList[0].FrID;
-      that.yfHandmsg.Rate = this.yfcheckList[0].Rate;
-      var msg = JSON.stringify(that.yfHandmsg);
-      let routeData = this.$router.resolve({
-        name: "ChoiceAddFinancialDocuments",
-        query: {
-          czmsg: msg,
-          orderObj: JSON.stringify(orderObj),
-          companyID: this.OutBranchId,
-          Type: 2,
-          searchTitle: "分摊"
-        }
-      });
-      window.open(routeData.href, "_blank");
-    },
-    ckeckOne() {
-      if (this.yfcheckList.length == 2) {
-        this.yfcheckList.splice(0, 1);
-      }
-      if (this.yfcheckList.length > 1) {
-        this.Error("只能选择一项！");
-      }
-    },
-    handleCurrentChange2(val) {
-      this.czMsg.pageIndex = val;
-      this.czgetList();
-    },
     getCostTypeList() {
       this.apipost(
         "Financial_get_GetAdvanceCostTypeList",
@@ -2395,30 +2322,6 @@ export default {
         null
       );
     },
-    czgetList() {
-      if (this.czdateList && this.czdateList.length > 0) {
-        this.czMsg.sTradeDate = this.czdateList[0];
-        this.czMsg.eTradeDate = this.czdateList[1];
-      } else {
-        this.czMsg.sTradeDate = "";
-        this.czMsg.eTradeDate = "";
-      }
-      let msg = Object.assign({}, this.czMsg);
-      if (msg.FrID == "") {
-        msg.FrID = 0;
-      }
-      this.apipost(
-        "Financial_get_GetAdvanceFinancePageList",
-        msg,
-        res => {
-          if (res.data.resultCode === 1) {
-            this.czList = res.data.data.pageData;
-            this.total2 = res.data.data.count;
-          }
-        },
-        null
-      );
-    },
 
     HebingSPLast() {
       if (this.checkList.length == 0) {