From 02aa4d157d800650f1dc2fa2b7fbee52837df074 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 01 十二月 2023 13:46:07 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01

---
 src/views/followvisit/record/index.vue |  121 +++++++++++++++++++++++----------------
 1 files changed, 71 insertions(+), 50 deletions(-)

diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 0b922c4..6d8904c 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -87,30 +87,6 @@
             >鏂板</el-button
           >
         </el-col>
-        <!-- <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="medium"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['system:user:edit']"
-            >淇敼</el-button
-          >
-        </el-col> -->
-        <!-- <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="medium"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:user:remove']"
-            >鍒犻櫎</el-button
-          >
-        </el-col> -->
         <el-col :span="1.5">
           <div class="documentf">
             <div class="document">
@@ -200,11 +176,6 @@
 
         <!-- <el-col :span="1.5"> </el-col> -->
       </el-row>
-      <!-- <right-toolbar
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-              :columns="columns"
-            ></right-toolbar> -->
       <el-table
         v-loading="loading"
         :data="userList"
@@ -219,41 +190,37 @@
         />
 
         <el-table-column
-          label="浠诲姟鍚嶇О"
+          label="鐥呭巻鍙�"
           align="center"
           sortable
           key="userName"
           prop="userName"
-          :show-overflow-tooltip="true"
+          width="120"
         />
+        <el-table-column label="濮撳悕" align="center" key="types" prop="types" />
         <el-table-column
-          label="鏈嶅姟妯℃澘"
-          align="center"
-          key="types"
-          prop="types"
-        />
-        <el-table-column
-          label="鍒涘缓鏃ユ湡"
+          label="骞撮緞"
           align="center"
           key="nickName"
           prop="nickName"
         />
         <el-table-column
-          label="寰呮墽琛�/鎬绘暟"
+          label="搴婂彿"
+          align="center"
+          key="nickName"
+          prop="nickName"
+        />
+        <el-table-column
+          label="绉戝/鐥呭尯"
           align="center"
           key="phonenumber"
           prop="phonenumber"
           width="120"
         >
-          <template slot-scope="scope">
-            <span style="margin-left: 10px"
-              >{{ scope.row.date }}/{{ scope.row.data }}</span
-            >
-          </template>
         </el-table-column>
 
         <el-table-column
-          label="鎵ц鐘舵��"
+          label="鐤剧梾鍚嶇О"
           align="center"
           key="topicnumber"
           prop="topicnumber"
@@ -261,21 +228,52 @@
           :show-overflow-tooltip="true"
         >
           <template slot-scope="scope">
-            <div>鎵ц瀹屾垚/寰呭鏍�</div>
+            <div>杞诲害楠ㄨ</div>
           </template>
         </el-table-column>
         <el-table-column
-          label="瀹℃牳浜�"
+          label="闅忚鐘舵��"
+          align="center"
+          key="topicnumber"
+          prop="topicnumber"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>鏈畬鎴�</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="闅忚鏂规"
           align="center"
           key="topicnumberaa"
           prop="topicnumberaa"
-          sortable
           width="120"
-          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="瀹ｆ暀鏉愭枡"
+          align="center"
+          key="topicnumberaa"
+          prop="topicnumberaa"
+          width="120"
+        />
+        <el-table-column
+          label="闅忚鏂瑰紡"
+          align="center"
+          key="topicnumberaa"
+          prop="topicnumberaa"
+          width="120"
+        />
+        <el-table-column
+          label="闅忚浜哄憳"
+          align="center"
+          key="topicnumberaa"
+          prop="topicnumberaa"
+          width="120"
         />
 
         <el-table-column
-          label="瀹℃牳鏃堕棿"
+          label="灏辫瘖鏃堕棿"
           sortable
           align="center"
           prop="createTime"
@@ -285,6 +283,29 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="闅忚鏃堕棿"
+          sortable
+          align="center"
+          prop="createTime"
+          width="160"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鍥炲鏃堕棿"
+          sortable
+          align="center"
+          prop="createTime"
+          width="160"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+
 
         <el-table-column
           label="鎿嶄綔"

--
Gitblit v1.9.3