页面修改

src/components/FinancialModule/HandFee/HandFeeQuery.vue

@@ -13,7 +13,6 @@
           <el-col :span="4">
             <el-form-item label="手配费公司：">
               <el-select filterable v-model='msg.KingdeeBranchId' :disabled="!isRB_Depart_Id" class="">
-                <!-- <el-option :value="-1" label="不限"></el-option> -->
                 <el-option v-for='item in GetHandFeeList' :label='item.BranchName' :value='item.BranchId'
                   :key='item.BranchId'>
                 </el-option>
@@ -22,7 +21,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发团日期：">
-              <el-date-picker class="h34" v-model="missionDate" type="daterange" value-format="yyyy-MM-dd">
+              <el-date-picker class="h34" v-model="missionDate" type="daterange" value-format="yyyy-MM-dd"
+                @input="getdatalist">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -36,10 +36,10 @@
     </div>
     <div class="_fnDm_content" v-loading='loading'>
       <el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%" row-key="FinanceId">
-        <el-table-column prop="" label="公司" width="120">
+        <el-table-column prop="" label="公司" width="150">
           <template slot-scope="scope">{{ scope.row.BranchName }}</template>
         </el-table-column>
-        <el-table-column prop="" label="团队信息" width="180">
+        <el-table-column prop="" label="团队信息" width="200">
           <template slot-scope="scope">
             <template v-if="scope.row.OtherType==0">
               {{ scope.row.TCNUM }}({{scope.row.TCID}})
@@ -49,49 +49,61 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column prop="" label="类型" width="120">
+        <el-table-column prop="" label="类型" width="180">
           <template slot-scope="scope">
             <template v-for="(subItem,subIndex) in scope.row.CostTypeList">
               <span :key="subIndex"> {{subItem.CostTypeName}}
               </span>
+              <br :key="subIndex+10000" />
             </template>
           </template>
         </el-table-column>
-        <el-table-column prop="" label="数量" width="120">
+        <el-table-column prop="" label="数量" width="150">
           <template slot-scope="scope">
             <template v-for="(subItem,subIndex) in scope.row.CostTypeList">
               <span :key="subIndex">
                 {{subItem.Number}}
               </span>
+              <br :key="subIndex+20000" />
             </template>
           </template>
         </el-table-column>
-        <el-table-column prop="" label="酒店信息" width="120">
+        <el-table-column prop="" label="金额" width="150">
+          <template slot-scope="scope">
+            <template v-for="(subItem,subIndex) in scope.row.CostTypeList">
+              <span :key="subIndex">
+                {{subItem.Money}}
+              </span>
+              <br :key="subIndex+30000" />
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" label="酒店信息">
           <template slot-scope="scope">
             <template v-if="scope.row.OtherType==0 && scope.row.HotelList&&scope.row.HotelList.length>0">
-              <el-popover width="980" trigger="click" placement="right">
-                <commonHotelInfo :HotelObj="scope.row.HotelList" :showHotelObj="showHotelObj" :TCID="scope.row.TCID"
-                  :TCNUM="scope.row.TCNUM"></commonHotelInfo>
-                <div slot="reference" style="cursor:pointer;">
-                  酒店使用情况
-                </div>
-              </el-popover>
+              <template v-for="(subItem,subIndex) in scope.row.HotelList">
+                <span :key="subIndex+40000"> {{subItem.UseDay}}
+                  <template v-if="subItem.SubList&&subItem.SubList.length>0">
+                    <template v-for="(childItem) in subItem.SubList">
+                      【{{childItem.NewHotelName}}】
+                    </template>
+                  </template>
+                </span>
+                <br :key="subIndex+50000" />
+              </template>
             </template>
           </template>
         </el-table-column>
-        <el-table-column prop="" label="总金额" width="120">
+        <el-table-column prop="" label="总金额" width="150">
           <template slot-scope="scope">
             {{ scope.row.TotalMoney}}
           </template>
         </el-table-column>
       </el-table>
     </div>
-
-
   </div>
 </template>
 <script>
-  import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
   export default {
     data() {
       return {
@@ -121,10 +133,12 @@
     created() {
       let sDate = this.FormartDate(new Date(this.getBeforeDate(1)));
       let eDate = this.FormartDate(new Date(this.getBeforeDate(0)));
-      sDate = '2023-07-01';
+      var now = new Date();
+      var firstDay = new Date(now.getFullYear(), now.getMonth(), 1)
+      sDate = this.FormartDate(firstDay);
+      //sDate = '2023-06-01'
       this.missionDate = [sDate, eDate]
       this.msg.QStartDate = sDate;
-
       this.msg.QEndDate = eDate;
       let userInfo = this.getLocalStorage();
       let ActionMenuCode = userInfo.ActionMenuCode;
@@ -134,13 +148,12 @@
       this.getHandFeeBranch();
     },
     components: {
-      commonHotelInfo,
+
     },
     mounted() {
 
     },
     methods: {
-
       //获取手配费公司
       getHandFeeBranch() {
         this.apipost(
@@ -165,19 +178,16 @@
         );
       },
       getdatalist() {
-        console.log("this.missionDate", this.missionDate)
-        if (this.missionDate) {
-
+        if (this.missionDate && this.missionDate.length == 2) {
           this.msg.QStartDate = this.missionDate[0];
           this.msg.QEndDate = this.missionDate[1];
         }
         this.loading = true;
-
         this.apipost(
           "Financial_post_GetJanpanHandFeeMonthBoard", this.msg,
           res => {
             this.loading = false;
-            console.log("res", res.data);
+
             if (res.data.resultCode == 1) {
               this.DataList = res.data.data;
             }
@@ -187,7 +197,6 @@
           }
         );
       }
-
     }
   }