1 积分结算 + 下单 同行门店联系人选择

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -1215,6 +1215,17 @@ export default {
         else if(rowData.ZhaiYao =='车辆折旧' || rowData.ZhaiYao =='营业税金及附加' || rowData.ZhaiYao =='净利润(亏损)' || rowData.ZhaiYao =='营业利润(亏损)'|| rowData.ZhaiYao =='管销费用'){
           //不跳转
         }
+        else if(rowData.ZhaiYao=="会员返利成本" ||rowData.ZhaiYao=="会员返利收入"){
+          this.$router.push({
+              path: "/MemberSettlement",
+              query: {
+                year:rowData.Year,
+                month:month,
+                BranchId:rowData.BranchId,
+                blank: "y"
+              }
+            });
+        }
         else{
           that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId)
         }

src/components/FinancialModule/ReportForm/MemberSettlement.vue

@@ -139,37 +139,39 @@
             <ul class="clearfix">
                 <li class="hight_query">
                     <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList(),getIntegralPageList()">{{$t('pub.searchBtn')}}</button>
-                    <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
+                    <!-- <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button> -->
                 </li>
             </ul>
             <div style="width:100%;display:flex;">
-            <div style="width:25%;display:inline-block;border-right:1px solid #E5e5e5;border-bottom:1px dashed #E5e5e5;padding:5px 0px;">
-                <div  class="JumpDivTitleOne" style="margin-bottom:15px; font-size: 17px">常规单据</div>
-                <div class="JumpDivTitleOne">{{$t('fnc.ysjine')}}：{{SumYingShou}} <span class="JumpSpan">{{$t('objFill.shishoujine')}}：{{SumShiShou}}</span> {{$t('Operation.Op_daishou')}}：{{SumDaiShou}}</div>
-                <div class="JumpDivTitleTwo">{{$t('objFill.yingfujine')}}：{{SumYingFu}} <span class="JumpSpan">{{$t('fnc.sfjine')}}：{{SumShiFu}}</span> {{$t('objFill.v101.FinancialModule.daifuje')}}：{{SumDaiFu}}</div>
+            <div style="width:20%;display:inline-block;border-right:1px solid #E5e5e5;border-bottom:1px dashed #E5e5e5;padding:5px 0px;">
+                <div  class="JumpDivTitleOne" style="margin-bottom:15px; font-size: 17px">幸福存折</div>
+                <div class="JumpDivTitleOne">收入：{{BalanceIncome}} <span class="JumpSpan">成本：{{BalanceCost}}</span></div>
             </div>
-           <div style="border-right:1px solid #E5e5e5; border-bottom:1px dashed #E5e5e5; width:15%;padding:5px 0px;">
-            <div  class="JumpDivTitleOne" style="margin-bottom:15px;font-size: 17px">{{$t('fnc.tanxiaoinfo')}}</div>
-            <div class="JumpDivTitleOne">{{$t('fnc.tanxiaomoney')}}：{{TotalAmortization}}  </div>
+           <div style="border-right:1px solid #E5e5e5; border-bottom:1px dashed #E5e5e5; width:20%;padding:5px 0px;">
+            <div  class="JumpDivTitleOne" style="margin-bottom:15px;font-size: 17px">积分兑换</div>
+            <div class="JumpDivTitleOne">收入：{{IntegralIncome}} <span class="JumpSpan">成本：{{IntegralCost}}</span></div>
            </div>
            <div style="border-bottom:1px dashed #E5e5e5; width:15%;padding:5px 0px;">
             <div  class="JumpDivTitleOne" style="margin-bottom:15px;font-size: 17px">{{$t('fnc.a_heji')}}</div>
-            <div class="JumpDivTitleOne">{{$t('fnc.jine')}}：{{(SumYingFu-SumYingShou+TotalAmortization).toFixed(2)}}  </div>
+            <div class="JumpDivTitleOne">{{$t('fnc.jine')}}：{{(BalanceIncome-BalanceCost+IntegralIncome-IntegralCost).toFixed(2)}}  </div>
            </div>
 
            
         </div>
         </div>
-        <div class="_fnDm_content" v-loading='CZloading' >
+        <div class="_fnDm_content _fnDm_contenteltable" v-loading='CZloading' >
             <p style="margin-bottom:5px;">幸福存折结算</p>
             <el-table ref="multipleTable" :data="CZDataList" tooltip-effect="dark" style="width: 100%"  row-key="Id">
-              <el-table-column prop="OrderId" label="订单号">
-              </el-table-column>
               <el-table-column prop="Type" label="类型">
                 <template slot-scope="scope">
                   <span>{{(scope.row.Type==1?'收入':'成本')}}</span>
                 </template>
               </el-table-column>
