Merge remote-tracking branch 'origin/dev' into dev

src/views/business/spd/bo/gather/index.vue

@@ -3,10 +3,10 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
       <el-row :gutter="1" justify="space-between">
         <el-col :span="4">
-          <el-form-item label="所属客户" prop="customerName">
-            <el-popover-select-v2 v-model="queryParams.customerName" title="客户" valueKey="name"
+          <el-form-item label="医院名称" prop="customerName">
+            <el-popover-select-v2 v-model="queryParams.customerName" title="医院" valueKey="name"
               referName="CUSTOMER_PARAM_ZT" :dataMapping="{ customer: 'id', customerName: 'name'}"
-              :source.sync="queryParams" placeholder="请输入所属客户" @keyup.enter.native="handleQuery" />
+              :source.sync="queryParams" placeholder="请输入医院名称" @keyup.enter.native="handleQuery" />
           </el-form-item>
         </el-col>
         <el-col :span="4">
@@ -17,7 +17,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="供应商" prop="rivalName" label-width="120px">
+          <el-form-item label="供应商名称" prop="rivalName" label-width="120px">
             <el-popover-select-v2 v-model="queryParams.rivalName" title="供应商" valueKey="name" referName="MKRIVAL_PARAM"
               :dataMapping="{ rival: 'id', rivalName: 'name'}" :source.sync="queryParams" placeholder="请输入供应商"
               @keyup.enter.native="handleQuery" />
@@ -67,28 +67,28 @@
     <el-table v-loading="loading" :data="gatherList" @selection-change="handleSelectionChange" v-horizontal-scroll>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center" fixed />
-      <el-table-column label="所属客户" align="center" prop="customerName" width="220" />
+      <el-table-column label="医院名称" align="center" prop="customerName" width="220" />
       <el-table-column label="产线" align="center" prop="productionLineName" width="150" />
-      <el-table-column label="供应商" align="center" prop="rivalName" width="220" />
-      <el-table-column label="供应商体量（万）" align="center" prop="rivalBulk" width="130" />
+      <el-table-column label="供应商名称" align="center" prop="rivalName" width="220" />
+      <el-table-column label="供应商体量/年（万元）" align="center" prop="rivalBulk" width="160" />
       <el-table-column label="品牌" align="center" prop="brand" width="220" />
-      <el-table-column label="品牌份额（万）" align="center" prop="brandPortion" width="120" />
-      <el-table-column label="合作期限（起）" align="center" prop="cooperationStart" width="180">
+      <el-table-column label="品牌份额（万元）" align="center" prop="brandPortion" width="140" />
+      <el-table-column label="合同开始时间" align="center" prop="cooperationStart" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.cooperationStart, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="合作期限（止）" align="center" prop="cooperationEnd" width="180">
+      <el-table-column label="合同结束时间" align="center" prop="cooperationEnd" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.cooperationEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="科室关键人" align="center" prop="sectionKeyPsnname" width="90" />
+      <el-table-column label="科室关键人姓名" align="center" prop="sectionKeyPsnname" width="90" />
       <el-table-column label="科室关键人联系电话" align="center" prop="sectionKeyPsnphone" width="120" />
-      <el-table-column label="院级关键人" align="center" prop="hospitalKeyPsnname" width="90" />
+      <el-table-column label="院级关键人姓名" align="center" prop="hospitalKeyPsnname" width="90" />
       <el-table-column label="院级关键人联系电话" align="center" prop="hospitalKeyPsnphone" width="120" />
-      <el-table-column label="供应商关键人" align="center" prop="rivalKeyPsnname" width="90" />
-      <el-table-column label="供应商关键人联系电话" align="center" prop="rivalKeyPsnphone" width="120" />
+      <el-table-column label="供应商关键人姓名" align="center" prop="rivalKeyPsnname" width="100" />
+      <el-table-column label="供应商关键人联系电话" align="center" prop="rivalKeyPsnphone" width="130" />
       <el-table-column label="开发思路（营销策略）" align="center" prop="idea" min-width="220" show-overflow-tooltip />
       <el-table-column label="机会点/困难点所需资源" align="center" prop="chance" min-width="220" show-overflow-tooltip />
       <el-table-column label="备注" align="center" prop="remark" min-width="220" show-overflow-tooltip />
