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

src/views/consult/detail.vue

@@ -178,7 +178,12 @@
       },
       // 返回
       back() {
-        this.$router.go(-1)
+        this.$router.push({
+          name: 'consult',
+          params: {
+            isGetParams: '1',
+          },
+        })
       },
     },
   }

src/views/consult/index.vue

@@ -217,9 +217,11 @@
       },
     },
     activated() {
+      this.getParams()
       this.queryData()
     },
     mounted() {
+      this.getParams()
       this.queryData()
       this.getOptions()
     },
@@ -277,6 +279,7 @@
         })
       },
       handleDetail(row) {
+        this.storeParams()
         this.$router.push({
           path: '/consult/detail',
           query: {
@@ -312,6 +315,37 @@
           })
         }
       },
+      // 存储参数
+      storeParams() {
+        let data = {
+          pageNum: this.queryForm.pageNum,
+          pageSize: this.queryForm.pageSize,
+          name: this.queryForm.name,
+          inchargeName: this.queryForm.inchargeName,
+          unit: this.queryForm.unit,
+          state: this.queryForm.state,
+          total: this.total,
+        }
+        localStorage.setItem('consultSearchParams', JSON.stringify(data))
+      },
+      // 获取参数
+      getParams() {
+        if (this.$route.params.isGetParams == '1') {
+          let params = localStorage.getItem('consultSearchParams')
+          if (params) {
+            let data = JSON.parse(params)
+            this.queryForm.pageNum = data.pageNum
+            this.queryForm.pageSize = data.pageSize
+            this.queryForm.name = data.name
+            this.queryForm.inchargeName = data.inchargeName
+            this.queryForm.unit = data.unit
+            this.queryForm.state = data.state
+            this.total = data.total
+          }
+          localStorage.removeItem('consultSearchParams')
+          this.$route.params.isGetParams = undefined
+        }
+      },
     },
   }
 </script>

src/views/plat/work/index.vue

@@ -89,7 +89,7 @@
                         <el-descriptions-item label="总结/问题">
                           <span v-html="row.feedbackTrialContent.replace(/\n/g, '<br>')"></span>
                         </el-descriptions-item>
-                        <el-descriptions-item label="客户/经销商反馈">
+                        <el-descriptions-item label="讲解纪要补充">
                           <span v-html="row.feedbackTrialDist.replace(/\n/g, '<br>')"></span>
                         </el-descriptions-item>
                         <el-descriptions-item label="计划">
@@ -118,7 +118,7 @@
                         <el-descriptions-item label="总结/问题">
                           <span v-html="row.feedbackTrialContent.replace(/\n/g, '<br>')"></span>
                         </el-descriptions-item>
-                        <el-descriptions-item label="客户/经销商反馈">
+                        <el-descriptions-item label="讲解纪要补充">
                           <span v-html="row.feedbackTrialDist.replace(/\n/g, '<br>')"></span>
                         </el-descriptions-item>
                         <el-descriptions-item label="计划">
@@ -151,7 +151,7 @@
                         <el-descriptions-item label="总结/问题">
                           <span v-html="row.feedbackTrialContent.replace(/\n/g, '<br>')"></span>
                         </el-descriptions-item>
-                        <el-descriptions-item label="客户/经销商反馈">
+                        <el-descriptions-item label="讲解纪要补充">
                           <span v-html="row.feedbackTrialDist.replace(/\n/g, '<br>')"></span>
                         </el-descriptions-item>
                         <el-descriptions-item label="计划">
@@ -179,13 +179,13 @@
                     <el-descriptions-item v-if="v.orderTypeName == '售前讲解支持'" label="会议纪要">
                       <span v-html="v.feedbackSaleMeeting.replace(/\n/g, '<br>')"></span>
                     </el-descriptions-item>
-                    <el-descriptions-item v-if="v.orderTypeName == '售前讲解支持'" label="客户/经销商反馈">
+                    <el-descriptions-item v-if="v.orderTypeName == '售前讲解支持'" label="讲解纪要补充">
                       <span v-html="v.feedbackSaleDist.replace(/\n/g, '<br>')"></span>
                     </el-descriptions-item>
                     <el-descriptions-item v-if="v.orderTypeName == '技术文件支持'" label="用户反馈">
                       <span v-html="v.feedbackSaleUser.replace(/\n/g, '<br>')"></span>
                     </el-descriptions-item>
-                    <el-descriptions-item label="下一步计划">
+                    <el-descriptions-item label="销售下一步工作计划">
                       <span v-html="v.feedbackSaleNext.replace(/\n/g, '<br>')"></span>
                     </el-descriptions-item>
                   </el-descriptions>

src/views/proj/business/components/DetailsFollow.vue

@@ -21,12 +21,16 @@
                     {{ item.followDate }}
                   </span>
                 </p>
-                <p style="white-space: pre-wrap">{{ item.followContent }}</p>
+                <p style="white-space: pre-wrap">本次跟进内容：{{ item.followContent }}</p>
+                <p style="white-space: pre-wrap">达成效果：{{ item.effect }}</p>
+                <p style="white-space: pre-wrap">问题或困难：{{ item.issue }}</p>
+                <p style="white-space: pre-wrap">计划和目标：{{ item.furtherPlan }}</p>
                 <div class="footer">
-                  <p>
+                  <!-- <p>
                     来自客户：
                     <span>{{ item.custName }}</span>
-                  </p>
+                  </p> -->
+                  <p></p>
                   <div>
                     <el-button icon="el-icon-edit" size="mini" @click="postComments(item)">发表评论</el-button>
                     <el-button size="mini" @click="showDetail(item)">

src/views/work/order/components/FeedbackRecord.vue

