Merge branch 'blueBranch' into testToMerge

src/Form/marketing2/agent/edit.vue

@@ -55,20 +55,20 @@
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.cooperationstatus === '正式'" :label-width="tool.onlyZh('110px')" :label="$t(`合作伙伴编号`)+':'" prop="agentnum" :rules="{required:true,message:$t('请输入合作伙伴编号'),trigger:'blur'}">
-              <el-input v-model="form.agentnum" :placeholder="$t(`请输入合作伙伴编号`)" @blur="form.agentnum = form.agentnum.trim()"
+              <el-input v-model="form.agentnum" :placeholder="$t(`请输入合作伙伴编号`)" @blur="form.agentnum = form.agentnum.trim()" disabled
               ></el-input>
             </el-form-item>
             <el-form-item v-else :label="$t(`合作伙伴编号`)+':'" prop="agentnum" :label-width="tool.onlyZh('110px')" :rules="{required:false,message:$t(`请输入合作伙伴编号`),trigger:'blur'}">
-              <el-input v-model="form.agentnum" :placeholder="$t(`请输入合作伙伴编号`)" @blur="form.agentnum = form.agentnum.trim()"
+              <el-input v-model="form.agentnum" :placeholder="$t(`请输入合作伙伴编号`)" @blur="form.agentnum = form.agentnum.trim()" disabled
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item  style="height:51px" v-if="form.cooperationstatus === '正式'"  :label="$t(`erp编号`)+':'" prop="erpagentnum" :rules="{required:true,message:$t('输入erp编号'),trigger:'blur'}">
-              <el-input v-model="form.erpagentnum" :placeholder="$t(`输入erp编号`)" @blur="form.erpagentnum = form.erpagentnum.trim()"></el-input>
+              <el-input v-model="form.erpagentnum" :placeholder="$t(`输入erp编号`)" @blur="form.erpagentnum = form.erpagentnum.trim()" disabled></el-input>
             </el-form-item>
             <el-form-item v-else style="height:51px" :label="$t(`erp编号`)+':'" prop="erpagentnum"  :rules="{required:false,message:$t('输入erp编号'),trigger:'blur'}">
-              <el-input v-model="form.erpagentnum" :placeholder="$t(`输入erp编号`)" @blur="form.erpagentnum = form.erpagentnum.trim()"></el-input>
+              <el-input v-model="form.erpagentnum" :placeholder="$t(`输入erp编号`)" @blur="form.erpagentnum = form.erpagentnum.trim()" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/HDrpManagement/contractManage/components/addContract.vue

@@ -1030,7 +1030,7 @@
                   type="text"
                   size="small"
                   v-model="form.customername"
