Merge commit '2f959c8950912cf6117e01fcb9044a07cd2755a5'

smsb-plus-ui/src/views/smsb/scScanCode/index.vue

@@ -40,29 +40,30 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>-->
-
-      <el-table v-loading="loading" :data="scScanCodeList" @selection-change="handleSelectionChange">
-<!--        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键ID" align="center" prop="id" v-if="true" />-->
-        <el-table-column label="" align="left" prop=""  width="10"/>
-        <el-table-column label="扫码设备" align="left" prop="deviceName" width="200" :show-overflow-tooltip="true"/>
-        <el-table-column label="设备标识" align="left" prop="identifier" width="220"/>
-        <el-table-column label="设备MAC" align="left" prop="deviceMac" width="160"/>
-        <el-table-column label="企业名称" align="left" prop="enterprise" :show-overflow-tooltip="true"/>
-        <el-table-column label="手机号" align="left" prop="phone" width="120"/>
-        <el-table-column label="区域编号" align="center" prop="regionCode" width="120" :show-overflow-tooltip="true"/>
+      <div class="table-content">
+        <el-table v-loading="loading" :data="scScanCodeList" @selection-change="handleSelectionChange">
+          <!--        <el-table-column type="selection" width="55" align="center" />
+                  <el-table-column label="主键ID" align="center" prop="id" v-if="true" />-->
+          <el-table-column label="" align="left" prop="" width="10"/>
+          <el-table-column label="扫码设备" align="left" prop="deviceName" width="200" :show-overflow-tooltip="true"/>
+          <el-table-column label="设备标识" align="left" prop="identifier" width="220"/>
+          <el-table-column label="设备MAC" align="left" prop="deviceMac" width="160"/>
+          <el-table-column label="企业名称" align="left" prop="enterprise" :show-overflow-tooltip="true"/>
+          <el-table-column label="手机号" align="left" prop="phone" width="120"/>
+          <el-table-column label="区域编号" align="center" prop="regionCode" width="120" :show-overflow-tooltip="true"/>
         <el-table-column label="区域" align="left" prop="region" width="180" :show-overflow-tooltip="true"/>
