소스 검색

bug修复,样式调整

qymljy 11 달 전
부모
커밋
a73532555a

+ 2 - 2
src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -81,8 +81,8 @@ export default {
         },
       })
       this.rebHeadData = res.data
-      this.activeName = res.data?res.data[0].title:''
-      this.sa_rebatesettlementid = res.data[0].sa_rebatesettlementid
+      this.activeName = res.data.length > 1?res.data[0].title:''
+      this.sa_rebatesettlementid = res.data.length > 1?res.data[0].sa_rebatesettlementid:''
       this.sa_rebatesettlementid?this.listData():''
     },
     async listData () {

+ 1 - 1
src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -37,7 +37,7 @@
             </div>
             <div class="inline-16 mt-10">
               <label class="search__label" >{{$t(`账户类型`)}}:</label>
-              <el-select v-model="param.content.accountno" placeholder="请选择账户类型" size="small"  @change="accountSelect" :popper-append-to-body="!isFull">
+              <el-select v-model="param.content.accountno" :placeholder="$t(`请选择账户类型`)" size="small"  @change="accountSelect" :popper-append-to-body="!isFull">
                 <el-option
                     v-for="item in accountList"
                     :key="item.rowindex"

+ 2 - 2
src/views/salesData/modules/orderTrendAnalysis.vue

@@ -4,7 +4,7 @@
       <div class="out">
         <div>
           <div class="div-line div-line-right"></div>
-          <div class="title" style="min-width: 220px;"> 订单趋势分析</div>
+          <div class="title" style="min-width: 220px;"> {{$t(`订单趋势分析`)}}</div>
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
@@ -18,7 +18,7 @@
             </el-select>
           </div>
           <div class="mt-10 inline-15">
-            <span class="search__label inline-16">年度:</span>
+            <span class="search__label inline-16">{{$t(`年度`)}}:</span>
             <el-date-picker
                 :append-to-body="!isFull"
                 v-model="yearNow"

+ 2 - 2
src/views/salesData/modules/quotationAnalysis.vue

@@ -2,7 +2,7 @@
   <div class="div-box-new-margin" >
     <div class="div-border-box">
       <div class="div-line"></div>
-      <div style="line-height: 22px;height: 22px;vertical-align: auto;margin-left: 16px">报价分析</div>
+      <div style="line-height: 22px;height: 22px;vertical-align: auto;margin-left: 16px">{{$t(`报价分析`)}}</div>
       <div class="container-div">
         <boxLine title="报价总次数" :data="totalqty" content="统计到当前查询时间为止的报价总次数(审核状态)" :windowWidth="windowWidth"></boxLine>
         <boxLine title="客户报价次数" :data="cusqty" content="统计到当前查询时间为止的客户报价总次数(审核状态)" :windowWidth="windowWidth"></boxLine>
@@ -13,7 +13,7 @@
       </div>
       <div :style="{padding:padding,height: '451px',marginTop:'10px',background:'#fff'}" id="quotationAnalysisFull">
         <div class="out">
-          <div class="mt-10" style="min-width: 220px;">近12月报价次数趋势分析</div>
+          <div class="mt-10" style="min-width: 220px;">{{$t(`近12月报价次数趋势分析`)}}</div>
           <div class="in">
             <div class="inline-16 mt-10">
               <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>

+ 6 - 6
src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -5,12 +5,12 @@
         <div>
           <div class="div-line div-line-right"></div>
           <div style="min-width: 220px;">
-            <div class="title" style="float: left"> 出货趋势分析</div>
+            <div class="title" style="float: left">{{$t(`出货趋势分析`)}}</div>
             <el-tooltip placement="top" style="vertical-align: middle">
-              <div slot="content">①月度的准交率=月度的准交的订单行数÷月度的总订单行数x100%;<br>
-                ②准交率计算在回复交期时间之前完全出货 (物流单审核依据) 的订单行;<br>
-                ③准交的订单行数: 回复交期在当月,且完全出货日期在回复交期之前的订单行数;<br>
-                ④总订单行数: 回复交期在当月的,有审核的订单行数:</div>
+              <div slot="content">{{$t(`依据:月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%`)}};<br>
+                {{$t(`①月度准交的订单行数:回复交期在当月,且完全出货日期(物流单审核)在回复交期之后一天(不含节假日)的订单行数`)}};<br>
+                {{$t(`②月度的总订单行数: 回复交期在当月的,有审核和关闭的订单行数`)}}。<br>
+              </div>
               <img style="vertical-align: middle;margin-left: 10px"  width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
             </el-tooltip>
           </div>
@@ -27,7 +27,7 @@
             </el-select>
           </div>
           <div class="mt-10 inline-15">
-            <span class="search__label inline-16">年度:</span>
+            <span class="search__label inline-16">{{$t(`年度`)}}:</span>
             <el-date-picker
                 :append-to-body="!isFull"
                 v-model="yearNow"

+ 1 - 1
src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -4,7 +4,7 @@
       <div class="out">
         <div>
           <div class="div-line div-line-right"></div>
-          <div class="title" style="min-width: 220px;"> 出货未开票分析</div>
+          <div class="title" style="min-width: 220px;">{{$t(`出货未开票分析`)}}</div>
         </div>
         <div class="in">
           <div class="inline-16 mt-10">

+ 1 - 1
src/views/salesData/modules/uninvoiceAmountAnalysis.vue

@@ -4,7 +4,7 @@
       <div class="out">
         <div>
           <div class="div-line div-line-right"></div>
-          <div class="title" style="min-width: 264px;"> 近12月出货未开票金额趋势分析</div>
+          <div class="title" style="min-width: 264px;">{{$t(`近12月出货未开票金额趋势分析`)}}</div>
         </div>
         <div class="in">
           <div class="inline-16 mt-10">