Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Collection.vue

@@ -43,9 +43,7 @@
                 </div>
             </div>
             <div class="collection-checked">
-                <el-checkbox-group v-model="checkedCities">
-                    <el-checkbox v-for="type in Cities" :label="type" :key="type">{{type}}</el-checkbox>
-                </el-checkbox-group>
+                <div></div>
                 <el-button type="primary">添加一行</el-button>
             </div>
             <div class="collection-form">
@@ -53,35 +51,120 @@
                 :border="barderis"
                 ref="multipleTable"
                 :data="tableData"
-                tooltip-effect="dark"
                 style="width: 100%"
+                :expand-row-keys="expends"
+                :row-key="getRowKeys"
                 >
-                    <el-table-column
+                    <!-- <el-table-column
                     type="selection"
                     width="40">
+                    </el-table-column> -->
+                    <el-table-column align="center" type="expand">
+                        <!-- eslint-disable-next-line -->
+                        <template slot-scope="scope">
+                            <div class="paid-box">
+                                <div class="paid-label">已收款项</div>
+                                <div>
+                                    <el-button type="primary">新 增</el-button>
+                                </div>
+                            </div>
+                            <el-table
+                            class="inside-li" 
+                            :border="barderis"
+                            :data="scope.row._ProceedsReceivedDatas"
+                            style="width: 100%">
+                            <el-table-column
+                                label="付款时间"
+                                width="180">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.sectionTime"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="付款方信息"
+                                width="230">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.client"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="付款方电话"
+                                width="180">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.customerTel"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="已收金额"
+                                width="180">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.price"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="到款时间"
+                                width="180">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.customerName"></el-input>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="币种"
+                                width="180">
+                                <template slot-scope="scope">
+                                    <el-select v-model="scope.row.currency">
+                                        <el-option
+                                                v-for="item in currencyoptions"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="收款类型"
+                                width="180">
+                                <template slot-scope="scope">
+                                    <el-select v-model="scope.row.receivablesType">
+                                        <el-option
+                                                v-for="item in typeoptions"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                label="备注">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.remark"></el-input>
+                                </template>
+                            </el-table-column>
+                            </el-table>
+                        </template>
                     </el-table-column>
                     <el-table-column
                     prop="addingModeName"
                     label="增加方式"
-                    width="100"
-                    v-if="checkedCities.includes('增加方式')">
+                    width="100">
                     </el-table-column>
                     <el-table-column
                     prop="createTime"
                     label="时间"
-                    width="100"
-                    v-if="checkedCities.includes('时间')">
+                    width="100">
                     </el-table-column>
                     <el-table-column
                     label="费用名称"
-                    width="120">
+                    width="240">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.priceName"></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column
                     label="单 价"
-                    width="80">
+                    width="140">
                         <template slot-scope="scope">
                             <el-input class="editNum" type="number" oninput="value=value.replace(/[^\d.]/g,'')" v-model="scope.row.price"></el-input>
                         </template>
@@ -119,7 +202,7 @@
                     </el-table-column>
                     <el-table-column
                     label="汇 率"
-                    width="80">
+                    width="100">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.rate"></el-input>
                         </template>
@@ -130,62 +213,6 @@
                     width="120">
                     </el-table-column>
                     <el-table-column
-                    prop="name"
-                    label="已收金额"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="到款时间"
-                    width="120">
-                    </el-table-column>
-                    <el-table-column
-                    label="币 种"
-                    width="100">
-                        <template slot-scope="scope">
-                            <el-select v-model="scope.row.addingWay">
-                                <el-option
-                                        v-for="item in currencyoptions"
-                                        :key="item.id"
-                                        :label="item.name"
-                                        :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                    label="收款类型"
-                    width="130">
-                    <!-- eslint-disable-next-line -->
-                        <template slot-scope="scope">
-                            <el-select v-model="scope.row.attention" placeholder="请选择">
-                                <el-option
-                                v-for="item in typeoptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                    prop="to"
-                    label="付款方信息"
-                    width="120">
-                    </el-table-column>
-                    <el-table-column
-                    prop="toTel"
-                    label="付款方电话"
-                    width="120"
-                    v-if="checkedCities.includes('付款方电话')">
-                    </el-table-column>
-                    <el-table-column
-                    prop="payDate"
-                    label="付款日期"
-                    width="120"
-                    v-if="checkedCities.includes('付款日期')">
-                    </el-table-column>
-                    <el-table-column
                     prop="attention"
                     label="备注">
                         <template slot-scope="scope">
