报价单新增分公司总经理审核

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -80,7 +80,7 @@
         <li>
           <span>
             <em>报价单号</em>
-            <el-input type="text" class="multiple_input"  v-model="queryData.OfferId" clearable ></el-input>
+            <el-input type="text" class="multiple_input" v-model="queryData.OfferId" clearable></el-input>
           </span>
         </li>
         <li>
@@ -124,7 +124,8 @@
               <template v-else>
                 {{item.TeamTypeName}}
               </template>
-              <template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
+              <template
+                v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
             </div>
 
           </div>
@@ -174,7 +175,8 @@
                     <div class="priceList">
                       <div>
                         <span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{item.QuotationPrice.ChildNeedPrice}}</span>
-                        <span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
+                        <span
+                          class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
                       </div>
                       <div class="priceDivCon">
                         <span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{item.QuotationPrice.BabyPrice}}</span>
@@ -184,25 +186,35 @@
                     <div>{{$t('sm.laoren')}}</div>
                     <div class="priceList">
                       <div>
-                        <span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
+                        <span
+                          class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
                       </div>
                     </div>
                     <div>{{$t('Operation.Op_zafei')}}</div>
                     <div class="priceList">
                       <div>
                         <span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{item.QuotationPrice.VisaPrice}}</span>
-                        <span class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
+                        <span
+                          class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
                       </div>
                     </div>
                     <div>{{$t('op.SingleQuotes')}}</div>
                     <div class="priceList">
                       <div>
-                        <span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
+                        <span
+                          class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
                       </div>
                     </div>
                   </div>
                 </div>
-                <span slot="reference" class="diPrice">{{item.JPYSalePrice}}<span class="qi">{{$t('op.Qi')}}</span></span>
+                <span slot="reference" class="diPrice">
+                  <template v-if="item.OutBranchId==1222||item.OutBranchId==1218">
+                    {{item.JPYSalePrice}}
+                  </template>
+                  <template>
+                    {{item.SalesPrice}}
+                  </template>
+                  <span class="qi">{{$t('op.Qi')}}</span></span>
               </el-popover>
             </div>
           </div>
@@ -219,7 +231,15 @@
             </div>
             <div class="AuditStatus">
               <div v-if="item.TravelState==2">
-                <div>{{$t('objFill.dsh')}}</div>
+                <div>
+                  <template v-if="item.ManagerAduitDate==''">
+                    {{item.ManagerAduitName}}
+                  </template>
+                  <template v-else>
+                    {{item.AuditByName}}
+                  </template>
+                  {{$t('fnc.shenhe')}}
+                </div>
               </div>
               <div v-if="item.TravelState==3">
                 <div class="Auditapproved">{{$t('fnc.ytongguo')}}</div>
@@ -227,10 +247,9 @@
               <div v-if="item.TravelState==4">
                 <div class="Auditrejected">{{$t('objFill.yibohui')}}</div>
               </div>
-              <template
-                v-if="(item.AuditByName&&item.AuditByName!='')||(item.ManagerAduitName&&item.ManagerAduitName!='')">
+              <template v-if="(item.ManagerAduitDate&&item.ManagerAduitDate!='')||(item.AuditDate&&item.AuditDate!='')">
                 <el-popover popper-class="salsSetPrice" trigger="click">
-                  <template v-if="item.ManagerAduitName&&item.ManagerAduitName!=''">
+                  <template v-if="item.ManagerAduitDate&&item.ManagerAduitDate!=''">
                     <div class="priceContentDiv" style="margin-bottom:5px;">
                       <div>
                         <span>审批结果</span>
@@ -266,12 +285,14 @@
             </div>
             <div class="AD_Operation">
               <span class="openGroup opbdList">
-                <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start" popper-class="max-w250">
+                <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"
+                  popper-class="max-w250">
                   <span @click="offerAudit(item,1)">查</span>
                 </el-tooltip>
               </span>
               <span class="openGroup opbdList" v-if="item.TravelState==2">
-                <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top-start" popper-class="max-w250">
+                <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top-start"
+                  popper-class="max-w250">
                   <span @click="offerAudit(item,2)">{{$t('objFill.v101.FinancialModule.shen')}}</span>
                 </el-tooltip>
               </span>
@@ -281,7 +302,8 @@
                 </el-tooltip>
               </span>
               <span class="openGroup opbdList">
-                <el-tooltip class="item" effect="dark" :content="$t('fnc.rizhi')" placement="top-start" popper-class="max-w250">
+                <el-tooltip class="item" effect="dark" :content="$t('fnc.rizhi')" placement="top-start"
+                  popper-class="max-w250">
                   <el-popover popper-class="salsSetPrice" trigger="click">
                     <div class="priceContentDiv">
                       <div class="AuditLog">报价单日志</div>

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -132,7 +132,8 @@
                 <template v-else>
                   {{item.TeamTypeName}}
                 </template>
