update

src/components/FinancialModule/OPcommissionPeriods.vue

@@ -71,7 +71,7 @@
                   <tr>
                       <th>公司</th>
                       <th>制单人</th>
-                      <th width="47%">单据</th>
+                      <th width="56%">单据</th>
                       <th>制单时间</th>
                   </tr>
                   <tr v-for="(item,index) in djList" :key="index">
@@ -85,7 +85,7 @@
                     <td>{{item.CreateDate}}</td>
                   </tr>
                   <tr v-if="djList.length==0">
-                    <td colspan="4">暂无数据</td>
+                    <td style="text-align:center" colspan="4">暂无数据</td>
                   </tr>
               </table>
               <el-button @click="Chankan(item)" style="margin-left:5px" slot="reference" type="warning" class="CM_look" icon="iconfont icon-caidan-fill" circle></el-button>

src/components/FinancialModule/OpComPersonDetails.vue

@@ -47,6 +47,10 @@
                </li>
            </ul>
        </div>
+       <div style="margin:15px 0">
+           <span>提成总金额：{{totalInfo.TotalMoney}}</span>
+           <span>收客总人数：{{totalInfo.TotalNum}}</span>
+       </div>
        <div class="cm_content _scrollbar">
           
            <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
@@ -119,7 +123,8 @@
                 currentPage:1,
                 total:0,
                 EmployeeList:[],
-                companyList:[]
+                companyList:[],
+                totalInfo:{},
 			}
 		},created(){        
             this.msg.PeriodsId=this.$route.query.PeriodsId?this.$route.query.PeriodsId:this.msg.PeriodsId;
@@ -168,8 +173,10 @@
                 this.apipost('sellcommission_GetOPCommissionSingleDetailsList', this.msg, res => {
                     this.loading=false;
                     if(res.data.resultCode == 1) {
-                        this.DataList = res.data.data.pageData;
-                        this.total=res.data.data.count;
+                        console.log("res.data",res.data)
+                        this.DataList = res.data.data.pmodel.pageData;
+                        this.total=res.data.data.pmodel.count;
+                        this.totalInfo=res.data.data;
                     } else {
                         this.Error(res.data.message);
                     }

src/components/Ticketing/TicketManager.vue

@@ -2285,10 +2285,17 @@
 
                 </tr>
                 <tr v-for="(item,index) in MsgRAirServiceList" :key="index">
-                    <td><input style="position: relative;top: 2px;" type="checkbox" :value="item.TCID" v-model="customerList"/>{{item.TCNUM}}({{item.TCID}})</td>
+                    <td><input style="position: relative;top: 3px;display: inline-block;width: 15px;height: 15px;" type="checkbox" :value="item.TCID" v-model="customerList"/>
+                      {{item.TCNUM}}({{item.TCID}}){{item.OutBranchName}}
+                    </td>
                     <td><el-input size="small" style="width:150px" v-model="item.TicketNum"  @keyup.native="checkInteger(item,'TicketNum')"></el-input></td>
                     <td><el-input size="mini" style="width:150px" v-model="item.Money" @keyup.native="checkPrice(item,'Money')"></el-input></td>
-                    <td><el-input style="width:150px" v-model="item.Remark"></el-input></td>
+                    <td>
+                      <el-input style="width:150px" v-model="item.Remark"></el-input>
+                      <el-select style="width:100px" @change="SelectFinaceId(FinaceIdnum,index)" v-model="FinaceIdnum" :placeholder="$t('pub.pleaseSel')">
+                        <el-option v-for="(item,index) in AirSeritem" :key="index" :label="item.FinaceId" :value="item.FinaceId"></el-option>
+                      </el-select>
+                    </td>
                 </tr>
                 <tr v-if="MsgRAirServiceList.length==0">
                   <td colspan="5">暂无数据</td>
@@ -2343,7 +2350,7 @@
             </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="moneyR = false">取 消</el-button>
+        <el-button size="small" @click="moneyR = false,FinaceIdnum=''">取 消</el-button>
         <el-button :loading="Btnloading" size="small" type="danger" @click="RSumbit">确 定</el-button>
     </span>
 </el-dialog>
@@ -2360,6 +2367,8 @@
         }
       }
       return {
+        FinaceIdnum:'',
+        AirSeritem:[],
         fklxStr:'虚拟结算',
         jsbmStr:'总部票务部',
         currencyTypeList:[],
@@ -2654,7 +2663,38 @@
       };
     },
     methods: {
+      SelectFinaceId(val,index){
+        this.MsgRAirServiceList[index].Remark=`关联单据:${val}`;
+      },
       TikcetServiceCharge(item){
+        this.AirSeritem=[];
+        if(item.FirstAuditList&&item.FirstAuditList.length>0){
+          item.FirstAuditList.forEach(fin=>{
+            this.AirSeritem.push(fin);
+          })
+        }
+        if(item.SecondAuditList  && item.SecondAuditList.length>0){
+          item.SecondAuditList.forEach(fin=>{
+            this.AirSeritem.push(fin);
+          })
+        }
+        if(item.ThirdAuditList  &&item.ThirdAuditList.length>0){
+          item.ThirdAuditList.forEach(fin=>{
+            this.AirSeritem.push(fin);
+          })
+        }
+        if(item.FourthAuditList&&item.FourthAuditList.length>0){
+          item.FourthAuditList.forEach(fin=>{
+            this.AirSeritem.push(fin);
+          })
+        }
+        if(item.FinalAuditList&&item.FinalAuditList.length>0){
+          item.FinalAuditList.forEach(fin=>{
+            this.AirSeritem.push(fin);
+          })
+        }
+        
+
         this.moneyR=true;
         this.MsgRAirServiceList=[];
         item.PriceList.forEach(price=>{
@@ -2667,6 +2707,7 @@
             TicketNum:price.TicketNum,
             disabled:price.disabled,
             Remark:"",
+            OutBranchName:price.OutBranchName,
             
           };
           this.MsgRAirServiceList.push(obj);
@@ -2722,6 +2763,7 @@
               if(res.data.resultCode==1){
                   this.Success(res.data.message)
                   this.initMsg();
+                  this.FinaceIdnum='',
                   this.moneyR=false;
                   this.getList();