-                  placeholder="客户名称"
+                  :placeholder="$t(`客户名称`)"
                 ></el-input>
               </el-form-item>
             </el-col>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -802,7 +802,7 @@ export default {
       if (this.$route.query.type == '居间'){
         this.form.enterprisename = this.data.ascription_enterprisename
         this.form.customername = this.data.enterprisename
-        this.form.ascription_title_new = this.data.ascription_title ? this.data.billno + '-' +  this.data.ascription_title : this.data.billno
+        this.form.ascription_title_new = this.data.ascription_title ? this.data.ascription_billno + '-' +  this.data.ascription_title : this.data.ascription_billno
       }
       this.drawer = true
       if (!this.form.reminddays){

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/contractManage/modules/detail.vue

@@ -237,6 +237,11 @@
           </div>
           <BaseInfo v-else :detailInfo="detailInfo"/>
         </div>
+        <div v-if="mainData.type == '工具借用'">
+          <div v-if="tool.checkAuth($route.name,'linkedOrder')">
+            <linkedOrder></linkedOrder>
+          </div>
+        </div>
       </div>
       <div slot="slot3">
         <div  v-if="mainData.type === '居间' && siteid !== 'HY'">
@@ -257,7 +262,7 @@
       </div>
       <div slot="slot4">
         <div v-if="mainData.type == '框架' || mainData.type == '直销'">
-          <linkedOrder v-if="tool.checkAuth($route.name,'linkedOrder') && !tool.checkAuth($route.name,'brokerageFeeEntrySet')"></linkedOrder>
+          <linkedOrder v-if="tool.checkAuth($route.name,'linkedOrder') && tool.checkAuth($route.name,'brokerageFeeEntrySet') && siteid != 'HY'"></linkedOrder>
           <BaseInfo v-else :detailInfo="detailInfo"/>
         </div>
         <div v-if="mainData.type == '项目'">

src/HDrpManagement/customerData/index.vue

@@ -2282,7 +2282,7 @@ export default {
         return {
           date: item.date,
           key:this.$t(item.key),
-          value: Math.round((item.value * 100)*100)/100
+          value: item.value
         }
       })
       if (init) {
@@ -2417,7 +2417,6 @@ export default {
         this.gradTableParam.content.dataid = id
         this.gradTableParam.content.type = 1
         this.gradTableParam.content.username = ''
-        this.$refs.customerGradTable.listData()
 
 
         this.contactMapParam.content.dataid = id
@@ -2492,7 +2491,6 @@ export default {
         this.gradTableParam.content.type =''
         this.gradTableParam.content.username = name
         console.log(this.gradTableParam.content.username,'除非');
-        this.$refs.customerGradTable.listData()
 
 
         this.contactMapParam.content.dataid = ''
@@ -2566,7 +2564,6 @@ export default {
       this.gradTableParam.content.dataid = id
       this.gradTableParam.content.type = 0
       this.gradTableParam.content.username = this.person
-      this.$refs.customerGradTable.listData()
 
 
       this.contactMapParam.content.dataid = id
@@ -2643,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/invoicePredictionManage/details/index.vue

@@ -327,6 +327,7 @@ export default {
       },
       screenWidth: 0, // 存储当前屏幕的宽度
       multipleSize: 0, // 根据屏幕宽度计算得出的值
+      departmentid:JSON.parse(sessionStorage.getItem('accountinfo')).hr.departmentid
     };
   },
   methods: {
@@ -411,6 +412,7 @@ export default {
     },
     async listData() {
       this.param.content.title = this.mainData.title;
+      this.param.content.dataid = this.departmentid;
       const res = await this.$api.requested(this.param);
       this.list = res.data.data;
       this.allhr = res.data.allhr;

src/HDrpManagement/projectData/index.vue

@@ -1607,16 +1607,16 @@
                     <div class="day">{{$t(`平均周期`)}}:{{ item.dateavg.toFixed(2) }}{{$t(`天`)}}</div>
                     <div class="start" v-if="index == 0">
                       <span>{{ $t(item.start) }}</span>
-                      <span v-if="item.end == '立项'">{{$t(`项目立项`)}}</span>
-                      <span v-else-if="item.end == '报备'">{{$t(`项目报备审核`)}}</span>
-                      <span v-else-if="item.end == '报价'">{{$t(`项目报价审核`)}}</span>
-                      <span v-else-if="item.end == '合同'">{{$t(`项目合同审核`)}}</span>
-                      <span v-else-if="item.end == '订单'">{{$t(`项目订单审核`)}}</span>
-                      <span v-else-if="item.end == '结案'">{{$t(`项目结案`)}}</span>
+                      <span v-if="item.start == '立项'">{{$t(`项目新建`)}}</span>
+                      <span v-else-if="item.start == '报备'">{{$t(`项目报备审核`)}}</span>
+                      <span v-else-if="item.start == '报价'">{{$t(`项目报价审核`)}}</span>
+                      <span v-else-if="item.start == '合同'">{{$t(`项目合同审核`)}}</span>
+                      <span v-else-if="item.start == '订单'">{{$t(`项目订单审核`)}}</span>
+                      <span v-else-if="item.start == '结案'">{{$t(`项目结案`)}}</span>
                     </div>
                     <div class="end">
                       <span>{{ $t(item.end) }}</span>
-                      <span v-if="item.end == '立项'">{{$t(`项目立项`)}}</span>
+                      <span v-if="item.end == '立项'">{{$t(`项目新建`)}}</span>
                       <span v-else-if="item.end == '报备'">{{$t(`项目报备审核`)}}</span>
                       <span v-else-if="item.end == '报价'">{{$t(`项目报价审核`)}}</span>
                       <span v-else-if="item.end == '合同'">{{$t(`项目合同审核`)}}</span>

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/HDrpManagement/projectPredictionManage/details/index.vue

@@ -266,6 +266,7 @@ export default {
           unLeave: 1,
         },
       },
+      departmentid:JSON.parse(sessionStorage.getItem('accountinfo')).hr.departmentid
     };
   },
   methods: {
@@ -334,6 +335,7 @@ export default {
     },
     async listData() {
       this.param.content.title = this.mainData.title;
+      this.param.content.dataid = this.departmentid
       const res = await this.$api.requested(this.param);
       this.list = res.data.data;
       this.allhr = res.data.allhr;

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -123,7 +123,7 @@
         >
           <selectTeam ref="team" @teamChange="teamChange" slot="add">
             <el-button
-              v-if="tool.checkAuth($route.name, 'teamHandle')"
+              v-if="tool.checkAuth($route.name, 'teamHandle') && mainData.status !== '已完成'"
               class="button-new-tag"
               size="small"
               type="primary"
@@ -158,13 +158,14 @@
       </div>
       <div slot="slot2" v-if="mainData.actiontype != '工序模板'">
         <teamList
-          v-if="tool.checkAuth($route.name, 'teamList')"
+          v-if="tool.checkAuth($route.name, 'teamList') "
           ref="teamList"
           :data="mainData.team"
+          :status="mainData.status"
         >
           <selectTeam ref="team" @teamChange="teamChange" slot="add">
             <el-button
-              v-if="tool.checkAuth($route.name, 'teamHandle')"
+              v-if="tool.checkAuth($route.name, 'teamHandle') && mainData.status !== '已完成'"
               class="button-new-tag"
               size="small"
               type="primary"

src/HDrpManagement/serveWorkBill/modules/teamList/index.vue

@@ -44,7 +44,7 @@
         <el-table-column :label="$t('操作')">
           <template slot-scope="scope">
             <el-button
-              :disabled="!tool.checkAuth($route.name, 'teamHandle')"
+              :disabled="!tool.checkAuth($route.name, 'teamHandle') || status == '已完成'"
               class="inline-16"
               size="mini"
               type="text"
@@ -54,7 +54,7 @@
             <el-button
               :disabled="
                 !!scope.row.isleader ||
-                !tool.checkAuth($route.name, 'teamHandle')
+                !tool.checkAuth($route.name, 'teamHandle') || status == '已完成'
               "
               size="mini"
               type="text"
@@ -70,7 +70,7 @@
 
 <script>
 export default {
-  props: [],
+  props: ["status"],
   data() {
     return {
       teamList: [],

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>