。

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -176,10 +176,10 @@
           </div>
         </div>
         <br />
-        <table class="CostNewTable" style="width:1150px">
+        <table class="CostNewTable" style="width:1250px;table-layout:fixed">
           <thead>
             <tr>
-              <td colspan="12" class="CP_ComTitle2 CostcomCenter">报价信息</td>
+              <td colspan="14" class="CP_ComTitle2 CostcomCenter">报价信息</td>
             </tr>
             <tr>
               <td class="CP_ComTitle2 CostcomCenter" style="width:120px">币种</td>
@@ -189,7 +189,7 @@
                   <i class="iconfont icon-quxiao" style="display:inline-block;" @click="DeleteCurrency(index)"></i>
                 </span>
               </td>
-              <td :colspan="12-2-CostCurrencyList.length+1">
+              <td :colspan="14-2-CostCurrencyList.length+1">
                 <el-form-item class="w70">
                   <el-select v-model='currencyType' @change="getRate(currencyType),addCurrency()">
                     <el-option v-for="item in currencyTypeArr" :label='item.Name' :value='item.ID' :key='item.ID'>
@@ -205,7 +205,7 @@
                   @keyup.native="checkRate(item,'ExchangeRate'),getchange()">
                 </el-input>
               </td>
-              <td :colspan="12-2-CostCurrencyList.length+1">
+              <td :colspan="14-2-CostCurrencyList.length+1">
                 <el-input class="w70" v-model='queryMsg.RateInput'
                   @keyup.native="checkRate(queryMsg,'RateInput'),getchange()">
                 </el-input>
@@ -220,7 +220,7 @@
                   <i class="iconfont icon-quxiao" @click="DeletePNumber(index),getchange()"></i>
                 </span>
               </td>
-              <td :colspan="12-2-CostNumberList.length+1">
+              <td :colspan="14-2-CostNumberList.length+1">
                 <el-form-item>
                   <el-input class="w70" v-model='queryMsg.PeopleNumber'
                     @keyup.native="checkInteger(queryMsg,'PeopleNumber'),getchange()"></el-input>
@@ -230,16 +230,17 @@
             </tr>
           </thead>
           <tr>
-            <td colspan="12"></td>
+            <td colspan="14"></td>
           </tr>
           <tr>
             <td rowspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">Day</td>
-            <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">行程大点</td>
+            <td rowspan="2" colspan="2" width='80' class="CP_ComTitle2 CostcomCenter">行程大点</td>
             <td rowspan="2" width="80" class="CP_ComTitle2 CostcomCenter">币种</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">酒店</td>
             <td colspan="4" class="CP_ComTitle2 CostcomCenter">车</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="3" class="CP_ComTitle2 CostcomCenter">餐</td>
+            <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td>
           </tr>
           <tr>
             <td width="80" class="CP_ComTitle2 CostcomCenter">总车资</td>
@@ -257,7 +258,8 @@
                   <td align="center" v-if="childIndex==0" :rowspan="CostNumberList.length">
                     {{subItem.DayNum}}
                   </td>
-                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
+  
                     <el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input>
                   </td>
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
@@ -296,7 +298,7 @@
                     </el-input>
                   </td>
                   <td>
-                    {{childItem.PeopleNumber}}
+                    {{childItem.PeopleNumber}} 
                   </td>
                   <td>
                     {{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(childItem.PeopleNumber)).toFixed(0)}}
@@ -322,13 +324,17 @@
                       v-model='subItem.DinnerCostPrice' class="w60"
                       @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
                   </td>
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2" style="border:1px solid red">
+                    <el-input type="text" v-model='subItem.RebatePrice' class="w60"
+                      @keyup.native="checkPrice(subItem,'RebatePrice'),getchange()"></el-input>
+                  </td>
                 </tr>
               </template>
             </template>
 
             <template v-for="(childItem,childIndex) in CostNumberList">
               <tr>
-                <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
+                <td colspan="4" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
                   :rowspan="CostNumberList.length">
                   外币小计
                 </td>
@@ -359,11 +365,14 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(6,1)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+
+                </td>
               </tr>
             </template>
             <template v-for="(childItem,childIndex) in CostNumberList">
               <tr>
-                <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
+                <td colspan="4" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
                   :rowspan="CostNumberList.length">
                   人民币小计
                 </td>
@@ -394,6 +403,9 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(6,2)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+
+                </td>
               </tr>
             </template>
           </template>
