Ver Fonte

服务列表字段增加,待优化为JSON数组

Huanyi há 1 mês atrás
pai
commit
3347aaea6a
3 ficheiros alterados com 16 adições e 2 exclusões
  1. 10 0
      src/api/service/list/types.ts
  2. 5 1
      src/views/service/list/index.vue
  3. 1 1
      vite.config.ts

+ 10 - 0
src/api/service/list/types.ts

@@ -33,6 +33,11 @@ export interface ServiceVO {
    */
   remark: string;
 
+  /**
+   * 打卡备注信息
+   */
+  clockInRemark: string;
+
   /**
    * 创建时间
    */
@@ -69,6 +74,11 @@ export interface ServiceForm extends BaseEntity {
    * 备注说明
    */
   remark?: string;
+
+  /**
+   * 打卡备注信息
+   */
+  clockInRemark?: string;
 }
 
 export interface ServiceQuery extends PageQuery {

+ 5 - 1
src/views/service/list/index.vue

@@ -50,7 +50,7 @@
             {{ getModeLabel(scope.row.mode) }}
           </template>
         </el-table-column>
-        <el-table-column label="备注说明" align="center" prop="remark" width="700" />
+        <el-table-column label="备注说明" align="center" prop="remark" width="700" show-overflow-tooltip />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
@@ -100,6 +100,9 @@
         <el-form-item label="备注说明" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注说明" />
         </el-form-item>
+        <el-form-item label="打卡备注" prop="clockInRemark">
+          <el-input v-model="form.clockInRemark" placeholder="请输入打卡备注信息(将对小程序端展示)" />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -147,6 +150,7 @@ const initFormData: ServiceForm = {
   mode: undefined,
   sort: undefined,
   remark: undefined,
+  clockInRemark: undefined,
   tenantId: undefined
 };
 const data = reactive<PageData<ServiceForm, ServiceQuery>>({

+ 1 - 1
vite.config.ts

@@ -24,7 +24,7 @@ export default defineConfig(({ mode, command }) => {
       // open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://127.0.0.1:8080',
+          target: 'http://192.168.1.118:8080',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')