@@ -72,10 +72,10 @@
         <el-descriptions-item label="会议纪要">
           <span v-html="detail.feedbackSaleMeeting.replace(/\n/g, '<br>')"></span>
         </el-descriptions-item>
-        <el-descriptions-item label="客户/经销商反馈">
+        <el-descriptions-item label="讲解纪要补充">
           <span v-html="detail.feedbackSaleDist.replace(/\n/g, '<br>')"></span>
         </el-descriptions-item>
-        <el-descriptions-item label="下一步计划">
+        <el-descriptions-item label="销售下一步工作计划">
           <span v-html="detail.feedbackSaleNext.replace(/\n/g, '<br>')"></span>
         </el-descriptions-item>
         <el-descriptions-item label="技术支持满意度">
@@ -146,7 +146,7 @@
             disableCheck: false,
           },
           {
-            label: '客户/经销商反馈',
+            label: '讲解纪要补充',
             width: 'auto',
             prop: 'feedbackTrialDist',
             sortable: false,

src/views/work/order/components/SaleFeedback.vue

@@ -31,10 +31,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="客户/经销商反馈" prop="feedbackSaleDist">
+          <el-form-item label="讲解纪要补充" prop="feedbackSaleDist">
             <el-input
               v-model="form.feedbackSaleDist"
-              placeholder="客户/经销商反馈"
+              placeholder="讲解纪要补充"
               :rows="5"
               show-word-limit
               type="textarea" />
@@ -58,10 +58,10 @@
       <!-- END -->
       <el-row v-if="workType == '售前讲解支持' || workType == '技术文件支持' || workType == '经销商支持'">
         <el-col :span="24">
-          <el-form-item label="下一步计划" prop="feedbackSaleNext">
+          <el-form-item label="销售下一步工作计划" prop="feedbackSaleNext">
             <el-input
               v-model="form.feedbackSaleNext"
-              placeholder="下一步计划"
+              placeholder="要求分条叙述、每项工作写清楚完成日期"
               :rows="5"
               show-word-limit
               type="textarea" />
@@ -85,20 +85,27 @@
       <el-row v-if="workType == '售前讲解支持' || workType == '技术文件支持' || workType == '经销商支持'">
         <el-col :span="24">
           <el-form-item label="技术支持满意度" prop="satisfactionRating">
-            <el-radio-group v-model="form.satisfactionRating">
-              <el-radio label="1">1分</el-radio>
-              <el-radio label="2">2分</el-radio>
-              <el-radio label="3">3分</el-radio>
-              <el-radio label="4">4分</el-radio>
-              <el-radio label="5">5分</el-radio>
-            </el-radio-group>
+            <el-input-number
+              v-model.number="form.feedbackSaleOrder"
+              :max="5"
+              :min="1"
+              placeholder="满分为100分，请填写具体分值"
+              show-word-limit
+              :step="1" />
+            <!--            <el-radio-group v-model="form.satisfactionRating">-->
+            <!--              <el-radio label="1">1分</el-radio>-->
+            <!--              <el-radio label="2">2分</el-radio>-->
+            <!--              <el-radio label="3">3分</el-radio>-->
+            <!--              <el-radio label="4">4分</el-radio>-->
+            <!--              <el-radio label="5">5分</el-radio>-->
+            <!--            </el-radio-group>-->
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="技术支持提升建议" prop="promotionProposal">
             <el-input
               v-model="form.promotionProposal"
-              placeholder="技术支持提升建议"
+              placeholder="请从材料准备完善度、讲解技巧和态度、讲解礼仪等方面反馈"
               :rows="5"
               show-word-limit
               type="textarea" />
@@ -139,6 +146,7 @@
           feedbackSaleNext: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
           feedbackSaleOrder: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
           satisfactionRating: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
+          promotionProposal: [{ required: true, message: '不能为空', trigger: ['blur', 'change'] }],
         },
         dialogFormVisible: false,
       }

src/views/work/order/components/TryFeedback.vue

@@ -23,10 +23,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="客户/经销商反馈" prop="feedbackTrialDist">
+          <el-form-item label="讲解纪要补充" prop="feedbackTrialDist">
             <el-input
               v-model="form.feedbackTrialDist"
-              placeholder="客户/经销商反馈"
+              placeholder="讲解纪要补充"
               :rows="5"
               show-word-limit
               type="textarea" />

src/views/work/order/components/TryFeedbackDetail.vue

@@ -25,10 +25,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="客户/经销商反馈" prop="feedbackTrialDist">
+          <el-form-item label="讲解纪要补充" prop="feedbackTrialDist">
             <el-input
               v-model="form.feedbackTrialDist"
-              placeholder="客户/经销商反馈"
+              placeholder="讲解纪要补充"
               readonly
               :rows="5"
               show-word-limit
@@ -102,7 +102,7 @@
             str = '跟进计划'
             break
           case '30':
-            str = '下一步计划'
+            str = '销售下一步工作计划'
             break
         }
         return str

src/views/work/train/head/index.vue

@@ -72,7 +72,7 @@
             {{ parseTime(row.trainConcreteEndTime, '{h}:{i}') }}
           </span>
           <!-- <span v-else-if="item.prop === 'trainConcreteEndTime'">
-           {{ parseTime(row.trainConcreteEndTime, ' {h}:{m}:{s}') }} 
+           {{ parseTime(row.trainConcreteEndTime, ' {h}:{m}:{s}') }}
           </span> -->
           <span v-else>{{ row[item.prop] }}</span>
         </template>
@@ -194,7 +194,7 @@
         this.$refs['ToDetailRef'].showEdit(id)
       },
       async del(id) {
-        const [err, res] = await to(api.DeleteByIds({ ids: [id] }))
+        const [err] = await to(api.DeleteByIds({ ids: [id] }))
         if (err) return (this.listLoading = false)
         this.fetchData()
       },