From f087e19438a53f26a72a3de2afc19e9c54314827 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Sat, 29 Mar 2025 02:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/model/AppletServiceLog/index.vue     | 47 +++++++++++++++-------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletServiceLog/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletServiceLog/index.vue
index ad0cd9d..3f06a5c 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletServiceLog/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletServiceLog/index.vue
@@ -80,15 +80,22 @@
     <el-table v-loading="loading" :data="AppletServiceLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="唯一标识" align="center" prop="id" />
-      <el-table-column label="服务类型" align="center" prop="serviceType" v-if="columns[0].visible"/>
-      <el-table-column label="服务时间" align="center" prop="serviceTime" width="180" v-if="columns[1].visible">
+      <el-table-column label="用户标识" align="center" prop="userId"/>
+      <el-table-column label="服务类型" align="center" prop="serviceType"/>
+      <el-table-column label="服务时间" align="center" prop="serviceTime" width="180" >
         <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.serviceTime, '')}}</span>
+          <span>{{ parseTime(scope.row.serviceTime, '')}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="服务地点" align="center" prop="serviceSpot" v-if="columns[2].visible"/>
-      <el-table-column label="文字记录" align="center" prop="text" v-if="columns[3].visible"/>
-      <el-table-column label="图片记录" align="center" prop="image" v-if="columns[4].visible"/>
+      <el-table-column label="服务地点" align="center" prop="serviceSpot"/>
+      <el-table-column label="文字记录" align="center" prop="text" />
+<!--      <el-table-column label="图片记录" align="center" prop="image" />-->
+<!--      <el-table-column label="图片记录" align="center" prop="image">-->
+<!--        <template slot-scope="{ row }">-->
+<!--          <el-image v-if="row.image[0]" :src="row.image[0]" :preview-src-list="[row.image[0]]" class="small-img circle-img"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -96,19 +103,19 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['model:AppletServiceLog:edit']"
+            v-hasPermi="['model:appletServiceLog:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['model:AppletServiceLog:remove']"
+            v-hasPermi="['model:appletServiceLog:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -117,15 +124,24 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改服务记录对话框 -->
+    <!-- 添加或修改服务记录表对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="用户标识" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户标识" />
+        </el-form-item>
+        <el-form-item label="服务类型" prop="serviceType">
+<!--          <el-select v-model="form.serviceType" placeholder="请选择服务类型">-->
+<!--            <el-option label="请选择字典生成" value="" />-->
+<!--          </el-select>-->
+          <el-input v-model="form.serviceType" placeholder="请输入用户标识" />
+        </el-form-item>
         <el-form-item label="服务时间" prop="serviceTime">
           <el-date-picker clearable size="small"
-                        v-model="form.serviceTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="选择服务时间">
+                          v-model="form.serviceTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择服务时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="服务地点" prop="serviceSpot">
@@ -135,7 +151,8 @@
           <el-input v-model="form.text" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="图片记录">
-          <imageUpload v-model="form.image"/>
+<!--          <imageUpload v-model="form.image"/>-->
+          <oss-image-upload v-model="form.image" :limit="1"></oss-image-upload>
         </el-form-item>
         <el-form-item label="删除标识" prop="delFlag">
           <el-input v-model="form.delFlag" placeholder="请输入删除标识" />