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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -527,13 +527,31 @@ tr._item_list td:last-child {
             </el-form-item>
           </el-col>
          <el-col :span="4">
-            <el-form-item label="是否联运">
+            <el-form-item label="是否联运：">
               <el-select v-model="msg.Is_Transport" filterable class="w150">
                 <el-option value="-1" label="不限"></el-option>
                 <el-option value="1" label="是"></el-option>
                 <el-option value="0" label="否"></el-option>
               </el-select>
             </el-form-item>
+          </el-col>   
+           <el-col :span="4">
+            <el-form-item label="领队类型：">
+              <el-select v-model="msg.LeaderType" filterable class="w150" @change="GetLeaderList()">
+                <el-option :value="0" label="请选择"></el-option>
+                <el-option :value="1" label="领队"></el-option>
+                <el-option :value="2" label="领兼导"></el-option>
+                <el-option :value="3" label="导游"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>   
+           <el-col :span="4">
+            <el-form-item label="领队/导游：">
+              <el-select v-model="msg.LeaderId" filterable class="w150">
+                 <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+                <el-option v-for="item in LeaderList" :label='item.Name' :value='item.ID' :key='item.ID'></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>   
           <el-col :span="4" v-if="userId==1||userId==5">
               <el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
@@ -815,7 +833,9 @@ export default {
         Type: 1,
         QueryCondition: "-1",
         DataType: "1",
-        Is_Transport:'-1'
+        Is_Transport:'-1',
+        LeaderId:0,
+        LeaderType:0
       },
       getCompanyMsg: {
         // 公司
@@ -838,6 +858,7 @@ export default {
       multipleSort: false,
       kaiqiZzBox: false,
       KaiqiZzTime: [],
+      LeaderList: [],
       kaiqiZzTitle: "",
       kaiqiZzLoading: false,
       kaiqiZzMsg: {
@@ -920,6 +941,28 @@ export default {
           isFrozen: true,
           componentName: "TCNUMJump"
         },
+        {
+          field: "LeaderName",
+          title: "领队",
+          width: 60,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true,
+          result: [],
+          type: "select",
+          isFrozen: true
+        },
+        {
+          field: "GuideName",
+          title: "导游",
+          width: 60,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true,
+          result: [],
+          type: "select",
+          isFrozen: true
+        },
         {
           field: "Is_Transport",
           title: "是否有联运支出",
@@ -1570,6 +1613,23 @@ export default {
           }
         })
       },
+      //获取领队和导游
+      GetLeaderList() {
+        this.LeaderList=[];
+        this.msg.LeaderId=0;
+        let msg = {
+          Type: this.msg.LeaderType,
+        }
+        this.apipost(
+          'leader_post_GetList', msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.LeaderList = res.data.data;
+            }
+          },
+          err => {}
+        )
+      },
       getLineTeamList(lineId,PlaceId) { 
         
         

src/components/SalesVisa/VisaShouSun.vue

@@ -302,7 +302,7 @@
     </div>
 
     <el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center>
-        <commonShouSun ref="childShou" :Type="3" @closeShouSun="closeShouSunDialog"></commonShouSun>
+        <commonShouSun ref="childShou" :Type="3" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
     </el-dialog>
 
   </div>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1495,6 +1495,8 @@
         <input type="button" class="normalBtn"
           @click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)" value="团报" />
 
+        <input type="button" class="normalBtn"
+          @click="goAmoebaDetail(ConfigData.Config.LtName,ConfigData.Config.TCNUM,ConfigData.Config.TCID)" value="阿米巴结算表" />
         <input type="button" class="normalBtn" @click="getOrderInfo()"
           :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" />
         <input type="button" @click="CancelLeader" v-if="ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0"
@@ -1683,6 +1685,7 @@
                       <div v-if="OrderDataList.IsUpdateOrderCommission"
                         @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
                         设置额外金额</div>
+                      <div @click="SetShouSunClick(item.OrderId)">设置收损金额</div>
                       <div @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary"
@@ -1932,7 +1935,7 @@
                         <div @click="toTrip(childItem)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                         <div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
                         <div @click="transfer(childItem)">订单转团</div>
-                        <div @click="OrderLoading=true,OrderLossInfo(childItem)">订单收损</div>
+                        <div @click="OrderLoading=true,OrderLossInfo(childItem)" style="display:none;">订单收损</div>
                         <div
                           @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId,OPRemarkMsg.OP_Remarks=childItem.OP_Remarks'>
                           OP备注</div>
@@ -1950,6 +1953,7 @@
                         <div v-if="OrderDataList.IsUpdateOrderCommission"
                           @click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>
                           设置额外金额</div>
+                        <div @click="SetShouSunClick(childItem.OrderId)">设置收损金额</div>
                         <div @click="lianyunFY(childItem)">联运返佣</div>
                         <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
                           @click='deleteItem(childItem)'>
@@ -2271,6 +2275,7 @@
                       <div v-if="OrderDataList.IsUpdateOrderCommission"
                         @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
                         设置额外金额</div>