+              <el-table-column prop="OrderId" label="订单号">
+                <template slot-scope="scope">
+                  <span @click="goTravelOrder(scope.row.OrderId)" style="color:#409eff; cursor: pointer;">{{scope.row.OrderId}}</span>
+                </template>
+              </el-table-column>
               <el-table-column prop="TCNUM" label="团号">
               </el-table-column>
               <el-table-column prop="BName" label="公司别">
@@ -178,27 +180,61 @@
               </el-table-column>
               <el-table-column prop="Money" label="金额">
               </el-table-column>
-              <el-table-column prop="UpdateTime" label="时间">
-              </el-table-column>
-              <el-table-column prop="UseOrderId" label="使用单号">
-              </el-table-column>
-              <el-table-column prop="UseTCNUM" label="使用团号">
+              <el-table-column prop="UpdateTime" label="抵用日期">
               </el-table-column>
-              <el-table-column prop="UseBName" label="使用公司">
+              <el-table-column prop="Type" label="客人抵用团费信息" width="400">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.Type==2">同行在【{{scope.row.UseOrderId}}/{{scope.row.UseTCNUM}}/{{scope.row.UseBName}}】使用幸福存折抵扣团费{{scope.row.UseMoney}}，由此团反的幸福存折承担成本{{scope.row.Money}}</span>
+                  <span v-else>同行使用幸福存折抵扣{{scope.row.Money}}团费</span>
+                </template>
               </el-table-column>
             </el-table>
+            <el-pagination background @current-change="handleCurrentChangeCZ" layout="total,prev, pager, next, jumper"
+              :page-size="msgCZ.pageSize" :total='CZtotal'>
+            </el-pagination>
         </div>
 
-  <div class="_fnDm_content _fnDm_contenteltable" v-loading='JFloading' style="margin-top:10px;">
-    <p style="margin-bottom:5px;">积分结算</p>
+  <div class="_fnDm_content _fnDm_contenteltable" v-loading='JFloading' style="margin-top:20px;">
+    <p style="margin-bottom:5px;">积分兑换结算</p>
       <el-table ref="multipleTable" :data="JFDataList" tooltip-effect="dark" style="width: 100%"  row-key="Id">
