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

src/components/FinancialModule/Kingdee/SubjectContrast.vue

@@ -90,6 +90,9 @@
         <!-- 费用 -->
         <costForm v-if="titleType==1" :list="RCostList" :loading="loading" @clickEdit="clickEdit" @success="getList"
           :type="titleType"></costForm>
+        <!-- 付款对象 -->
+        <payobjectForm v-if="titleType==5" :list="RPayObjectList" :loading="loading" @clickEdit="clickEdit" @success="getList"
+          :type="titleType"></payobjectForm>
       </div>
       <el-dialog custom-class='w700' :title="title+'导入'" :visible.sync="outerVisible" center>
         <el-upload style="text-align: center;" drag class="upload-demo" :action="importFileUrl2"
@@ -137,11 +140,13 @@
     import bankForm from './suject/bank'
     import cashForm from './suject/cash'
     import costForm from './suject/cost'
+    import payobjectForm from './suject/payobject'
     export default {
       components: {
         bankForm,
         cashForm,
-        costForm
+        costForm,
+        payobjectForm
       },
       data() {
         return {
@@ -165,6 +170,10 @@
               Name: '费用',
               Id: 1
             },
+            {
+              Name: '付款对象',
+              Id: 5
+            },
           ],
           text: '新增银行对照表',
           rules: { //表单必填验证
@@ -213,6 +222,10 @@
               Name: '费用对照表',
               Id: 1
             },
+            {
+              Name: '付款对象对照表',
+              Id: 5
+            },
           ],
           msg: {
             BranchId: 0,
@@ -221,6 +234,7 @@
           RCashList: [], //现金
           RPlatfromList: [],//平台
           RCostList: [], //费用
+          RPayObjectList: [],//付款对象
           loading: false,
           outerVisible: false,
           importFileUrl2: "",
@@ -334,6 +348,9 @@
           if (item.Id == 1) {
             this.text = '新增费用对照表'
           }
+          if (item.Id == 5) {
+            this.text = '新增付款对象对照表'
+          }
         },
         // type 1关联 2支出 3收入
         clickDaoRu(type) {
@@ -373,6 +390,7 @@
               this.RCashList = res.data.data.RCashList;
               this.RPlatfromList = res.data.data.RPlatfromList;
               this.RCostList = res.data.data.RCostList;
+              this.RPayObjectList = res.data.data.RPayObjectList;
             } else {
               this.Error(res.data.message);
             }

src/components/FinancialModule/Kingdee/suject/payobject.vue

+<style scoped>
+  @import "../../../../assets/css/cssReset.css";
+
+  .singeRowTable tr th,.singeRowTable tr td{
+    text-align: center;
+  }
+  .tagF{
+    margin-right: 5px;
+    padding: 0 5px;
+  }
+</style>
+<template>
+  <div>
+    <table class="po_content singeRowTable"
+      style="border:1px solid #E6E6E6;" cellspacing="0"
+      cellpadding="0" v-loading="loading">
+        <tr>
+          <th width="100px">账户类型</th>
+          <th>账户名称</th>
+          <th>别名</th>
+          <th>开户人</th>
+          <th>卡号</th>
+          <th>关联科目</th>
+          <th width="150px">操作</th>
+        </tr>
+        <tr v-for="(item,index) in list" :key="index">
+          <td>{{item.TypeName}}</td>
+          <td>{{item.OpenBankName}}</td>
+          <td>{{item.AccountAlias}}</td>
+          <td>{{item.AccountHolder}}</td>
+          <td>{{item.CardNum}}</td>
+          <td style="white-space: warp;">
+            <el-tag size="mini" class="tagF" v-for="(i,indexs) in item.KingdeeList" :key="indexs"
+              closable @close="Delete(item,i)">
+              {{i.KingdeeName}} <span>{{i.KingdeeCode}}</span>
+            </el-tag>
+          </td>
+          <td width="150px">
+            <div style="padding: 3px 0;">
+              <el-tooltip class="item" effect="dark" content="新增关联" placement="top-start">
+                <el-button type="primary" circle @click="AddR(item)" size="mini">
+                  <i class="el-icon-plus"></i>
+                </el-button>
+              </el-tooltip>
+            </div>
+          </td>
+        </tr>
+      </table>
+      <div class="noData" v-if="list&&list.length==0">
+        {{$t('system.content_noData')}}
+      </div>
+
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      list: {
+        type: Array,
+        default: null
+      },
+      loading: {
+        type: Boolean,
+        default: null
+      },
+      type: {
+        type: Number,
+        default: null
+      }
+    },
+    data() {
+      return {
+
+      }
+    },
+    watch: {
+      list: {
+        handler(val) {
+          this.list = val
+        },
+        deep: true
+      },
+      loading: {
+        handler(val) {
+          this.loading = val
+        },
+        deep: true
+      },
+      type: {
+        handler(val) {
+          this.type = val
+        },
+        deep: true
+      }
+    },
+    created(){
+    },
+    mounted(){
+
+    },
+    methods: {
+      Delete(item,i){
+        let _this = this
+        let msg = {
+          Type: this.type,
+          TargetId: item.ID,
+          SubjectId: i.SubjectId,
+        }
+        _this.$confirm('此操作将删除此科目数据，是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.apipost('Financial_post_DelCostTypeKingdeeRelation',msg, res => {
+            if(res.data.resultCode == 1) {
+              this.Success('操作成功')
+              this.$emit('success');
+            } else {
+             
+            }
+          }, err => {
+            
+          })
+        }).catch(() => {
+
+        });
+      },
+      AddR(item){
+        this.$emit('clickEdit',item)
+      },
+    },
+
+  }
+</script>