+                      <div @click="SetShouSunClick(item.OrderId)">设置收损金额</div>
 
                       <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
                     </div>
@@ -2563,6 +2568,10 @@
       </div>
     </el-dialog>
 
+    <el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center>
+        <commonShouSun ref="childShou" :Type="1" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
+    </el-dialog>
+
 
     <el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
       <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
@@ -2676,6 +2685,7 @@
 <script>
   import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue";
   import updateSalesMan from "../../commonPage/updateSalesMan.vue";
+  import commonShouSun from "../../commonPage/commonShouSun.vue";
   export default {
     data() {
       return {
@@ -2684,6 +2694,8 @@
         addMsg_form: {},
         IsUpdateOrderMoney: false,
         outerVisible: false,
+        //收损金额
+        shousunDialog:false,
         //弹窗
 
         OrderLoading: false,
@@ -3084,16 +3096,26 @@
     },
     components: {
       tripDownLoadCommon: tripDownLoadCommon,
-      updateSalesMan: updateSalesMan
+      updateSalesMan: updateSalesMan,
+      commonShouSun: commonShouSun
     },
     methods: {
+      closeShouSunDialog(){
+        this.shousunDialog=false;
+      },
+      //点击设置收损
+      SetShouSunClick(OrderId){
+        this.shousunDialog=true;
+        this.$nextTick(()=>{
+          this.$refs.childShou.getShouSunList(OrderId);
+        })
+      },
       FyongLossOk: function () {
         let msg = {
           OrderId: this.lianyunFYId,
           IsBackStatus: this.IsBackStatus
         }
         this.apipost('sellorder_post_SetOrderUnionBackMoney', msg, res=>{
-          console.log(res)
           if (res.data.resultCode === 1) {
             this.$message.success(res.data.message)
             this.getList()
@@ -3104,7 +3126,6 @@
         }, null)
       },
       lianyunFY: function (item) {
-        console.log(item)
         this.FyongLoading = true
         this.IsBackStatus = item.IsBackUnionMoney
         this.lianyunFYId = item.OrderId
@@ -4742,6 +4763,19 @@
           }
         });
       },
+      //跳转至阿米巴结算详情
+      goAmoebaDetail(LtName,TCNUM,TCID){
+        this.$router.push({
+          name: "AmoebaDetail",
+          query: {
+            LtName:LtName,
+            TCNUM:TCNUM,
+            TCID: TCID,
+            blank: "y",
+            tab: "阿米巴结算详情"
+          }
+        });
+      },
       //跳转到旅客名单
       goToPassenger(item) {
         this.$router.push({
@@ -4935,7 +4969,6 @@
 
         let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
         this.Unit_PriceList = [];
-        console.log(this.Unit_PriceList)
         this.apipost('sellorder_post_GetLessPrice', {
           "TCID": this.addMsg.TCID,
           "MaxPeopleNum": maxPeopleNum

src/components/busManagement/BusApportionManagement.vue

 <style>
   .BusedHeight {
     display: block !important;
-    height: 450px;
+    height: 550px;
   }
   .FinaceItem span{
     display: inline-block;
@@ -318,6 +318,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8" :gutter="35">
+            <el-form-item label="制单备注">
+                <el-input v-model="addMsg.Remark" type="textarea" rows="2" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
             <el-col :span="4" :gutter="35">
               <el-form-item label="团队编号">
@@ -464,6 +471,7 @@ export default {
               f_rate:'',
               ClientID:0,
               PayDate:'',
+              Remark:'',
               VorList:[]
             },
             dataList: [],
@@ -715,6 +723,7 @@ export default {
               f_rate:'',
               ClientID:0,
               PayDate:'', 
+              Remark:'',
               VorList:[]
           };
           this.Year = '';

src/components/commonPage/commonShouSun.vue

@@ -94,7 +94,7 @@
                             收损总额：<span class="TotalShouSun">{{totalSun}}</span>
                         </span>
                         <span class="totalRemarkSpan">
-                            只有全部金额都设置完成才会更新订单应收金额
+                            注：只有全部金额都设置完成才会更新订单应收金额
                         </span>
                         <input type="button" class="normalBtn" @click="closeDialog()" value="取消" />
                         <input type="button" class="normalBtn" @click="setShouSun()" value="保存" />
@@ -168,6 +168,7 @@
             if (res.data.resultCode == 1) {
                 this.Success(res.data.message);
                 this.closeDialog();
+                this.$emit("getList");
                 this.MsgBus.$emit('comMsgTips')
             } else {
                 this.Error(res.data.message);

src/components/dmc/manager/dmcShouSun.vue

@@ -302,7 +302,7 @@
     </div>
 
     <el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center>
-        <commonShouSun ref="childShou" :Type="4" @closeShouSun="closeShouSunDialog"></commonShouSun>
+        <commonShouSun ref="childShou" :Type="4" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
     </el-dialog>
 
   </div>