@@ -113,9 +113,9 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="pageState == 'see'">
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="所属客户" prop="customerName">
-              <el-popover-select-v2 v-model="form.customerName" title="客户" valueKey="name" referName="CUSTOMER_PARAM_ZT"
-                :dataMapping="{ customer: 'id', customerName: 'name'}" :source.sync="form" placeholder="请输入所属客户" />
+            <el-form-item label="医院名称" prop="customerName">
+              <el-popover-select-v2 v-model="form.customerName" title="医院" valueKey="name" referName="CUSTOMER_PARAM_ZT"
+                :dataMapping="{ customer: 'id', customerName: 'name'}" :source.sync="form" placeholder="请输入医院名称" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -126,13 +126,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="供应商" prop="rivalName" label-width="100px">
+            <el-form-item label="供应商名称" prop="rivalName" label-width="100px">
               <el-popover-select-v2 v-model="form.rivalName" title="供应商" valueKey="name" referName="MKRIVAL_PARAM"
-                :dataMapping="{ rival: 'id', rivalName: 'name'}" :source.sync="form" placeholder="请输入供应商" />
+                :dataMapping="{ rival: 'id', rivalName: 'name'}" :source.sync="form" placeholder="请输入供应商名称" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="供应商体量（万）" prop="rivalBulk" label-width="130px">
+            <el-form-item label="供应商体量/年（万元）" prop="rivalBulk" label-width="160px">
               <el-input-number v-model="form.rivalBulk" :precision="2" :step="1"></el-input-number>
             </el-form-item>
           </el-col>
@@ -145,28 +145,28 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="品牌份额（万）" prop="brandPortion" label-width="120px">
+            <el-form-item label="品牌份额（万元）" prop="brandPortion" label-width="140px">
               <el-input-number v-model="form.brandPortion" :precision="2" :step="1"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="合作期限" prop="cooperationStart">
+            <el-form-item label="合同开始时间" prop="cooperationStart" label-width="100px">
               <el-date-picker clearable v-model="form.cooperationStart" type="date" value-format="yyyy-MM-dd"
-                placeholder="请选择合作期限">
+                placeholder="请选择合同开始时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="合作期限" prop="cooperationEnd">
+            <el-form-item label="合同结束时间" prop="cooperationEnd" label-width="100px">
               <el-date-picker clearable v-model="form.cooperationEnd" type="date" value-format="yyyy-MM-dd"
-                placeholder="请选择合作期限">
+                placeholder="请选择合同结束时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="科室关键人" prop="sectionKeyPsnname" label-width="110px">
+            <el-form-item label="科室关键人姓名" prop="sectionKeyPsnname" label-width="110px">
               <el-input v-model="form.sectionKeyPsnname" placeholder="请输入科室关键人姓名" />
             </el-form-item>
           </el-col>
@@ -176,7 +176,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="院级关键人" prop="hospitalKeyPsnname" label-width="110px">
+            <el-form-item label="院级关键人姓名" prop="hospitalKeyPsnname" label-width="110px">
               <el-input v-model="form.hospitalKeyPsnname" placeholder="请输入院级关键人姓名" />
             </el-form-item>
           </el-col>
@@ -188,7 +188,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="供应商关键人" prop="rivalKeyPsnname" label-width="140px">
+            <el-form-item label="供应商关键人姓名" prop="rivalKeyPsnname" label-width="140px">
               <el-input v-model="form.rivalKeyPsnname" placeholder="请输入供应商关键人姓名" />
             </el-form-item>
           </el-col>
@@ -225,9 +225,6 @@
     updateGather,
     upload
   } from "@/api/business/spd/bo/gather";
-  import {
-    getToken
-  } from "@/utils/auth";
 
   export default {
     name: "Gather",
@@ -371,12 +368,12 @@
       handleAdd() {
         this.reset();
         this.open = true;
-        this.title = "添加竞争产品信息收集";
+        this.title = "添加项目信息收集";
         this.pageState = 'insert';
       },
       /** 模板下载按钮操作 */
       handleDownload() {
-        this.download('mk/bo/gathercg/download', {}, `竞争对手信息收集导入模板_${new Date().getTime()}.xlsx`)
+        this.download('mk/bo/gathercg/download', {}, `项目信息收集导入模板_${new Date().getTime()}.xlsx`)
       },
       /** 导入按钮操作 */
       handleUpload(file) {
@@ -413,7 +410,7 @@
         getGather(id).then(response => {
           this.form = response.data;
           this.open = true;
-          this.title = "查看竞争产品信息收集";
+          this.title = "查看项目信息收集";
           this.pageState = 'see';
         });
       },
@@ -424,7 +421,7 @@
         getGather(id).then(response => {
           this.form = response.data;
           this.open = true;
-          this.title = "修改竞争产品信息收集";
+          this.title = "修改项目信息收集";
           this.pageState = 'update';
         });
       },