修改收损

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/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>