平台账户

src/pages/financial/PlatformAccount.vue

@@ -14,25 +14,67 @@
         </li>
       </ul>
     </div>
-    <v-table
-      v-if="isReady"
-      is-horizontal-resize
-      column-width-drag
-      style="width:100%;"
-      :columns="columns"
-      :table-data="DataList"
-      :filter-method="filterMethod"
-      :total="total"
-      :pageSize="msg.pageSize"
-      :pageIndex="msg.pageIndex"
-      :handleCurrentChange="handleCurrentChanges"
-      :multiple-sort="multipleSort"
-      :is-loading="loading"
-      sort-always
-      @sort-change="sortChange"
-      @on-custom-comp='customCompFunc'
-      :row-click="rowClick"
-    ></v-table>
+<!--    <v-table-->
+<!--      v-if="isReady"-->
+<!--      is-horizontal-resize-->
+<!--      column-width-drag-->
+<!--      style="width:100%;"-->
+<!--      :columns="columns"-->
+<!--      :table-data="DataList"-->
+<!--      :filter-method="filterMethod"-->
+<!--      :total="total"-->
+<!--      :pageSize="msg.pageSize"-->
+<!--      :pageIndex="msg.pageIndex"-->
+<!--      :handleCurrentChange="handleCurrentChanges"-->
+<!--      :multiple-sort="multipleSort"-->
+<!--      :is-loading="loading"-->
+<!--      sort-always-->
+<!--      @sort-change="sortChange"-->
+<!--      @on-custom-comp='customCompFunc'-->
+<!--      :row-click="rowClick"-->
+<!--    ></v-table>-->
+    <el-table
+      :data="DataList"
+      border
+      style="width: 100%;font-size: 12px">
+      <el-table-column prop="Alias" label="账户"  width="100"></el-table-column>
+      <el-table-column prop="allName" label="校区" width="150"></el-table-column>
+      <el-table-column prop="Accountholder"  label="开户人"></el-table-column>
+      <el-table-column prop="Initialbalance"  label="账户余额">
+        <template slot-scope="scope">
+          <span style='color:red;font-weight:bold' v-if="scope.row.Initialbalance>=scope.row.RiskLimitMoney&&scope.row.Initialbalance!=0">
+            {{scope.row.Initialbalance?scope.row.Initialbalance.toFixed(2):0}} <span style="margin-left:12px">超限</span>
+          </span>
+          <span style='color:red;font-weight:bold' v-else>{{scope.row.Initialbalance?scope.row.Initialbalance.toFixed(2):0}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="Accountholder"  label="平台交易费">
+        <template slot-scope="scope">
+          <span>
+            {{scope.row.SettlementType==1?(scope.row.Commission.toFixed(2)+'%'):(scope.row.Commission+'/人')}}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="Royalty"  label="平台使用费"></el-table-column>
+      <el-table-column prop="HaveContract"  label="合同">
+        <template slot-scope="scope">
+          <span :style="{'color':scope.row.HaveContract==0?'red':'blue'}">{{scope.row.HaveContract==0?'无合同':'有合同'}}  </span>
+          <span>{{scope.row.ContraceDateRange?scope.row.ContraceDateRange:''}} </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="Accountholder"  label="签约线路"></el-table-column>
+      <el-table-column prop="BindBankName"  label="绑定银行"></el-table-column>
+      <el-table-column prop="Remark"  label="备注"></el-table-column>
+      <el-table-column prop="Remark"  label="操作">
+        <template slot-scope="scope">
+          <div>
+            <el-button type="primary" size='mini' icon="el-icon-edit" circle @click="customCompFunc(scope.row,1)"></el-button>
+            <el-button type="danger" size='mini' icon="el-icon-delete" circle @click="customCompFunc(scope.row,2)"></el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
       <el-row>
         <el-col :span="20">
@@ -166,7 +208,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" :gutter="35" class="_BranchIdS">
-            <el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
+            <el-form-item label="校区" prop="BranchIdS">
               <el-select filterable v-model="addMsg.BranchIdS" collapse-tags>
                 <el-option
                   v-for="item in CompanyList"
@@ -511,11 +553,12 @@ export default {
         })
       }
     },
-    customCompFunc(params){
-      if (params.type === 'delete'){
-        this.financeinfoRemove(params.id,params.alias)
-      }else if (params.type === 'edit'){
-        this.editCurency(params.id)
+    customCompFunc(params,index){
+      console.log(params)
+      if (index == '2'){
+        this.financeinfoRemove(params.ID,params.Alias)
+      }else if (index =='1'){
+        this.editCurency(params.ID)
         this.text= this.$t('pub.updateMsg')
         this.addShow=true
         this.addCuren=true

src/pages/financial/financalDocument/addFinancialDocuments.vue

@@ -833,6 +833,7 @@
           GuestInfoList: [],
           RB_BranchName:'',
           RB_DepartName:'',
+          OrderSource : 17,
         },
         detailList: {
           ID: 0,

src/pages/financial/financalDocument/addReceivablesDocuments.vue

@@ -716,6 +716,8 @@
           Type: 0,
           RB_BranchName:'',
           RB_DepartName:'',
+          OrderSource : 17,
+
         },
         AccountNumber: '',
         queryAccMsg: {