-                <template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
+                <template
+                  v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
               </div>
             </div>
           </div>
@@ -174,7 +175,8 @@
                     <div class="priceList">
                       <div>
                         <span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{item.QuotationPrice.ChildNeedPrice}}</span>
-                        <span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
+                        <span
+                          class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
                       </div>
                       <div class="priceDivCon">
                         <span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{item.QuotationPrice.BabyPrice}}</span>
@@ -184,20 +186,23 @@
                     <div>{{$t('sm.laoren')}}</div>
                     <div class="priceList">
                       <div>
-                        <span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
+                        <span
+                          class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
                       </div>
                     </div>
                     <div>{{$t('Operation.Op_zafei')}}</div>
                     <div class="priceList">
                       <div>
                         <span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{item.QuotationPrice.VisaPrice}}</span>
-                        <span class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
+                        <span
+                          class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
                       </div>
                     </div>
                     <div>{{$t('op.SingleQuotes')}}</div>
                     <div class="priceList">
                       <div>
-                        <span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
+                        <span
+                          class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
                       </div>
                     </div>
                   </div>
@@ -225,7 +230,14 @@
             </div>
             <div class="AuditStatus" style="width:80px;">
               <div v-if="item.TravelState==2">
-                <div>{{$t('objFill.dsh')}}</div>
+                <div> <template v-if="item.ManagerAduitDate==''">
+                    {{item.ManagerAduitName}}
+                  </template>
+                  <template v-else>
+                    {{item.AuditByName}}
+                  </template>
+                  {{$t('fnc.shenhe')}}
+                </div>
               </div>
               <div v-if="item.TravelState==3">
                 <div class="Auditapproved">{{$t('fnc.ytongguo')}}</div>
@@ -233,10 +245,9 @@
               <div v-if="item.TravelState==4">
                 <div class="Auditrejected">{{$t('objFill.yibohui')}}</div>
               </div>
-              <template
-                v-if="(item.AuditByName&&item.AuditByName!='')||(item.ManagerAduitName&&item.ManagerAduitName!='')">
+              <template v-if="(item.ManagerAduitDate&&item.ManagerAduitDate!='')||(item.AuditDate&&item.AuditDate!='')">
                 <el-popover popper-class="salsSetPrice" trigger="click">
-                  <template v-if="item.ManagerAduitName&&item.ManagerAduitName!=''">
+                  <template v-if="item.ManagerAduitDate&&item.ManagerAduitDate!=''">
                     <div class="priceContentDiv" style="margin-bottom:5px;">
                       <div>
                         <span>审批结果</span>
@@ -292,17 +303,20 @@
                 </el-tooltip>
               </span>
               <span style="background:#85ce61; " class="newAopbdd">
-                <el-tooltip class="item" effect="dark" w450:content="$t('fnc.chakan')" placement="top-start" popper-class="max-w250">
+                <el-tooltip class="item" effect="dark" w450:content="$t('fnc.chakan')" placement="top-start"
+                  popper-class="max-w250">
                   <i @click="goUrl('QuotationAduit',item,1)" class="iconfont icon-view"></i>
                 </el-tooltip>
               </span>
               <span style="background:#85ce61; " class="newAopbdd" @click="copyOffer(item)">
-                <el-tooltip class="item" effect="dark" :content="$t('objFill.copy')" placement="top-start" popper-class="max-w250">
+                <el-tooltip class="item" effect="dark" :content="$t('objFill.copy')" placement="top-start"
+                  popper-class="max-w250">
                   <i class="iconfont icon-copy"></i>
                 </el-tooltip>
               </span>
               <span style="background:#85ce61;" class="newAopbdd" @click="downLoadOffer(item)">
-                <el-tooltip class="item" effect="dark" :content="$t('objFill.xz')" placement="top-start" popper-class="max-w250">
+                <el-tooltip class="item" effect="dark" :content="$t('objFill.xz')" placement="top-start"
+                  popper-class="max-w250">
                   <i class="iconfont icon-bb-xiazai"></i>
                 </el-tooltip>
               </span>
@@ -448,7 +462,8 @@
             <td colspan="2" style="text-align:center;">
               <el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">保存
               </el-button>
-              <input type="button" class="normalBtn" :value="$t('pub.closeSel')" @click="isShowImportOffer=false,clearMsg()" />
+              <input type="button" class="normalBtn" :value="$t('pub.closeSel')"
+                @click="isShowImportOffer=false,clearMsg()" />
             </td>
           </tr>
         </table>