-        <el-table-column label="预约人数" align="center" prop="personNum" width="100" :show-overflow-tooltip="true"/>
-        <el-table-column label="扫码时间" align="left" prop="createTime" width="160"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
-          <template #default="scope">
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['digital:scScanCode:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
+          <el-table-column label="预约人数" align="center" prop="personNum" width="100" :show-overflow-tooltip="true"/>
+          <el-table-column label="扫码时间" align="left" prop="createTime" width="160"/>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+            <template #default="scope">
+              <el-tooltip content="删除" placement="top">
+                <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['digital:scScanCode:remove']"></el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改扫码记录对话框 -->
@@ -109,10 +110,16 @@
 </template>
 
 <script setup name="ScScanCode" lang="ts">
-import { listScScanCode, getScScanCode, delScScanCode, addScScanCode, updateScScanCode } from '@/api/smsb/digital/scScanCode/api';
-import { ScScanCodeVO, ScScanCodeQuery, ScScanCodeForm } from '@/api/smsb/digital/scScanCode/types';
+import {
+  addScScanCode,
+  delScScanCode,
+  getScScanCode,
+  listScScanCode,
+  updateScScanCode
+} from '@/api/smsb/digital/scScanCode/api';
+import {ScScanCodeForm, ScScanCodeQuery, ScScanCodeVO} from '@/api/smsb/digital/scScanCode/types';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 
 const scScanCodeList = ref<ScScanCodeVO[]>([]);
 const buttonLoading = ref(false);

smsb-plus-ui/src/views/smsb/scScene/index.vue

@@ -2,16 +2,17 @@
   <div class="p-2">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
+        <el-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="场景名称" prop="interactionName">
-              <el-input v-model="queryParams.interactionName" placeholder="请输入场景名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.interactionName" placeholder="请输入场景名称" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
-            <el-form-item label="服务商名称" prop="supplierName">
-              <el-input v-model="queryParams.supplierName" placeholder="请输入服务商名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="服务商" prop="supplierName">
+              <el-input v-model="queryParams.supplierName" placeholder="请输入服务商名称" clearable @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item label="预约企业" prop="enterprise">
-              <el-input v-model="queryParams.enterprise" placeholder="请输入预约企业" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.enterprise" placeholder="请输入预约企业" clearable @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -23,96 +24,83 @@
     </transition>
 
     <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['digital:chatScScene:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['digital:chatScScene:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['digital:chatScScene:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['digital:chatScScene:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="chatScSceneList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键ID" align="center" prop="id" v-if="true" />
-        <el-table-column label="类型 1-总结 2-条目" align="center" prop="type" />
-        <el-table-column label="场景名称" align="center" prop="interactionName" />
-        <el-table-column label="图片" align="center" prop="photo" />
-        <el-table-column label="服务商名称" align="center" prop="supplierName" />
-        <el-table-column label="应用价值" align="center" prop="applicationValue" />
-        <el-table-column label="场景介绍" align="center" prop="description" />
-        <el-table-column label="价格" align="center" prop="priceText" />
-        <el-table-column label="适用领域" align="center" prop="domainsName" />
-        <el-table-column label="预约ID" align="center" prop="appointmentId" />
-        <el-table-column label="预约企业" align="center" prop="enterprise" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!--      <template #header>
+              <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                  <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['digital:chatScScene:add']">新增</el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['digital:chatScScene:edit']">修改</el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['digital:chatScScene:remove']">删除</el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['digital:chatScScene:export']">导出</el-button>
+                </el-col>
+                <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+              </el-row>
+            </template>-->
+      <div class="table-content">
+        <el-table v-loading="loading" :data="chatScSceneList" @selection-change="handleSelectionChange">
+          <el-table-column label="" align="left" prop="" width="10"/>
+          <el-table-column label="场景名称" align="left" prop="interactionName" :show-overflow-tooltip="true"/>
+          <el-table-column label="服务商" align="left" prop="supplierName" width="220" :show-overflow-tooltip="true"/>
+          <el-table-column label="应用价值" align="left" prop="applicationValue" width="250" :show-overflow-tooltip="true"/>
+          <el-table-column label="场景介绍" align="left" prop="description" :show-overflow-tooltip="true"/>
+          <el-table-column label="价格" align="left" prop="priceText" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="适用领域" align="left" prop="domainsName" :show-overflow-tooltip="true" width="150"/>
+<!--        <el-table-column label="预约ID" align="center" prop="appointmentId" />-->
+        <el-table-column label="预约企业" align="left" prop="enterprise" width="150" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建时间" align="left" prop="createTime" width="165"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['digital:chatScScene:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['digital:chatScScene:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['digital:chatScScene:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['digital:chatScScene:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
-      </el-table>
-
+        </el-table>
+      </div>
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改数促-场景体验对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="chatScSceneFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="场景名称" prop="interactionName">
-          <el-input v-model="form.interactionName" placeholder="请输入场景名称" />
-        </el-form-item>
-        <el-form-item label="图片" prop="photo">
-          <el-input v-model="form.photo" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="服务商名称" prop="supplierName">
-          <el-input v-model="form.supplierName" placeholder="请输入服务商名称" />
-        </el-form-item>
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1200px" append-to-body>
+      <el-form ref="chatScSceneFormRef" :model="form" :rules="rules" label-width="70px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="场景名称" prop="interactionName">
+              <el-input v-model="form.interactionName" placeholder="请输入场景名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务商" prop="supplierName">
+              <el-input v-model="form.supplierName" placeholder="请输入服务商名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="适用领域" prop="domainsName">
+              <el-input v-model="form.domainsName" placeholder="请输入适用领域" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="价格" prop="priceText">
+              <el-input v-model="form.priceText" placeholder="请输入价格" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="应用价值" prop="applicationValue">
-          <el-input v-model="form.applicationValue" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.applicationValue" type="textarea" :rows="4" placeholder="请输入应用价值" />
         </el-form-item>
         <el-form-item label="场景介绍" prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="价格" prop="priceText">
-          <el-input v-model="form.priceText" placeholder="请输入价格" />
-        </el-form-item>
-        <el-form-item label="适用领域" prop="domainsName">
-          <el-input v-model="form.domainsName" placeholder="请输入适用领域" />
-        </el-form-item>
-        <el-form-item label="预约ID" prop="appointmentId">
-          <el-input v-model="form.appointmentId" placeholder="请输入预约ID" />
-        </el-form-item>
-        <el-form-item label="预约企业" prop="enterprise">
-          <el-input v-model="form.enterprise" placeholder="请输入预约企业" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
-          <el-date-picker clearable
-                          v-model="form.createTime"
-                          type="datetime"
-                          value-format="YYYY-MM-DD HH:mm:ss"
-                          placeholder="请选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="租户标识" prop="tenantId">
-          <el-input v-model="form.tenantId" placeholder="请输入租户标识" />
+          <el-input v-model="form.description" type="textarea" :rows="5" placeholder="请输入场景介绍" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -126,10 +114,16 @@
 </template>
 
 <script setup name="ChatScScene" lang="ts">
-import { listChatScScene, getChatScScene, delChatScScene, addChatScScene, updateChatScScene } from '@/api/smsb/digital/scScene/api';
-import { ChatScSceneVO, ChatScSceneQuery, ChatScSceneForm } from '@/api/smsb/digital/scScene/types';
+import {
+  addChatScScene,
+  delChatScScene,
+  getChatScScene,
+  listChatScScene,
+  updateChatScScene
+} from '@/api/smsb/digital/scScene/api';
+import {ChatScSceneForm, ChatScSceneQuery, ChatScSceneVO} from '@/api/smsb/digital/scScene/types';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 
 const chatScSceneList = ref<ChatScSceneVO[]>([]);
 const buttonLoading = ref(false);