@@ -195,8 +222,7 @@
                     <el-table-column
                     prop="name"
                     label="尾 款"
-                    width="100"
-                    v-if="checkedCities.includes('尾 款')">
+                    width="100">
                     </el-table-column>
                 </el-table>
             </div>
@@ -207,13 +233,12 @@
 export default {
     data() {
       return {
+        expends:[],
         barderis:true,
         options: [],
         value: '',
         currencyoptions:'',
-        typeoptions:'',
-        checkedCities:[],
-        Cities:['增加方式', '付款方电话', '尾 款', '时间','付款日期'],
+        typeoptions:[],
         tableData: [],
         multipleSelection: [],
         groupInfo:{}
@@ -237,7 +262,7 @@ export default {
                     if(that.value==""){
                         that.value=that.options[0].id;
                     }
-                    that.GetGroupReceivablesInfoByDiId()
+                    that.GetGroupReceivablesInfoByDiId();
             })
         },
         GetGroupReceivablesInfoByDiId(){
@@ -251,13 +276,26 @@ export default {
                 },
                 data:{
                     portType: 1,
-                    diId: 2343
+                    diId: 2270
                 }
             }).then(function (res) {
                     console.log(res)
                     that.groupInfo=res.data.data.groupInfo;
-                    that.tableData=res.data.data.groupReceivedData;
+                    that.tableData=res.data.data.groupCollectionStatementData.receivedData;
+                    that.getExpends();
             })
