领用用款

src/components/FinancialModule/addFinancialDocuments.vue

@@ -957,8 +957,14 @@ export default {
             }
             let allPrice = 0
             this.msg.detailList.forEach(x=>{
+                this.coinGetList.forEach(y=>{
+                    if(y.ID==x.CurrencyId){
+                        x.currenName = y.Name;
+                    }
+                })
                 allPrice = allPrice+parseFloat(x.bTotalPrice);
             })
+            this.$forceUpdate()
             this.allPrice = allPrice;
             this.allPriceTo =this.$commonUtils.addCommas(Math.round(this.allPrice* 100) / 100)
             this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice)
@@ -1209,6 +1215,9 @@ export default {
                     this.Financial_post_GetCostTypeList(data.TemplateId,2);
                     let allPrice = 0
                     data.DetailList.forEach(x=>{
+                        // 20190815 新增领款单据重新生成自动带上计算后的金额
+                        x.UnitPrice = this.$route.query.dijieEditMoney ? this.$route.query.dijieEditMoney : x.UnitPrice
+                        x.OriginalMoney = this.$route.query.dijieEditMoney ? this.$route.query.dijieEditMoney : x.OriginalMoney
                         x.UnitPriceTo = this.$commonUtils.addCommas(Math.round(x.UnitPrice* 100) / 100);
                         x.yTotalPrice = x.Number*x.UnitPrice;
                         x.rate = x.Rate;
@@ -1220,13 +1229,13 @@ export default {
                         x.yTotalPriceTo = this.$commonUtils.addCommas(Math.round(x.yTotalPrice* 100) / 100);
                         x.bTotalPriceTo = this.$commonUtils.addCommas(num);
                         x.OriginalMoney = Math.round(x.OriginalMoney* 100) / 100;
-                        x.show = false;
-                        this.msg.detailList.push(x);
+                        x.show = false; 
                         this.coinGetList.forEach(y=>{
                             if(y.ID==x.CurrencyId){
                                 x.currenName = y.Name;
                             }
                         })
+                        this.msg.detailList.push(x);
                         allPrice = allPrice+parseFloat(x.bTotalPrice);
                     });
                     this.allPrice = allPrice;
@@ -1247,7 +1256,7 @@ export default {
                         this.msg.OrderID = this.orderObj.OrderID?this.orderObj.OrderID:0;
                         this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
                         this.msg.TCID = this.orderObj.TCID?this.orderObj.TCID:0;
-                        this.financeinfo_post_GetList(this.msg.TCID);
+                        
                         this.msg.TCIDList = this.orderObj.TCIDList?this.orderObj.TCIDList:[];
                         this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
@@ -1495,13 +1504,13 @@ export default {
         let minute = myDate.getMinutes() < 10 ? "0" + myDate.getMinutes() : myDate.getMinutes();
         let second = myDate.getSeconds() < 10 ? "0" + myDate.getSeconds() : myDate.getSeconds();
         this.timer = hour + ':' + minute + ':' + second;
+        let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
+        this.financeinfo_post_GetList(TCID);
         if(this.$route.query.edit){
             // 编辑
             this.msg.FrID = this.$route.query.FrID;
             this.Financial_post_Get(this.$route.query.FrID,0);
         }else{
-            let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
-            this.financeinfo_post_GetList(TCID);
             this.msg.TemplateId = this.$route.query.id;
             this.Financial_post_GetCostTypeList(this.$route.query.id);
             this.BillName = userInfo.GroupName;

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1087,18 +1087,7 @@ export default {
           this.msg.detailList.forEach(x=>{
             delete x.rate;
           });
-          if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
-                let Description="旅客名单：";
-                console.log("dfsgjosdjg p",JSON.parse(sessionStorage.getItem("TipGuestList")))
-                let describeList=JSON.parse(sessionStorage.getItem("TipGuestList"));
-                if(describeList){
-                    describeList.forEach(item=>{
-                        Description+=item.GuestName+" ";
-                    })
-                    this.msg.Description = Description
-                }
-                
-            }
+          
           this.loading = true;
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
@@ -1409,6 +1398,18 @@ export default {
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo")) && !JSON.parse(sessionStorage.getItem("TipGuestList"))){
                             this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }
+                        if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
+                            let Description="旅客名单：";
+                            console.log("dfsgjosdjg p",JSON.parse(sessionStorage.getItem("TipGuestList")))
+                            let describeList=JSON.parse(sessionStorage.getItem("TipGuestList"));
+                            if(describeList){
+                                describeList.forEach(item=>{
+                                    Description+=item.GuestName+" ";
+                                })
+                                this.msg.Description = Description
+                            }
+                            
+                        }
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
@@ -1419,6 +1420,9 @@ export default {
                     if(this.msg.TCIDAndTCNUMList==null){
                         this.msg.TCIDAndTCNUMList = [];
                     }
+                    if(this.$route.query.edit){
+                        this.Description = data.Description
+                    }
                     this.msg.URL = this.$route.query.path;
                     this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
                     this.$forceUpdate();

src/components/LeaderManagement/leaderReimbursement.vue

@@ -124,23 +124,15 @@
         </td>
       </tr>
       <template>
-        <tr v-if="TotalNav.busPrice && TotalNav.busPrice.length">
+        <tr>
           <td>总金额</td>
           <td colspan="16">
             <span v-for="item in TotalNav.busPrice">
-              <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4">
-                现付：{{plan.PlanTotalPrice}}
-              </span>
               <span v-if="item.PayType!=1">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span>
             </span>
-          </td>
-        </tr>
-        <tr v-else>
-          <td>总金额</td>
-          <td colspan="16">
-            <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4">
+            <p v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==4">
               现付：{{plan.PlanTotalPrice}}
-            </span>
+            </p>
           </td>
         </tr>
       </template>
@@ -586,7 +578,9 @@
         </td>
         <td>
           <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
-              @click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)">{{subItem.FinanceId}}</span>&nbsp;&nbsp;<span
+              @click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)" :style="{'color': subItem.Status == 3 ? 'red' : ''}">
+              {{subItem.FinanceId}}({{subItem.Status == 3 ? '驳回' : subItem.Status == 2 ? '通过' : '审核中'}})</span>&nbsp;&nbsp;
+              <span v-if="subItem.Status == 3" class="cursorpointer text-decoration" @click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)">重新发起</span>&nbsp;&nbsp;<span
               class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)"
               v-if="subItem.IsPublic === 4">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration"
               @click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
@@ -597,7 +591,7 @@
               <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
                 @click="goZhiDan(item, 2)" />
               <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
-                <input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn"
+                <input type="button" v-if="!item.hideZDBtn" value="制单" class="normalBtn"
                   @click="goZhiDan(item,0,leadr)" />
               </el-tooltip>
             </template>
@@ -755,6 +749,32 @@
       commonHotelInfo
     },
     methods: {
+      // 20190815 新增领款单据重新生成自动带上计算后的金额
+      goFncEditUrl(url, crId, frId){
+        let obj = {}
+        this.CurrencyListMoney.map(x=>{
+          if (x.CurrencyId == crId) {
+            obj = x
+          }
+        })
+        let price = obj.money * 0.95
+        let calcPrice = 0
+        if (crId == 1) { //人民币
+          calcPrice = parseInt(price/1000) > 0 ? parseInt(price/1000) * 1000 : parseInt(price)
+        } else { // 其他
+          calcPrice = parseInt(price/10000) > 0 ? parseInt(price/10000) * 10000 : parseInt(price)
+        }
+        this.$router.push({ 
+          name: url,
+          query:{
+            "FrID": frId,
+            "blank": 'y',
+            "edit": true,
+            "dijieEditMoney": calcPrice,
+            "tab": '修改财务单据'
+          }
+        })
+      },
       GetCurrency(Id) {
         var str = "";
         switch (Id) {
@@ -1174,13 +1194,15 @@
             })
             this.CurrencyListMoney.forEach((cur, i) => {
               cur.LeaderGetPriceArr.forEach(lead => {
-                if (i === 0) {
-                  lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) * 100) / 100;
-                  lead.PlanPrice = cur.money * 0.95;
-                } else {
-                  lead.LeaderGetPriceT = 0;
-                  lead.PlanPrice = cur.money * 0.95;
-                }
+                lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) * 100) / 100;
+                lead.PlanPrice = cur.money * 0.95;
+                // if (i === 0) {
+                //   lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) * 100) / 100;
+                //   lead.PlanPrice = cur.money * 0.95;
+                // } else {
+                //   lead.LeaderGetPriceT = 0;
+                //   lead.PlanPrice = cur.money * 0.95;
+                // }
               })
 
             })

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2127,7 +2127,7 @@
                 <p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
                   <span class="" >取消名单:</span>
                   <span class="RL-redType RL-remarkCon">
-                    <spa style="color: red;"n v-for="(childItem) in item.cancelGuestList">{{childItem.userName}}  &nbsp;&nbsp;</spa>
+                    <span style="color: red;"n v-for="(childItem, childIndex) in item.cancelGuestList" :key="childIndex">{{childItem.userName}}  &nbsp;&nbsp;</span>
                   </span>
                 </p>
                 <!--              <span class="RL-redType RL-remarkCon" v-else>-->
@@ -2473,7 +2473,7 @@
               <p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
                 <span class="" >取消名单:</span>
                 <span class="RL-redType RL-remarkCon">
-                  <spa style="color: red;"n v-for="(childItem) in item.cancelGuestList">{{childItem.userName}}  &nbsp;&nbsp;</spa>
+                  <span style="color: red;" v-for="(childItem, childIndex) in item.cancelGuestList" :key="childIndex">{{childItem.userName}}  &nbsp;&nbsp;</span>
                 </span>
               </p>
               <span style="display: block">房间信息<span v-if="item.oneSex>0"