Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1598,7 +1598,7 @@ export default {
         return this.priceFormat(rowData.YongJinShouRu);
       if (field === "YingFu") return this.priceFormat(rowData.YingFu);
       if (field === "MaoLi") return this.priceFormat(rowData.MaoLi);
-      if (field === "MaoLiRate") return this.priceFormat(rowData.MaoLiRate*100)+'%';
+      if (field === "MaoLiRate") return rowData.MaoLiRate+'%';
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);

src/components/SalesModule/groupTourOrder.vue

@@ -687,6 +687,41 @@
     font-size: 14px;
     vertical-align: top;
   }
+
+   .Ysze{
+    position: relative;
+  }
+  .Ysze .changeYsze{
+    position: absolute;
+    left: 110%;
+    z-index: 10000;
+    top: 0;
+    width: 700px;
+    background: #fff;
+    box-shadow: 0 0 8px #888;
+    padding:10px;
+    box-sizing: border-box;
+  }
+  .Ysze .Ysze-button{
+    position: absolute;
+    left: 98%;
+    top:3px;
+    border-radius: 4px;
+    cursor: pointer;
+  }
+  .Ysze .changeYsze .el-form-item{
+    display: inline-block;
+    width:30%;
+    margin-bottom: 5px;
+  }
+  .Ysze .changeYsze .el-icon-close{
+    position: absolute;
+    right: 6px;
+    top:6px;
+    color: #f78989;
+    font-size:20px;
+    cursor: pointer;
+  }
 </style>
 
 <template>
@@ -904,10 +939,59 @@
               <el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="4" class="Ysze">
             <el-form-item label="应收总额" prop="PreferPrice">
               <el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input>
             </el-form-item>
+            <button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="background: rgb(0, 198, 255); border-color: rgb(0, 198, 255);">
+                <i class="iconfont icon-nav-hangzheng" style="font-size:12px"></i>
+                </button>
+              <!-- 修改应收总额 -->
+              <div class="changeYsze" v-show="Ysze">
+                  <el-form  :model="addMsg_form" ref="addMsg_form"  label-position="right" label-width="100px">
+                      <span class="el-icon-close" @click="Ysze=false"></span>
+                    <el-form-item label="签证费">
+                        <el-input v-model='addMsg_form.VisaPrice' :disabled="true"></el-input>
+                    </el-form-item>
+                    <el-form-item label="退签证费">
+                        <el-input v-model='addMsg_form.BackVisaPrice'  :disabled="true"></el-input>
+                    </el-form-item>
+                     <el-form-item label="杂费">
+                        <el-input v-model='addMsg_form.OtherPrice'  :disabled="true"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="老人附加费">
+                        <el-input v-model='addMsg_form.OldManChargePrice'  :disabled="true"></el-input>
+                    </el-form-item>
+                    <el-form-item label="儿童附加费">
+                        <el-input v-model='addMsg_form.BabyChargePrice'  :disabled="true"></el-input>
+                    </el-form-item>
+                    <el-form-item label="单房差">
+                        <el-input v-model='addMsg_form.SingleRoomPrice'  :disabled="true"></el-input>
+                    </el-form-item>
+                   
+                    <el-form-item label="儿童占床增收">
+                        <el-input v-model='addMsg_form.ChildNeedPrice'  :disabled="true"></el-input>
+                    </el-form-item>
+                    <el-form-item label="儿童不占床减免">
+                        <el-input v-model='addMsg_form.ChildNoNeedPrice'  :disabled="true"></el-input>
+                    </el-form-item>
+                     <el-form-item label="收损金额">
+                        <el-input v-model='addMsg_form.OpSetLossMoney'  :disabled="true"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="单地接">
+                        <el-input v-model='addMsg_form.SingleDMCPrice'  :disabled="true"></el-input>
+                    </el-form-item>
+                    <el-form-item label="婴儿价">
+                        <el-input v-model='addMsg_form.BabyPrice'  :disabled="true"></el-input>
+                    </el-form-item>
+                    <!-- <el-form-item v-if="IsUpdateOrderMoney">
+                        <el-button type="primary" style="padding:6px 15px" @click="submitYSZEForm">确定</el-button>
+                         <el-button type="danger" style="padding:6px"  @click="Ysze=false">关闭</el-button> -->
+                    <!-- </el-form-item> -->
+                  </el-form >
+              </div>
           </el-col>
           <el-col :span="4">
             <el-form-item label="预计提成" prop="Commission">
@@ -1730,6 +1814,10 @@
   export default {
     data () {
       return {
+        // 修改应收总额
+      Ysze:false,
+      addMsg_form:{},
+
         pickerOptions0: {
           disabledDate: time => {
             let starTime = new Date(this.starTime)
@@ -1985,6 +2073,11 @@
       }
     },
     methods: {
+      // 给其他费用赋值
+      Yszefz(){
+        this.Ysze=true;
+        this.addMsg_form=Object.assign({},this.addObj);
+      },
       //跳转
       goUrlTS (path, id, orderId, title) {
         this.$router.push({
@@ -2406,6 +2499,7 @@
         this.remarksMsg.isOrder = obj.isOrder
       },
       getDetail (obj) {
+        this.Ysze=false;
         this.starTime = obj.startDate
         this.endTime = obj.backDate
         this.getMinPrice(obj.orderId)
@@ -2418,9 +2512,13 @@
             if (res.data.resultCode == 1) {
               this.IsUnion = res.data.data.IsUnion
               this.isAllowUpdate = res.data.data.IsUpdatePlatOrder
-              this.addObj = res.data.data.modelPrice
-              let x = res.data.data.model
-              this.addMsg = x
+              this.addObj = res.data.data.modelPrice         
+              let x = res.data.data.model;
+
+              this.addObj.OrderId=x.OrderId;
+              this.addObj.OpSetLossMoney=x.OpSetLossMoney;
+
+              this.addMsg = x;
               this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr
               this.addMsg.PlatformAccount = ''
               this.getScenicRefund(obj.tcid)

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -179,7 +179,19 @@
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_lirun">
                     <i class="iconfont icon-qian"></i>
-                  </span>提成
+                  </span>联运成本
+                </div>
+                <div class="Team_Incontent">
+                  <div>联运成本<span>￥{{DataList.LYCB}}</span></div>
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="4">
+              <div class="Team_DList">
+                <div class="Team_firstTitle">
+                  <span class="Team_comCoinType Team_lirun">
+                    <i class="iconfont icon-qian"></i>
+                  </span>提成（无单据）
                 </div>
                 <div class="Team_Incontent">
                   <div>预计提成<span>￥{{DataList.ExpectedCut}}</span></div>
@@ -209,7 +221,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FiniceReciveList">
-            <tr v-if="isExists(item.CostTypeList,'团费')">
+            <tr v-if="isExists(item.CostTypeList,'团费') || isExists(item.CostTypeList,'团款')">
               <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
               <td>
@@ -429,7 +441,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FiniceReciveList">
-            <tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入')&& NotExists(item.CostTypeList,'自费收入')&& NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
+            <tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'团款') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入') && NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
               <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
               <td>
@@ -1189,7 +1201,7 @@
         this.$router.push({
           name: path,
           query: {
-            id: id
+            id: id,blank: "y"
           }
         });
       },

src/components/dmc/manager/dmcTotalTable.vue

@@ -256,7 +256,8 @@
                 <div class="link">
                   <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
                   <div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
-                  <div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
+                  <div v-show="outItem.StaticsReportList[index].OPInnerRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPInnerRemark}}</div>
+                  <div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP对外备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
                   <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
                 </div>
               </td>