手配费 房费送客手数料调整

src/components/FinancialModule/HandFee/HandFeeStatistics.vue

@@ -124,7 +124,8 @@
         <span>已选数据：</span>
         <template v-if="multipleSelection.length>0">
           <el-tag size="mini" closable style="margin-right: 5px;margin-bottom: 5px;"
-            v-for="(x,index) in multipleSelection" :key="x.FinanceId" @close="handleClose([multipleSelection[index]])">
+            v-for="(x,index) in multipleSelection" :key="x.FinanceId" @close="handleClose([multipleSelection[index]])"
+            :type="x.CostTypeId==1851?'warning':''">
             {{x.FinanceId}}/{{x.CurrencyName+':'+x.OriginalMoney}}
           </el-tag>
         </template>
@@ -133,11 +134,12 @@
         </template>
       </div>
       <div style="margin-left: 20px;flex-shrink: 0;">
-        总金额：{{totalZD}}
+        总金额：{{totalZD+totalZDFY}}
       </div>
     </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 ref="multipleTable" :data="DataList" tooltip-effect="dark"
+       style="width: 100%" row-key="FinanceId"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" :reserve-selection="true" :selectable="selectable" width="55">
         </el-table-column>
@@ -211,9 +213,12 @@
       <template>
         <div style="color: black;font-size: 17px;padding: 0 0 10px 10px;border-bottom: 1px solid #EBEEF5;">
           <p>已选中{{multipleSelection.length}}条数据</p>
-          <p style="margin-top: 15px;">原币总金额：
+          <p style="margin-top: 15px;">手配总金额：
             {{totalZD.toFixed(2)}}
           </p>
+          <p style="margin-top: 15px;">返佣总金额：
+            {{totalZDFY.toFixed(2)}}
+          </p>
         </div>
         <div slot="footer" class="dialog-footer">
           <button class="hollowFixedBtn" @click="iszhidanBox=false">{{$t('pub.cancelBtn')}}</button>
@@ -341,6 +346,8 @@
         totalBW2: 0,
         totalZD: 0,
         totalBWZD: 0,
+        totalZDFY: 0,
+        totalBWZDFY: 0,
         ChineseStr: '',
         mathNumber: '',
         DepartIDs: '',
@@ -408,12 +415,22 @@
         let Money = 0
         let totalZD = 0
         let totalBWZD = 0
+        let totalZDFY = 0
+        let totalBWZDFY = 0
         this.multipleSelection.forEach(x => {
-          totalZD += (x.OriginalMoney * 100)
-          totalBWZD += (x.Money * 100)
+          if(x.CostTypeId==1851){
+            totalZDFY += (x.OriginalMoney * 100)
+            totalBWZDFY += (x.Money * 100)
+          }else{
+            totalZD += (x.OriginalMoney * 100)
+            totalBWZD += (x.Money * 100)
+          }
+
         })
         this.totalZD = totalZD / 100
         this.totalBWZD = totalBWZD / 100
+        this.totalZDFY = totalZDFY / 100
+        this.totalBWZDFY = totalBWZDFY / 100
       },
       handleClose(rows) {
         if (rows) {
@@ -461,6 +478,10 @@
         }
         this.getMoney()
         this.BillMakingMsg.Money = this.totalZD
+        this.BillMakingMsg.Money2 = this.totalZDFY
+        this.BillMakingMsg.hiddenAddType = true
+        this.BillMakingMsg.CostType = 130
+        this.BillMakingMsg.CostType2 = 1851
         this.iszhidanBox = true
         this.loadingStandard = true
         this.apipost('Financial_post_SetFinanceHandFeeCode', {

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -469,7 +469,7 @@
               </td>
             </tr>
           </template>
-          <tr @keyup.enter="addList(1)">
+          <tr @keyup.enter="addList(1)" v-if="!orderObj.hiddenAddType">
             <td>
               <el-select filterable v-model='detailList.CostTypeId' :placeholder="$t('rule.qxzfyshuoming')"
                 @change="getCostTypeName(detailList.CostTypeId),addList(1)" class="w200 _border_b_1">
@@ -1969,10 +1969,59 @@
             if (this.orderObj) {
               this.msg.OrderID = this.orderObj.OrderID ? this.orderObj.OrderID : 0;
               this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource ? this.orderObj.OrderSource : 0;
-              this.msg.CostTypeId = this.orderObj.CostType ? this.orderObj.CostType : '';
-              this.detailList.CostTypeId = this.orderObj.CostType ? this.orderObj.CostType : '';
-              this.detailList.UnitPrice = this.orderObj.Money ? this.orderObj.Money : 0;
-              this.detailList.Number = this.orderObj.CostType ? 1 : 0
+
+              if(this.orderObj.Money&&this.orderObj.CostType
+              &&this.orderObj.Money2&&this.orderObj.CostType2
+              &&this.msg.detailList.length==0){
+                let orderObjMoney = this.$commonUtils.addCommas(Math.round(this.orderObj.Money * 100) / 100);
+                let orderObjMoney2 = this.$commonUtils.addCommas(Math.round(this.orderObj.Money2 * 100) / 100);
+                let obj = {
+                  "ID": 0,
+                  "UnitPrice": this.orderObj.Money,
+                  "UnitPriceTo": orderObjMoney,
+                  "Number": 1,
+                  "Rate": 1,
+                  "CostTypeId": this.orderObj.CostType,
+                  "CurrencyId": 1,
+                  "Remark": "",
+                  "CostTypeName": "用房手配费",
+                  "yTotalPrice": this.orderObj.Money,
+                  "yTotalPriceTo": orderObjMoney,
+                  "bTotalPrice": this.orderObj.Money,
+                  "bTotalPriceTo": orderObjMoney,
+                  "show": true,
+                  "currenName": "",
+                  "ybFee": 0,
+                  "bbFee": 0
+                }
+                let obj2 = {
+                  "ID": 0,
+                  "UnitPrice": this.orderObj.Money2,
+                  "UnitPriceTo": orderObjMoney2,
+                  "Number": 1,
+                  "Rate": 1,
+                  "CostTypeId": this.orderObj.CostType2,
+                  "CurrencyId": 1,
+                  "Remark": "",
+                  "CostTypeName": "房费送客手数料",
+                  "yTotalPrice": this.orderObj.Money2,
+                  "yTotalPriceTo": orderObjMoney2,
+                  "bTotalPrice": this.orderObj.Money2,
+                  "bTotalPriceTo": orderObjMoney2,
+                  "show": false,
+                  "currenName": "",
+                  "ybFee": 0,
+                  "bbFee": 0
+                }
+                this.msg.detailList.push(obj)
+                this.msg.detailList.push(obj2)
+              }else{
+                this.msg.CostTypeId = this.orderObj.CostType ? this.orderObj.CostType : '';
+                this.detailList.CostTypeId = this.orderObj.CostType ? this.orderObj.CostType : '';
+                this.detailList.UnitPrice = this.orderObj.Money ? this.orderObj.Money : 0;
+                this.detailList.Number = this.orderObj.CostType ? 1 : 0
+              }
+
               this.msg.TCID = this.orderObj.TCID ? this.orderObj.TCID : 0;
               this.msg.TCIDList = this.orderObj.TCIDList ? this.orderObj.TCIDList : [];
               this.msg.Obj = this.orderObj.Obj ? this.orderObj.Obj : '';
@@ -2178,7 +2227,7 @@
       } else {
         this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null;
         if (this.orderObj && this.orderObj.Money) {
-          this.detailList.UnitPrice = this.orderObj.Money
+          // this.detailList.UnitPrice = this.orderObj.Money
         }
       }