应收款项添加费用款项

src/components/Finance/RvsReport.vue

@@ -3,15 +3,11 @@
         <div class="rvsreport-all">
             <div class="rvsreport-haed">
                 <div>
-                    <el-date-picker @change="datechange" style="width:350px" v-model="value2" type="daterange" align="left"
-                        unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                    <el-date-picker @change="datechange" style="width:350px" v-model="value2" type="daterange"
+                        align="left" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
                         :picker-options="pickerOptions">
                     </el-date-picker>
-                    <el-input
-                        style="width:250px"
-                        placeholder="请输入团组名称"
-                        v-model="input"
-                        clearable>
+                    <el-input style="width:250px" placeholder="请输入团组名称" v-model="input" clearable>
                     </el-input>
                     <el-button @click="datechange" type="primary">查询</el-button>
                 </div>
@@ -21,13 +17,23 @@
                 应收合计：{{total_fr}} 已收合计：{{total_pr}} 余款合计：{{total_balance}}
             </div>
             <div class="rvsreport-table">
-                <el-table  :row-style="changRed" height="720" :data="tableData" style="width: 100%" :row-class-name="rowClassName">
+                <el-table :row-style="changRed" height="720" :data="tableData" style="width: 100%"
+                    :row-class-name="rowClassName">
                     <el-table-column label="应收报表">
                         <el-table-column prop="no" label="序号" width="50">
                         </el-table-column>
                         <el-table-column prop="clientUnit" label="单位" width="180">
                         </el-table-column>
                         <el-table-column prop="teamName" label="团组名称" width="180">
+                            <template slot-scope="scope">
+                                <el-popover placement="right" width="400" trigger="click">
+                                    <div style="white-space: pre-line;" v-html="FeeDetailsinfo"></div>
+                                    <div slot="reference" style="cursor: pointer;"
+                                        @click="GetSyntheticalReceivableFeeDetails(scope.row)">
+                                        {{scope.row.teamName}}
+                                    </div>
+                                </el-popover>
+                            </template>
                         </el-table-column>
                         <el-table-column prop="visitDate" label="出访时间" width="100">
                         </el-table-column>
@@ -67,30 +73,28 @@
                         </el-table-column>
                         <el-table-column prop="prClient" label="收款单位" width="180">
                             <template slot-scope="scope">
-                                <el-popover
-                                placement="top"
-                                width="300"
-                                trigger="hover">
+                                <el-popover placement="top" width="300" trigger="hover">
                                     {{scope.row.prClient}}
-                                    <span style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden;cursor: pointer;color: #48a2ff;" slot="reference">{{scope.row.prClient}}</span>
+                                    <span
+                                        style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden;cursor: pointer;color: #48a2ff;"
+                                        slot="reference">{{scope.row.prClient}}</span>
                                 </el-popover>
                             </template>
                         </el-table-column>
                         <el-table-column prop="schedule" label="收款进度">
                             <template slot-scope="scope">
-                                <el-popover
-                                placement="top"
-                                width="300"
-                                trigger="hover">
+                                <el-popover placement="top" width="300" trigger="hover">
                                     {{scope.row.schedule}}
-                                    <span style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden;cursor: pointer;color: #48a2ff;" slot="reference">{{scope.row.schedule}}</span>
+                                    <span
+                                        style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden;cursor: pointer;color: #48a2ff;"
+                                        slot="reference">{{scope.row.schedule}}</span>
                                 </el-popover>
                             </template>
                         </el-table-column>
                     </el-table-column>
                 </el-table>
             </div>
-            
+
         </div>
     </div>
 </template>
@@ -132,6 +136,7 @@ export default {
             total_balance:'0.00',
             total_fr:'0.00',
             total_pr:'0.00',
+            FeeDetailsinfo:'',
         };
     },
     methods:{
@@ -143,8 +148,8 @@ export default {
             }
         },
         datechange(){
-            console.log(this.getdate(this.value2[0]))
-            console.log(this.getdate(this.value2[1]))
+            // console.log(this.getdate(this.value2[0]))
+            // console.log(this.getdate(this.value2[1]))
             this.PostSyntheticalReceivableByDateRange(this.getdate(this.value2[0]),this.getdate(this.value2[1]),1)
         },
         getdate(val){
@@ -179,7 +184,7 @@ export default {
                     requestType: requestType,
                 }
             }).then(function (res) {
-                console.log(res)
+                // console.log(res)
                 if(res.data.code==200){
                    window.open(res.data.data.url);
                 }
@@ -203,7 +208,7 @@ export default {
                     groupName:that.input
                 }
             }).then(function (res) {
-                console.log(res)
+                // console.log(res)
                 if(res.data.code==200){
                     that.tableData=res.data.data.dataList;
                     that.total_fr=res.data.data.total_fr;
@@ -212,8 +217,27 @@ export default {
                 }
             })
         },
+        //获取费用标识
+        GetSyntheticalReceivableFeeDetails(row){
+            this.FeeDetailsinfo='';
+            var url = "/api/Financial/GetSyntheticalReceivableFeeDetails?groupId="+row.diid
+            var that = this
+            this.$axios({
+                method: 'get',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+            }).then(function (res) {
+                if(res.data.code==200){
+                   that.FeeDetailsinfo=res.data.data;
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
         rowClassName({ row, rowIndex }) {
-            console.log(row, rowIndex);
+            // console.log(row, rowIndex);
             
             if (rowIndex % 2 === 0) {
                 return 'warning-row';

src/components/OP/AffairsBackward.vue

@@ -153,7 +153,7 @@ export default {
             affairbackwardloading:false,
             porojectname:[],
             porojectindex:[],
-
+            num:0,
         }
     },
     created() {
@@ -399,6 +399,8 @@ export default {
             // }
             // this.tableDatass=this.porojectname.concat(this.tableDatass);
             this.unflattenData();
+            console.log(this.tableData);
+            
             this.flattenData();
             this.getSpanArr();
         },
@@ -407,17 +409,18 @@ export default {
             this.unflattenData();
             console.log(this.tableData);
             console.log(val);
+            this.num++;
             for (let k = 0; k < this.tableData.length; k++) {
                 if(this.tableData[k].title==val){
                     this.tableData.splice(k+1, 0, 
                         {
-                            title: '新项目'+k,
+                            title: '新项目'+this.num,
                             itmes: [{
                                 id: 0,
                                 dataDetails: '',
                                 details: '',
                                 remark: '',
-                                identification: '新项目'+k,
+                                identification: '新项目'+this.num,
                             }]
                         }
                     );