Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/contractManage/components/selectContract.vue

@@ -6,7 +6,8 @@
         </el-input>
         <table-new-layout style="margin-top: 10px" :layout="projectTableCols" :data="projectList" :width="true" :custom="true" @rowClick="rowClick" height="450px">
           <template v-slot:customcol="scope">
-            <p>{{$t(scope.column.data[scope.column.columnname])}}</p>
+            <p v-if="scope.column.columnname == 'status'" :style="tool.getStatusColor(scope.column.data[scope.column.columnname])">{{$t(scope.column.data[scope.column.columnname])}}</p>
+            <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
           </template>
         </table-new-layout>
         <div class="container normal-panel" style="text-align:right">
@@ -28,7 +29,8 @@
         </el-input>
         <table-new-layout style="margin-top: 10px" :layout="customerTableCols" :data="customerList" :width="true" :custom="true" @rowClick="rowClick" height="450px">
           <template v-slot:customcol="scope">
-            <p>{{$t(scope.column.data[scope.column.columnname])}}</p>
+            <p v-if="scope.column.columnname == 'status'" :style="tool.getStatusColor(scope.column.data[scope.column.columnname])">{{$t(scope.column.data[scope.column.columnname])}}</p>
+            <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
           </template>
         </table-new-layout>
         <div class="container normal-panel" style="text-align:right">

src/HDrpManagement/customerData/index.vue

@@ -2640,7 +2640,6 @@ export default {
       this.gradTableParam.content.where.isleave = this.isleave
       this.gradTableParam.content.username = ''
       this.gradTableParam.content.dataid = this.gradTableParam.content.type == 0?-1:this.gradTableParam.content.dataid
-      this.$refs.customerGradTable.listData()
 
       this.contactMapParam.content.where.isleave = this.isleave
       this.contactMapParam.content.username = ''

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -22,7 +22,7 @@
             <el-descriptions class="margin-top">
               <el-descriptions-item :label="$t('客户类型')">{{ $t(baseInfo.type?baseInfo.type:'--') }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`客户等级`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.grade?baseInfo.grade:'--') }}</span></el-descriptions-item>
-              <el-descriptions-item :label="$t(`合作状态`)"><span style="color:#3874f6">{{ $t(baseInfo.status?baseInfo.status:'--') }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t(`合作状态`)"><span :style="tool.getStatusColor(baseInfo.status)">{{ $t(baseInfo.status?baseInfo.status:'--') }}</span></el-descriptions-item>
               <el-descriptions-item :label="$t(`客户行业`)">{{ baseInfo.industry && baseInfo.industry.length>0?baseInfo.industry.join(','):'--'}}</el-descriptions-item>
               <el-descriptions-item :label="$t(`客户分类`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.customergrade?baseInfo.customergrade:'--') }}</span></el-descriptions-item>
               <el-descriptions-item :label="$t('成交状态')"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.tradingstatus?baseInfo.tradingstatus:'--') }}</span></el-descriptions-item>

src/HDrpManagement/projectPortrait/index.vue

@@ -135,7 +135,8 @@
           <el-tag v-for="(item,index) in scope.data.column.data.sys_tag" size="mini" style="margin-right:10px" :key="index">{{ $t(item) }}</el-tag>
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
-          <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])" >{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'" style="color: #3874f6">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span v-else :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])" >{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'industry'">
           <el-tag v-for="(item,index) in scope.data.column.data.industry" size="mini" style="margin-right:10px" :key="index">{{ $t(item) }}</el-tag>

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -24,7 +24,10 @@
               <el-descriptions-item :label="$t('项目类型')">{{ baseInfo.projecttype?baseInfo.projecttype:'--' }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`领域`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ $t(baseInfo.tradefield?baseInfo.tradefield:'--') }}</span></el-descriptions-item>
               <el-descriptions-item :label="$t(`预计签约金额(元)`)"> {{ tool.formatAmount(baseInfo.signamount_due || 0,2,'￥') }}</el-descriptions-item>
-              <el-descriptions-item :label="$t('项目状态')"><span style="color:#3874f6">{{ $t(baseInfo.status?baseInfo.status:'--') }}</span></el-descriptions-item>
+              <el-descriptions-item :label="$t('项目状态')">
+                <span v-if="baseInfo.status == '跟进中'" style="color:#3874f6">{{ $t(baseInfo.status?baseInfo.status:'--') }}</span>
+                <span v-else :style="tool.getStatusColor(baseInfo.status)">{{ $t(baseInfo.status?baseInfo.status:'--') }}</span>
+              </el-descriptions-item>
               <el-descriptions-item :label="$t(`未跟进天数`)"><span style="color:#E85B5B;font-size:16px;font-weight:bold;margin-right: 10px">{{ baseInfo.subdate ? baseInfo.subdate  + $t('天') : baseInfo.subdate }}</span>
                 <el-tooltip class="item" effect="dark" :content="$t(`未跟进天数=当前查询时间-最近跟进时间-节假日`)" placement="top">
                   <i class="el-icon-warning-outline"></i>

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -7,9 +7,17 @@
           <div style="min-width: 220px;">
             <div class="title" style="float: left">{{$t(`出货趋势分析`)}}</div>
             <el-tooltip placement="top" style="vertical-align: middle">
-              <div slot="content">{{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%`)}};<br>
-                {{$t(`①月度准交的订单行数：回复交期在当月，且在回复交期后一天(不含节假日)之前完全出货的订单行数`)}}；<br>
-                {{$t(`②月度的总订单行数: 回复交期在当月的，有审核和关闭的订单行数`)}}。<br>
+              <div slot="content">
+                {{$t(`1、不包含备货数据：`)}}<br>&nbsp;
+                {{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%；`)}}<br>
+                {{$t(`（1）月度准交的订单行数：回复交期在当月，且在回复交期后一个工作日（包含）之前完全出货的订单行数；`)}}<br>
+                {{$t(`（2）月度的总订单行数: 回复交期在当月的，有审核和关闭的订单行数。`)}}<br>
+                {{$t(`2、包含备货数据：`)}}<br>&nbsp;
+                {{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%；`)}}<br>
+                {{$t(`（1）月度准交的订单行数：①+②`)}}<br>&nbsp;&nbsp;&nbsp;&nbsp;
+                {{$t(`①回复交期在当月，且在回复交期后一个工作日（包含）之前完全出货的订单行数；`)}}<br>&nbsp;&nbsp;&nbsp;&nbsp;
+                {{$t(`②备货日期在当月，且在回复交期后一个工作日（包含）之前完全备货且未完全出货的订单行数；`)}}<br>
+                {{$t(`（2）月度的总订单行数: 回复交期在当月的，有审核和关闭的订单行数。`)}}<br>
               </div>
               <img style="vertical-align: middle;margin-left: 10px"  width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
             </el-tooltip>