页面修改

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -82,7 +82,7 @@
         <li v-for="item in dataList" :key="item.ID" style="padding:0 15px;">
           <div class="Audit_left" style="width:140px">
             <div>
-              <span>编号：{{item.ID}}</span>
+              <span>报价单号：{{item.ID}}</span>
             </div>
             <div style="margin-top:1px">类型：
               <template v-if="item.TeamType==1">
@@ -119,7 +119,6 @@
                   class="iconfont icon-richeng"></i>
                 <span>{{item.CustomerName}}</span>
               </p>
-
             </div>
           </div>
           <div class="Audian_cent" style="width:260px;">
@@ -257,8 +256,6 @@
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="queryData.pageSize" :total="total">
     </el-pagination>
-
-
   </div>
 </template>
 <script>

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -499,7 +499,7 @@
             </td>
           </tr>
           <tr v-if="IsEdit==2">
-            <td colspan="12" style="text-align:center;">
+            <td colspan="13" style="text-align:center;">
               <input type="button" class="normalBtn" value="同意" @click="SubSaveType(3)" />
               <input type="button" class="normalBtn" value="拒绝" @click="SubSaveType(4)" />
             </td>

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -266,9 +266,15 @@
               if (tempData.NightNum && tempData.NightNum > 0) {
                 this.postData.NightNum = tempData.NightNum;
               }
-              this.postData.CustomerName = tempData.CustomerName;
-              this.postData.OutDateTime = tempData.OutDateTime;
-              this.postData.OutBranchId = Number(tempData.OutBranchId);
+              if (tempData.CustomerName) {
+                this.postData.CustomerName = tempData.CustomerName;
+              }
+              if (tempData.OutDateTime) {
+                this.postData.OutDateTime = tempData.OutDateTime;
+              }
+              if (tempData.OutBranchId) {
+                this.postData.OutBranchId = Number(tempData.OutBranchId);
+              }
               this.postData.OfferPayType = tempData.OfferPayType;
               this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
               this.postData.TravelState = tempData.TravelState;