用款计划

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -19,8 +19,8 @@
     ._bg__ ._bg_green:hover{
         color:rgb(66, 182, 132);
     }
-    ._bg_red{color: #E95252;}
-    ._bg_green{color: #2BB87C}
+    .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+    .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
 
     .page_CompanyAccDetail .el-dialog__wrapper input{border: none !important;background-color: transparent !important;padding: 0 2px !important; text-align: center}
     .page_CompanyAccDetail .el-dialog--center .el-dialog__body{
@@ -178,10 +178,10 @@
                     </td>
                     <td> {{ item.BName }} </td>
                     <!-- <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
                     </td> -->
                     <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
                     </td>
                     <td>
                         <p v-if="item.CostTypeList&&item.CostTypeList.length"> <span v-for="(i,o) in item.CostTypeList">{{ i }} </span> </p>

src/components/FinancialModule/accDetail/PayAccDetail.vue

@@ -19,8 +19,8 @@
   ._bg__ ._bg_green:hover{
     color:rgb(66, 182, 132);
   }
-  ._bg_red{color: #E95252;}
-  ._bg_green{color: #2BB87C}
+  .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+  .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
 
   .page_CompanyAccDetail .el-dialog__wrapper input{border: none !important;background-color: transparent !important;padding: 0 2px !important; text-align: center}
   .page_CompanyAccDetail .el-dialog--center .el-dialog__body{
@@ -125,7 +125,7 @@
           </td>
           <td> {{ item.BName }} </td>
           <td>
-            <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
+            <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
           </td>
           <td>
             <p v-if="item.CostTypeList&&item.CostTypeList.length"> <span v-for="(i,o) in item.CostTypeList">{{ i }} </span> </p>

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -19,8 +19,8 @@
     ._bg__ ._bg_green:hover{
         color:rgb(66, 182, 132);
     }
-    ._bg_red{color: #E95252;}
-    ._bg_green{color: #2BB87C}
+    .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+    .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
     ._addChuNa_tit{color: gray;margin-bottom: 10px;}
     ._addChuNa_tit span{ color:#333333}
     .page_CompanyAccDetail .singeRowTable tr td{
@@ -159,7 +159,7 @@
                     <!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
                     
                     <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
                     </td>
                     <td>
                         <p>{{item.CostTypeName}}</p>

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -19,8 +19,8 @@
     ._bg__ ._bg_green:hover{
         color:rgb(66, 182, 132);
     }
-    ._bg_red{color: #E95252;}
-    ._bg_green{color: #2BB87C}
+    .page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
+    .page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C}
     ._addChuNa_tit{color: gray;margin-bottom: 10px;}
     ._addChuNa_tit span{ color:#333333}
 </style>
@@ -161,7 +161,7 @@
                         <span class="cursorpointer" :class=" item.Type == 1 ? '_bg_green' : '_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span>
                     </td> -->
                      <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
                     </td>
                     <td>
                         <p> {{ item.CostTypeName }} </p>

src/components/FinancialModule/addFinancialDocuments.vue

@@ -360,7 +360,7 @@
                             <el-input v-model="detailList.UnitPrice" type="text" @keyup.native="checkPrice(detailList,'UnitPrice',true)"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
                         </td>
                         <td>
-                            <el-select  filterable  v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
+                            <el-select  filterable  :disabled="detailCurrDis" v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
                                 <el-option v-for='item in coinGetList'
                                     :label='item.Name'
                                     :value='item.ID'
@@ -538,6 +538,7 @@ import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
 export default {
     data(){
         return{
+            detailCurrDis:false,
             Description:"",
             msg:{
               FrID:0,
@@ -831,7 +832,11 @@ export default {
             e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
         },
         AddFinancial(z){  //保存
-            
+            if(this.orderObj.CurrencyId){
+                this.msg.detailList=[];
+                this.msg.detailList.push(this.detailList);
+            }
+             
             if(z){
                 this.msg.Status = 0;
             }else{
@@ -888,6 +893,8 @@ export default {
           this.loading = true;
           this.msg.Description=this.Description;
             this.apipost('Financial_post_Set',this.msg,res=>{
+                console.log("res",res);
+                console.log("this.msg",this.msg);
                 if(res.data.resultCode==1){
                   //清除旅客名单数据
                   sessionStorage.removeItem("saveGuestInfo");
@@ -1030,6 +1037,7 @@ export default {
             })
         },
         getRate(cID,i,t,index){  // 根据选择币种获取汇率
+
             this.coinGetList.forEach(x=>{
                 if(x.ID==i){
                     if(t==1){
@@ -1042,6 +1050,8 @@ export default {
                     this.$forceUpdate();
                 }
             })
+            console.log("this.coinGetList",this.coinGetList)
+            console.log("this.detailList.Rate",this.detailList.Rate)
             this.Calculation(t,index+1)
         },
         financeinfo_post_GetClientTypeList(){  // 获取对象类型
@@ -1245,6 +1255,16 @@ export default {
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
                             this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }
+                        
+                    }
+                    if(this.orderObj.CurrencyId){
+                        
+                        this.detailList.CurrencyId=Number(this.orderObj.CurrencyId);
+                        this.detailCurrDis=true;
+                        this.detailList.CostTypeId=this.orderObj.CostType?this.orderObj.CostType: '';
+                        this.getRate(this.detailList.CostTypeId,this.detailList.CurrencyId,1)
+                        
+
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
@@ -1440,7 +1460,7 @@ export default {
         var that=this;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
         this.isFrompassenger = this.orderObj.isFromPassenger;
-        //  console.log(this.$route.query.orderObj)
+        
         if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
@@ -1451,6 +1471,7 @@ export default {
           }
           
         }
+         
     },
     mounted(){
         let userInfo = this.getLocalStorage();

src/components/leaderPay2.vue

@@ -140,7 +140,7 @@ input[type="number"] {
     ._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
     ._bold{font-weight: bold}
     ._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
-    ._bank_name{margin-left: 10px;}
+    ._bank_name{margin-left: 10px;cursor: pointer;}
     ._bank_type{background-color: #2AAEF2}
     ._bank_type2{background-color: #FF9C01} 
 </style>
@@ -587,58 +587,47 @@ input[type="number"] {
            <td>
              </td>
         </tr>
-        <tr v-show="totalScenicPrice>0">
+        <tr v-for="item in planPriceList">
+          <td>
+            <span v-if="item.UserType==3">景点门票</span>
+            <span v-if="item.UserType==1">酒店</span>
+            <span v-if="item.UserType==2">餐饮</span>
+            <span v-if="item.UserType==4">交通</span>
+          </td>
+          <td>{{item.PlanTotalPrice}}</td>
+          <td>{{item.UserTotalPrice}}</td>
+          <td style="cursor: pointer;">
+            <span v-if="item.UserType==3" @click="godetailAll('ticket')">明细</span>
+            <span v-if="item.UserType==1" @click="godetailAll('hotel')">明细</span>
+            <span v-if="item.UserType==2" @click="godetailAll('dining')">明细</span>
+            <span v-if="item.UserType==4" @click="godetailAll('bus')">明细</span>
+          </td>
+
+        </tr>
+        <!-- <tr v-show="totalScenicPrice>0">
           <td>景点门票</td>
           <td>{{moneyFormat(OtherTotalPrice)}}</td>
           <td>{{moneyFormat(totalScenicPrice)}}</td>
           <td><span class="cursorpointer text-decoratio" @click="godetailAll('ticket')">明细</span></td>
-          <!-- <td>
-             <el-input
-                size="mini"
-                class="w150"
-                type="number"
-                v-model="BaoZhangPrice.ScenicPrice" @change="getAllBZPrice"></el-input>
-          </td> -->
         </tr>
         <tr v-show="totalTrafficPrice>0">
           <td>交通</td>
           <td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
           <td>{{moneyFormat(totalTrafficPrice)}}</td>
           <td><span class="cursorpointer text-decoratio" @click="godetailAll('bus')">明细</span></td>
-          <!-- <td>
-             <el-input
-                size="mini"
-                class="w150"
-                type="number"
-                v-model="BaoZhangPrice.BusPrice" @change="getAllBZPrice"></el-input>
-          </td> -->
         </tr>
         <tr v-show="totalDinnerPrice>0">
           <td>餐饮</td>
           <td>{{moneyFormat(IncomeTotalPrice)}}</td>
           <td>{{moneyFormat(totalDinnerPrice)}}</td>
           <td><span class="cursorpointer text-decoratio" @click="godetailAll('dining')">明细</span></td>
-          <!-- <td>
-             <el-input
-                size="mini"
-                class="w150"
-                type="number"
-                v-model="BaoZhangPrice.DiningPrice" @change="getAllBZPrice"></el-input>
-          </td> -->
         </tr>
         <tr v-show="totalHotelPrice>0">
           <td>酒店</td>
           <td>{{moneyFormat(ExpendTotalPrice)}}</td>
           <td>{{moneyFormat(totalHotelPrice)}}</td>
           <td><span class="cursorpointer text-decoratio" @click="godetailAll('hotel')">明细</span></td>
-          <!-- <td>
-             <el-input
-                size="mini"
-                class="w150"
-                type="number"
-                v-model="BaoZhangPrice.HotelPrice" @change="getAllBZPrice"></el-input>
-          </td> -->
-        </tr>
+        </tr> -->
       </table>
       <table border="0" cellspacing="1" class="leaderPayTable">
         <tr>
@@ -1080,6 +1069,7 @@ input[type="number"] {
 export default {
   data() {
     return {
+      planPriceList:[],
       zhuijiaList: [],
       zhuijiaMoney: 0,
       dialogFormVisibleLoding: false,
@@ -1611,10 +1601,15 @@ export default {
     }, 
     getnewList(){
       this.loading = true;
+                    // dmcstatistics_post_GetNewPlanTotalPrice_V2
       this.apipost('dmcstatistics_post_GetNewLeaderPayStatics_V1', this.msg, res => {
         this.loading = false;
+        console.log("1131232",res);
         if (res.data.resultCode == 1) {
+          
           this.list = res.data.data; 
+          // 预计金额
+          this.planPriceList=this.list.planPriceList;
           // 车
           let busList = res.data.data.BusList
           var busmap = {},