@@ -1058,8 +1070,12 @@
                 :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
                 <el-button size="small" type="primary">报价单附件</el-button>
               </el-upload>
-              <a style="margin-left:20px;color:blue;" :href="teamPrice.ContractArray[0].Url"
-                v-if="teamPrice.ContractArray&&teamPrice.ContractArray.length>0" target="_blank">预览</a>
+              <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
+                <template v-for="(subItem,subIndex) in teamPrice.ContractArray">
+                  <a style="margin-left:20px;color:blue;" :href="subItem.Url" target="_blank" :key="subIndex"
+                    :download="subitem.Name">{{subItem.Name}}</a>
+                </template>
+              </template>
             </td>
           </tr>
         </table>
@@ -1109,9 +1125,8 @@
         this.$message.info(this.$t('tips.shangchuanzhong'))
         this.UploadSelfFileT(path, newArr, x => {
           var newUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
-          this.teamPrice.ContractArray = [];
           this.teamPrice.ContractArray.push({
-            Name: "",
+            Name: x.data.SourceFileName,
             Url: newUrl
           });
           this.teamPrice.ContractUrl = newUrl;
@@ -1419,6 +1434,7 @@
               ContainDinnerType: 0, //含餐类型(1-含早餐,2-含晚餐,3-含早晚)
               PassFee: 0, //过路费
               HotelName: "", //酒店名称
+              RebatePrice: 0, //回佣
             };
             this.dayCostPrice.push(dayItem);
           }

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -118,7 +118,7 @@
         <table class="CostPriceTable CostNewTable">
           <thead>
             <tr>
-              <td colspan="12" class="CP_ComTitle2 CostcomCenter">报价信息</td>
+              <td colspan="14" class="CP_ComTitle2 CostcomCenter">报价信息</td>
             </tr>
             <tr>
               <td width="170" class="CP_ComTitle2 CostcomCenter">币种</td>
@@ -146,16 +146,17 @@
             </tr>
           </thead>
           <tr>
-            <td colspan="13"></td>
+            <td colspan="14"></td>
           </tr>
           <tr>
             <td rowspan="2" width='180' class="CP_ComTitle2 CostcomCenter">Day</td>
-            <td rowspan="2" width='200' class="CP_ComTitle2 CostcomCenter">行程大点</td>
+            <td rowspan="2" colspan="2" width='200' class="CP_ComTitle2 CostcomCenter">行程大点</td>
             <td rowspan="2" width="100" class="CP_ComTitle2 CostcomCenter">币种</td>
             <td rowspan="2" width='60' class="CP_ComTitle2 CostcomCenter">酒店</td>
             <td colspan="4" width='100' class="CP_ComTitle2 CostcomCenter">车</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">餐</td>
+            <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td>
           </tr>
           <tr>
             <td width="120" class="CP_ComTitle2 CostcomCenter">总车资</td>
@@ -212,6 +213,9 @@
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     {{subItem.DinnerCostPrice}}
                   </td>
+                  <td   :rowspan="CostNumberList.length">
+                    {{subItem.RebatePrice}}
+                  </td>
                 </tr>
               </template>
             </template>
@@ -765,8 +769,12 @@
           <tr>
             <td class="CP_ComTitle2">附件</td>
             <td colspan="11">
-              <a style="margin-left:20px;color:blue;" :href="teamPrice.ContractArray[0].Url"
-                v-if="teamPrice.ContractArray&&teamPrice.ContractArray.length>0" target="_blank">预览</a>
+              <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
+                <template v-for="(subItem,subIndex) in teamPrice.ContractArray">
+                  <a style="margin-left:20px;color:blue;" :href="subItem.Url" target="_blank" :key="subIndex"
+                    :download="subItem.Name">{{subItem.Name}}</a>
+                </template>
+              </template>
             </td>
           </tr>
           <tr>
@@ -810,7 +818,7 @@
         AduitMsg: {
 
         },
-       
+
       }
     },
     methods: {
@@ -1055,15 +1063,15 @@
       },
       getchange() {
         this.getLeaderShare();
- 
+
       }
     },
     mounted() {
-    
+
     },
     created() {},
     watch: {
-      
+
     },
   };
 

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -231,7 +231,7 @@
                 </el-tooltip>
               </span>
               <span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item.ID)"
-                v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
+                v-if="item.TravelState!=3">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-bianji-smal"></i>