-        <el-table-column prop="OrderId" :label="$t('fnc.danhao')" width="90">
+        <el-table-column prop="Type" label="类型">
+                <template slot-scope="scope">
+                  <span>{{(scope.row.Type==1?'收入':'成本')}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="OrderId" label="订单号">
                 <template slot-scope="scope">
-            <span 
-                style="text-decoration: underline;cursor: pointer;font-weight: bold"  @click="goUrlDetail('FinancialDocumentsDetail',scope.row)">{{scope.row.OrderId}}</span>
+                  <span v-if="scope.row.OrderType==2">{{scope.row.OrderId}}</span>
+                  <span v-else @click="goTravelOrder(scope.row.OrderId)" style="color:#409eff; cursor: pointer;">{{scope.row.OrderId}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="Type" label="订单类型">
+                <template slot-scope="scope">
+                  <span>{{(scope.row.OrderType==2?'电商订单':'ERP订单')}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="TCNUM" label="团号">
+              </el-table-column>
+              <el-table-column prop="BName" label="公司别">
+              </el-table-column>
+              <el-table-column prop="CustomerName" label="客户">
+              </el-table-column>
+              <el-table-column prop="IntegralNum" label="积分数量">
+              </el-table-column>
+              <el-table-column prop="Money" label="金额">
+              </el-table-column>
+              <el-table-column prop="CreateTime" label="兑换日期">
+              </el-table-column>
+              <el-table-column prop="Type" label="描述" width="400">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.Type==2">同行在【{{scope.row.Description}}】兑换商品，其中抵扣佣金{{scope.row.UseCommission}}，由此团反的积分承担成本【{{scope.row.IntegralNum}}/{{scope.row.UseIntegral}}】</span>
+                  <span v-else>{{scope.row.Description}}，其中不返佣金{{scope.row.MallCommission}}</span>
                 </template>
               </el-table-column>
       </el-table>
+      <el-pagination background @current-change="handleCurrentChangeJF" layout="total,prev, pager, next, jumper"
+              :page-size="msgJF.pageSize" :total='JFtotal'>
+            </el-pagination>
   </div>
     </div>
 </template>
@@ -264,13 +300,11 @@ export default {
     },
     mounted(){
         this.getCompanyList();
-        // this.getPageList();
-        // this.getIntegralPageList();
-    },methods:{
-        handleCurrentChanges(val){
-            this.pageIndex = this.msg.pageIndex = val;
+        if(this.$route.query.year && this.$route.query.month){
           this.getPageList();
-        },
+          this.getIntegralPageList();
+        }
+    },methods:{
         getPageList(){  // 获取列表数据
             this.CZloading= true;
             this.msgCZ.StartTime = this.transactionDate[0];
@@ -327,8 +361,12 @@ export default {
                 }else{}
             },err=>{})
         },
-        handleCurrentChange(val) { //翻页
-            this.msg.pageIndex = val;
+        handleCurrentChangeJF(val) { //翻页
+            this.msgJF.pageIndex = val;
+            this.getIntegralPageList();
+        },
+        handleCurrentChangeCZ(val){
+            this.msgCZ.pageIndex = val;
             this.getPageList();
         },
         resetPageIndex(){  // 重置页码
@@ -336,7 +374,16 @@ export default {
             this.currentCZPage = 1;
             this.msgJF.pageIndex=1;
             this.currentJFPage = 1;
+        },
+        goTravelOrder(orderId) {
+          this.$router.push({
+            path: "enrollTotal",
+            query: {
+              OrderId: orderId,
+              blank: 'y'
             }
+          })
+      },
     }
 }
 </script>

src/components/SalesModule/Common/CustomerContactList.vue

@@ -80,6 +80,11 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="IntegralNum"
+        :label="$t('objFill.v101.activity.jifen')"
+        show-overflow-tooltip width="80">
+    </el-table-column>
     <el-table-column
         prop=""
         :label="$t('hotel.table_operat')"

src/components/orderCommon/order-form2.vue

@@ -131,13 +131,27 @@
           <!--同行Id-->
           <el-form-item :label="$t('salesModule.CustomerStore')" prop="CustomerId">
             <el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')"
-              @change="changeCustomer(),GetAutoCouponOrder()">
+              @change="changeCustomer(),GetAutoCouponOrder(),getCustomerChildrenList()">
               <el-option v-for="(item, index) in customerList" :label="item.customerName + '-' + item.contact"
                 :value="item.customerId" :key="index">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="4" v-if="
+            addMsg.CustomerType == 1 ||
+            addMsg.CustomerType == 2 ||
+            addMsg.CustomerType == ''
+          ">
+          <!--同行联系人Id-->
+          <el-form-item :label="$t('hotel.suplier_contact')" prop="CustomerChildrenId">
+            <el-select v-model="addMsg.CustomerChildrenId" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option v-for="(item, index) in customerChildrenList" :label="item.contactName +'-'+item.contactPhone+ '/' + item.contactDuty"
+                :value="item.id" :key="index">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="4" v-show="addMsg.GroupType == 2">
           <!--行业-->
           <el-form-item :label="$t('salesModule.HYLB')" prop="IndustryCategory">
@@ -782,6 +796,7 @@
           ContactName: "",
           ContactMobile: "",
           CustomerId: "",
+          CustomerChildrenId:"",
           DepartureCityId: "0",
           ReturnArriveCityId: "",
           IsIntermodal: "2",
@@ -847,6 +862,11 @@
             message: this.$t('objFill.qingxzkhmd'),
             trigger: "change",
           }, ],
+          CustomerChildrenId: [{
+            required: true,
+            message: this.$t('objFill.qingxzkhmd')+this.$t('hotel.suplier_contact'),
+            trigger: "change",
+          }, ],
           ManNum: [{
             required: true,
             message: this.$t('objFill.v101.myOrdersAllType.qingtianxcrrs'),
@@ -978,6 +998,7 @@
         customerBrandList: [], //客户平平列表
         clientSourceList: [], //客人来源列表
         customerList: [], //客户列表
+        customerChildrenList: [], //客户联系人
         joinTypeList: [], //参团类型列表
         tradeWayList: [], //交易方式列表
         ScenicRefundList: [], //可退景点列表
@@ -1613,6 +1634,8 @@
       resetSelect() {
         if (this.addMsg.CustomerType == 1 || this.addMsg.CustomerType == 2) {
           this.addMsg.CustomerId = "";
+          this.addMsg.CustomerChildrenId ="";
+          this.customerChildrenList=[];
         }
       },
       //清空联系人和联系电话
@@ -2011,6 +2034,7 @@
             ContactName: "",
             ContactMobile: "",
             CustomerId: "",
+            CustomerChildrenId: "",
             DepartureCityId: "0",
             ReturnArriveCityId: "",
             IsIntermodal: "2",
@@ -2385,6 +2409,20 @@
           (err) => {}
         );
       },
+      getCustomerChildrenList(){
+        this.apipost(
+          "app_today_visit_GerOrderCustomerChildrenList", {CustomerId: this.addMsg.CustomerId},
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.customerChildrenList = res.data.data;
+              if(this.customerChildrenList && this.customerChildrenList.length>0){
+                this.addMsg.CustomerChildrenId = this.customerChildrenList[0].id;
+              }
+            }
+          },
+          (err) => {}
+        );
+      },
       //获取客户来源
       getClientSource() {
         this.addMsg.ClientSource = "";