+        },
+        getExpends(){
+            var Id=[]
+            this.tableData.forEach(item=>{
+                if(item._ProceedsReceivedDatas.length>0){
+                    Id.push(item.id)
+                }
+            })
+            this.expends=Id;
+        },
+        getRowKeys(row){
+            return row.id
         }
     },
     filters:{
@@ -316,7 +354,17 @@ export default {
     align-items: center;
     justify-content: space-between;
 }
-
+.paid-box{
+    margin-left:40px;
+    display: flex;
+    align-items: center;
+    justify-content:space-between;
+    margin-bottom: 5px;
+}
+.paid-label{
+    font-size: 14px;
+    font-weight: 600;
+}
 .editNum input::-webkit-outer-spin-button,
 .editNum input::-webkit-inner-spin-button {
     -webkit-appearance: none;
@@ -324,5 +372,7 @@ export default {
 .editNum input[type="number"] {
     -moz-appearance: textfield;
 }
-
+.inside-li{
+    margin-left:40px;
+}
 </style>

src/components/Finance/PaymentFiled.vue

@@ -36,12 +36,63 @@
                 </div>
             </div>
             <div class="paymentfiled-form">
-                <div class="paymentfiled-form-li">
-                    <el-checkbox v-model="checked">【转账】1、[申请人：邓梦秋][收款方：]北京东方君悦大酒店（团组：产投 加拿大 巴西 智利[酒店预订]）：RMB -9000.00、RMB：-9000.00</el-checkbox>
-                </div>
-                <div class="paymentfiled-form-li">
-                    <el-checkbox v-model="checked">【转账】1、[申请人：邓梦秋][收款方：]北京东方君悦大酒店（团组：产投 加拿大 巴西 智利[酒店预订]）：RMB -9000.00、RMB：-9000.00</el-checkbox>
-                </div>
+                <el-table
+                    :border="true"
+                    ref="multipleTable"
+                    :data="tableData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    @selection-change="handleSelectionChange">
+                    <el-table-column
+                    type="selection"
+                    width="55">
+                    </el-table-column>
+                    <el-table-column
+                    prop="paytype"
+                    label="付款方式"
+                    width="120">
+                    </el-table-column>
+                    <el-table-column
+                    label="日期"
+                    width="120">
+                    <template slot-scope="scope">{{ scope.row.date }}</template>
+                    </el-table-column>
+                    <el-table-column
+                    prop="applicant"
+                    label="申请人"
+                    width="120">
+                    </el-table-column>
+                    <el-table-column
+                    prop="recipient"
+                    label="收款方"
+                    width="200">
+                    </el-table-column>
+                    <el-table-column
+                    prop="groupname"
+                    label="团组名"
+                    width="200">
+                    </el-table-column>
+                    <el-table-column
+                    prop="type"
+                    label="费用类型"
+                    width="120">
+                    </el-table-column>
+                    <el-table-column
+                    prop="renminbi"
+                    label="人民币金额"
+                    width="120">
+                    </el-table-column>
+                    <el-table-column
+                    prop="trade"
+                    label="交易金额"
+                    width="120">
+                    </el-table-column>
+                    <el-table-column
+                    prop="remark"
+                    label="备注"
+                    show-overflow-tooltip>
+                    </el-table-column>
+                </el-table>
             </div>
         </div>
     </div>
@@ -50,6 +101,79 @@
 export default {
     data() {
       return {
+        tableData: [
+        {
+            paytype:'转账',
+            date: '2016-05-03',
+            applicant: '邓梦秋',
+            recipient:'北京东方君悦大酒店',
+            groupname:'产投 加拿大 巴西 智利',
+            type:'酒店预订',
+            renminbi:'-9000.00',
+            trade:'-9000.00',
+            remark: '上海市普陀区金沙江路 1518 弄'
+        }, {
+            paytype:'转账',
+            date: '2016-05-03',
+            applicant: '邓梦秋',
+            recipient:'北京东方君悦大酒店',
+            groupname:'产投 加拿大 巴西 智利',
+            type:'酒店预订',
+            renminbi:'-9000.00',
+            trade:'-9000.00',
+            remark: '上海市普陀区金沙江路 1518 弄'
+        }, {
+            paytype:'转账',
+            date: '2016-05-03',
+            applicant: '邓梦秋',
+            recipient:'北京东方君悦大酒店',
+            groupname:'产投 加拿大 巴西 智利',
+            type:'酒店预订',
+            renminbi:'-9000.00',
+            trade:'-9000.00',
+            remark: '上海市普陀区金沙江路 1518 弄'
+        }, {
+            paytype:'转账',
+            date: '2016-05-03',
+            applicant: '邓梦秋',
+            recipient:'北京东方君悦大酒店',
+            groupname:'产投 加拿大 巴西 智利',
+            type:'酒店预订',
+            renminbi:'-9000.00',
+            trade:'-9000.00',
+            remark: '上海市普陀区金沙江路 1518 弄'
+        }, {
+            paytype:'转账',
+            date: '2016-05-03',
+            applicant: '邓梦秋',
+            recipient:'北京东方君悦大酒店',
+            groupname:'产投 加拿大 巴西 智利',
+            type:'酒店预订',
+            renminbi:'-9000.00',
+            trade:'-9000.00',
+            remark: '上海市普陀区金沙江路 1518 弄'
+        }, {
+            paytype:'转账',
+            date: '2016-05-03',
+            applicant: '邓梦秋',
+            recipient:'北京东方君悦大酒店',
+            groupname:'产投 加拿大 巴西 智利',
+            type:'酒店预订',
+            renminbi:'-9000.00',
+            trade:'-9000.00',
+            remark: '上海市普陀区金沙江路 1518 弄'
+        }, {
+            paytype:'转账',
+            date: '2016-05-03',
+            applicant: '邓梦秋',
+            recipient:'北京东方君悦大酒店',
+            groupname:'产投 加拿大 巴西 智利',
+            type:'酒店预订',
+            renminbi:'-9000.00',
+            trade:'-9000.00',
+            remark: '上海市普陀区金沙江路 1518 弄'
+        }],
+        multipleSelection: [],
         pickerOptions: {
           shortcuts: [{
             text: '本月',
@@ -76,6 +200,11 @@ export default {
         value2: '',
         checked:''
       };
+    },
+    methods:{
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        }
     }
 }
 </script>