Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

src/views/customer/file/index.vue

@@ -162,6 +162,7 @@
                   <template #default>
                     <div style="width: 100%">
                       <div style="color: #909399; margin: 8px 0">跟进时间: {{ record.date }}</div>
+                      <div style="margin: 8px 0">跟进人: {{ dictValueLabel(record.createUser, userList) }}</div>
                       <div style="word-wrap: break-word; margin: 8px 0" v-html="getStyle(record.content)" v-if="record.content"></div>
                       <div v-else>跟进记录:</div>
                       <div style="margin: 8px 0; display: flex" v-if="record.fileList && record.fileList.length > 0">

src/views/customer/highseas/index.vue

@@ -162,6 +162,7 @@
                   <template #default>
                     <div style="width: 100%">
                       <div style="color: #909399; margin: 8px 0">跟进时间: {{ record.date }}</div>
+                      <div style="margin: 8px 0">跟进人: {{ dictValueLabel(record.createUser, userList) }}</div>
                       <div style="word-wrap: break-word; margin: 8px 0" v-html="getStyle(record.content)" v-if="record.content"></div>
                       <div v-else>跟进记录:</div>
                       <div style="margin: 8px 0; display: flex" v-if="record.fileList && record.fileList.length > 0">
@@ -470,7 +471,7 @@ const sourceList = ref({
     pageNum: 1,
     pageSize: 10,
     keyword: "",
-    type: "",
+    type: 0,
     source: "",
     status: "",
     name: "",

src/views/customer/privatesea/index.vue

@@ -162,6 +162,7 @@
                   <template #default>
                     <div style="width: 100%">
                       <div style="color: #909399; margin: 8px 0">跟进时间: {{ record.date }}</div>
+                      <div style="margin: 8px 0">跟进人: {{ dictValueLabel(record.createUser, userList) }}</div>
                       <div style="word-wrap: break-word; margin: 8px 0" v-html="getStyle(record.content)" v-if="record.content"></div>
                       <div v-else>跟进记录:</div>
                       <div style="margin: 8px 0; display: flex" v-if="record.fileList && record.fileList.length > 0">