修改

src/api/mallManagement/apply.js

+import request from '@/utils/request'
+
+// 查询商城商户申请列表
+export function listApply(query) {
+  return request({
+    url: '/system/apply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商城商户申请详细
+export function getApply(id) {
+  return request({
+    url: '/system/apply/' + id,
+    method: 'get'
+  })
+}
+
+// 新增商城商户申请
+export function addApply(data) {
+  return request({
+    url: '/system/apply',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商城商户申请
+export function updateApply(data) {
+  return request({
+    url: '/system/apply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商城商户申请
+export function delApply(id) {
+  return request({
+    url: '/system/apply/' + id,
+    method: 'delete'
+  })
+}

src/api/mallManagement/income.js

+import request from '@/utils/request'
+
+// 查询商城提现审批列表
+export function listIncome(query) {
+  return request({
+    url: '/system/income/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商城提现审批详细
+export function getIncome(id) {
+  return request({
+    url: '/system/income/' + id,
+    method: 'get'
+  })
+}
+
+// 新增商城提现审批
+export function addIncome(data) {
+  return request({
+    url: '/system/income',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商城提现审批
+export function updateIncome(data) {
+  return request({
+    url: '/system/income',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商城提现审批
+export function delIncome(id) {
+  return request({
+    url: '/system/income/' + id,
+    method: 'delete'
+  })
+}

src/api/mallManagement/order.js

+/*
+ * @Author: ‘巴博尔’ 2164119982@qq.com
+ * @Date: 2023-09-11 10:51:38
+ * @LastEditors: ‘巴博尔’ 2164119982@qq.com
+ * @LastEditTime: 2023-09-11 11:43:47
+ * @FilePath: \peizhen-vue\src\api\mallManagement\order.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import request from '@/utils/request'
+
+// 查询商城订单列表
+export function listOrder(query) {
+  return request({
+    url: '/system/storeOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商城订单详细
+export function getOrder(id) {
+  return request({
+    url: '/system/order/' + id,
+    method: 'get'
+  })
+}
+
+// 新增商城订单
+export function addOrder(data) {
+  return request({
+    url: '/system/order',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商城订单
+export function updateOrder(data) {
+  return request({
+    url: '/system/order',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商城订单
+export function delOrder(id) {
+  return request({
+    url: '/system/order/' + id,
+    method: 'delete'
+  })
+}

src/api/orderManagement/order.js

+import request from '@/utils/request'
+
+// 查询预约陪诊订单列表
+export function listOrder(query) {
+  return request({
+    url: '/system/yypzOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询预约陪诊订单详细
+export function getOrder(id) {
+  return request({
+    url: '/system/yypzOrder/' + id,
+    method: 'get'
+  })
+}
+
+// 新增预约陪诊订单
+export function addOrder(data) {
+  return request({
+    url: '/system/yypzOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改预约陪诊订单
+export function updateOrder(data) {
+  return request({
+    url: '/system/yypzOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除预约陪诊订单
+export function delOrder(id) {
+  return request({
+    url: '/system/yypzOrder/' + id,
+    method: 'delete'
+  })
+}

src/api/user/companion/index.js

+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/ruoyi";
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/system/employees/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/employees',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询授权角色
+export function getAuthRole(userId) {
+  return request({
+    url: '/system/user/authRole/' + userId,
+    method: 'get'
+  })
+}
+
+// 保存授权角色
+export function updateAuthRole(data) {
+  return request({
+    url: '/system/user/authRole',
+    method: 'put',
+    params: data
+  })
+}
+
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+    url: '/system/user/deptTree',
+    method: 'get'
+  })
+}

src/api/user/merchant/index.js

+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/ruoyi";
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/merchant/company/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/merchant/company',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询授权角色
+export function getAuthRole(userId) {
+  return request({
+    url: '/system/user/authRole/' + userId,
+    method: 'get'
+  })
+}
+
+// 保存授权角色
+export function updateAuthRole(data) {
+  return request({
+    url: '/system/user/authRole',
+    method: 'put',
+    params: data
+  })
+}
+
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+    url: '/system/user/deptTree',
+    method: 'get'
+  })
+}

src/components/ImageUpload/index.vue

@@ -16,6 +16,7 @@
       :file-list="fileList"
       :on-preview="handlePictureCardPreview"
       :class="{hide: this.fileList.length >= this.limit}"
+      :disabled="disabled"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
@@ -68,6 +69,10 @@ export default {
     isShowTip: {
       type: Boolean,
       default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

src/store/modules/permission.js

@@ -122,6 +122,7 @@ export function filterDynamicRoutes(routes) {
 }
 
 export const loadView = (view) => {
+  console.log(view,"=======loadView")
   if (process.env.NODE_ENV === 'development') {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {

src/views/hispotalManage/doctor/index.vue

@@ -227,7 +227,7 @@ export default {
   data() {
     return {
       // 部门树选项
-      deptOptions: undefined,
+      deptOptions: [],
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -262,6 +262,7 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      hidList: [],
     };
   },
   created() {

src/views/hispotalManage/hospital/index.vue

@@ -2,7 +2,7 @@
  * @Author: ‘巴博尔’ 2164119982@qq.com
  * @Date: 2023-09-07 16:09:29
  * @LastEditors: ‘巴博尔’ 2164119982@qq.com
- * @LastEditTime: 2023-09-08 11:51:43
+ * @LastEditTime: 2023-09-11 13:56:36
  * @FilePath: \peizhen-vue\src\views\hispotalManage\hospital\index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -163,7 +163,17 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="医院名称" align="center" prop="name" />
-      <el-table-column label="Logo" align="center" prop="logo" />
+      <el-table-column label="Logo" align="center" prop="logo">
+        <template slot-scope="{ row }">
+          <imageUpload
+            v-if="row.logo"
+            v-model="row.logo"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
+        </template>
+      </el-table-column>
       <el-table-column label="等级" align="center" prop="levelName" />
       <el-table-column label="类别" align="center" prop="categoryName" />
       <el-table-column label="城市" align="center" prop="cityId" />

src/views/mallManagement/apply/index.vue

+<!--
+ * @Author: ‘巴博尔’ 2164119982@qq.com
+ * @Date: 2023-09-11 15:43:21
+ * @LastEditors: ‘巴博尔’ 2164119982@qq.com
+ * @LastEditTime: 2023-09-11 16:42:02
+ * @FilePath: \peizhen-vue\src\views\mallManagement\apply\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="商户" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入商户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:apply:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:apply:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:apply:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:apply:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="applyList"
+      @selection-change="handleSelectionChange"
+      show
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="申请人"
+        align="center"
+        key="applyName"
+        prop="applyName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="城市"
+        align="center"
+        prop="cityName"
+        key="cityName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="商户名称"
+        align="center"
+        prop="uid"
+        key="name"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="联系方式"
+        align="center"
+        prop="tel"
+        key="tel"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="地址"
+        align="center"
+        prop="address"
+        key="address"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="邮箱"
+        align="center"
+        prop="email"
+        key="email"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="营业执照"
+        align="center"
+        prop="businessLicense"
+        key="businessLicense"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="{ row }">
+          <imageUpload
+            v-if="row.businessLicense"
+            v-model="row.businessLicense"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="食品经营许可证"
+        align="center"
+        prop="foodBusinessLicense"
+        key="foodBusinessLicense"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="{ row }">
+          <imageUpload
+            v-if="row.foodBusinessLicense"
+            v-model="row.foodBusinessLicense"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="药品经营许可证"
+        align="center"
+        prop="drugBusinessLicense"
+        key="drugBusinessLicense"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="{ row }">
+          <imageUpload
+            v-if="row.drugBusinessLicense"
+            v-model="row.drugBusinessLicense"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="医疗器械经营许可证"
+        align="center"
+        prop="medicalBusinessLicense"
+        key="medicalBusinessLicense"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="{ row }">
+          <imageUpload
+            v-if="row.medicalBusinessLicense"
+            v-model="row.medicalBusinessLicense"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="第二类医疗器械经营许可证"
+        align="center"
+        prop="twoMedicalBusinessLicense"
+        key="twoMedicalBusinessLicense"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="{ row }">
+          <imageUpload
+            v-if="row.twoMedicalBusinessLicense"
+            v-model="row.twoMedicalBusinessLicense"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="是否缴纳保证金"
+        align="center"
+        prop="cashDeposit"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="保证金金额"
+        align="center"
+        prop="isCashDeposit"
+        key="isCashDeposit"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="{ row }">
+          <span v-if="row.isCashDeposit == 1">是</span>
+          <span v-if="row.isCashDeposit == 0">否</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        key="status"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="{ row }">
+          <el-select
+            v-model="row.status"
+            placeholder="请选择状态"
+            @change="changeStatus($event, row)"
+          >
+            <el-option
+              v-for="item in [
+                {
+                  label: '待审核',
+                  value: 0,
+                },
+                {
+                  label: '正常',
+                  value: 1,
+                },
+                {
+                  label: '禁用',
+                  value: 2,
+                },
+              ]"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="申请时间"
+        align="center"
+        prop="createTime"
+        key="createTime"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:apply:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:apply:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改商城商户申请对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="" prop="uid">
+          <el-input v-model="form.uid" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="name">
+          <el-input v-model="form.name" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="城市" prop="cityId">
+          <el-input v-model="form.cityId" placeholder="请输入城市" />
+        </el-form-item>
+        <el-form-item label="" prop="tel">
+          <el-input v-model="form.tel" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="email">
+          <el-input v-model="form.email" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="address">
+          <el-input v-model="form.address" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="业务许可证" prop="businessLicense">
+          <el-input
+            v-model="form.businessLicense"
+            placeholder="请输入业务许可证"
+          />
+        </el-form-item>
+        <el-form-item label="食品业务许可证" prop="foodBusinessLicense">
+          <el-input
+            v-model="form.foodBusinessLicense"
+            placeholder="请输入食品业务许可证"
+          />
+        </el-form-item>
+        <el-form-item label="药品经营许可证" prop="drugBusinessLicense">
+          <el-input
+            v-model="form.drugBusinessLicense"
+            placeholder="请输入药品经营许可证"
+          />
+        </el-form-item>
+        <el-form-item label="医疗许可证" prop="medicalBusinessLicense">
+          <el-input
+            v-model="form.medicalBusinessLicense"
+            placeholder="请输入医疗许可证"
+          />
+        </el-form-item>
+        <el-form-item
+          label="二级医疗许可证
+"
+          prop="twoMedicalBusinessLicense"
+        >
+          <el-input
+            v-model="form.twoMedicalBusinessLicense"
+            placeholder="请输入二级医疗许可证
+"
+          />
+        </el-form-item>
+        <el-form-item
+          label="是否缴纳保证金
+"
+          prop="isCashDeposit"
+        >
+          <el-input
+            v-model="form.isCashDeposit"
+            placeholder="请输入是否缴纳保证金
+"
+          />
+        </el-form-item>
+        <el-form-item label="保证金" prop="cashDeposit">
+          <el-input v-model="form.cashDeposit" placeholder="请输入保证金" />
+        </el-form-item>
+        <el-form-item label="" prop="remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="createdAt">
+          <el-date-picker
+            clearable
+            v-model="form.createdAt"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="" prop="updatedAt">
+          <el-date-picker
+            clearable
+            v-model="form.updatedAt"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listApply,
+  getApply,
+  delApply,
+  addApply,
+  updateApply,
+} from "@/api/mallManagement/apply";
+
+export default {
+  name: "Apply",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 商城商户申请表格数据
+      applyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        // uid: undefined,
+        name: undefined,
+        // cityId: undefined,
+        // tel: undefined,
+        // email: undefined,
+        // address: undefined,
+        // businessLicense: undefined,
+        // foodBusinessLicense: undefined,
+        // drugBusinessLicense: undefined,
+        // medicalBusinessLicense: undefined,
+        // twoMedicalBusinessLicense: undefined,
+        // isCashDeposit: undefined,
+        // cashDeposit: undefined,
+        // status: undefined,
+        // createdAt: undefined,
+        // updatedAt: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    changeStatus(e, row) {
+      console.log("changeStatus", e, row);
+      updateApply({
+        ...row,
+        status: e,
+      }).then((response) => {
+        this.$modal.msgSuccess("修改成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+    /** 查询商城商户申请列表 */
+    getList() {
+      this.loading = true;
+      listApply(this.queryParams).then((response) => {
+        this.applyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        uid: undefined,
+        name: undefined,
+        cityId: undefined,
+        tel: undefined,
+        email: undefined,
+        address: undefined,
+        businessLicense: undefined,
+        foodBusinessLicense: undefined,
+        drugBusinessLicense: undefined,
+        medicalBusinessLicense: undefined,
+        twoMedicalBusinessLicense: undefined,
+        isCashDeposit: undefined,
+        cashDeposit: undefined,
+        status: undefined,
+        remark: undefined,
+        createdAt: undefined,
+        updatedAt: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加商城商户申请";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids;
+      getApply(id).then((response) => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改商城商户申请";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateApply(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
+          } else {
+            addApply(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除商城商户申请编号为"' + ids + '"的数据项？')
+        .then(() => {
+          this.loading = true;
+          return delApply(ids);
+        })
+        .then(() => {
+          this.loading = false;
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/apply/export",
+        {
+          ...this.queryParams,
+        },
+        `apply_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/mallManagement/income/index.vue

+<!--
+ * @Author: ‘巴博尔’ 2164119982@qq.com
+ * @Date: 2023-09-11 15:44:37
+ * @LastEditors: ‘巴博尔’ 2164119982@qq.com
+ * @LastEditTime: 2023-09-11 16:43:12
+ * @FilePath: \peizhen-vue\src\views\mallManagement\income\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="商户" prop="storeName">
+        <el-input
+          v-model="queryParams.storeName"
+          placeholder="请输入商户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:income:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:income:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:income:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:income:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="incomeList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="商户" align="center" prop="storeName" />
+      <el-table-column label="金额" align="center" prop="amount" />
+      <el-table-column label="发票信息" align="center" prop="invoice" />
+      <el-table-column label="反馈信息" align="center" prop="feedback" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="{ row }">
+          <el-select
+            v-model="row.status"
+            placeholder="请选择状态"
+            @change="changeStatus($event, row)"
+          >
+            <el-option
+              v-for="item in [
+                {
+                  label: '待审核',
+                  value: 0,
+                },
+                {
+                  label: '正常',
+                  value: 1,
+                },
+                {
+                  label: '禁用',
+                  value: 2,
+                },
+              ]"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <!-- <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:income:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:income:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改商城提现审批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="商户ID" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入商户ID" />
+        </el-form-item>
+        <el-form-item label="金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入金额" />
+        </el-form-item>
+        <el-form-item label="发票" prop="invoice">
+          <el-input
+            v-model="form.invoice"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <el-form-item label="反馈" prop="feedback">
+          <el-input v-model="form.feedback" placeholder="请输入反馈" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listIncome,
+  getIncome,
+  delIncome,
+  addIncome,
+  updateIncome,
+} from "@/api/mallManagement/income";
+
+export default {
+  name: "Income",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 商城提现审批表格数据
+      incomeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        storeName: undefined,
+        // storeId: undefined,
+        // amount: undefined,
+        // invoice: undefined,
+        // feedback: undefined,
+        // status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    changeStatus(e, row) {
+      console.log("changeStatus", e, row);
+      updateIncome({
+        ...row,
+        status: e,
+      }).then((response) => {
+        this.$modal.msgSuccess("修改成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+    /** 查询商城提现审批列表 */
+    getList() {
+      this.loading = true;
+      listIncome(this.queryParams).then((response) => {
+        this.incomeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        storeId: undefined,
+        amount: undefined,
+        invoice: undefined,
+        feedback: undefined,
+        status: undefined,
+        delFlag: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加商城提现审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids;
+      getIncome(id).then((response) => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改商城提现审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateIncome(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
+          } else {
+            addIncome(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除商城提现审批编号为"' + ids + '"的数据项？')
+        .then(() => {
+          this.loading = true;
+          return delIncome(ids);
+        })
+        .then(() => {
+          this.loading = false;
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/income/export",
+        {
+          ...this.queryParams,
+        },
+        `income_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/mallManagement/order/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商品" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入商品"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:order:add']"
+        >新增</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:order:edit']"
+        >修改</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:order:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:order:export']"
+        >导出</el-button>
+      </el-col> -->
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+    </el-row>
+
+    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="城市" align="center" prop="cityName" />
+      <el-table-column label="商品" align="center" prop="title" />
+      <el-table-column label="数量" align="center" prop="num" />
+      <el-table-column label="金额" align="center" prop="payMoney" />
+      <el-table-column label="商户" align="center" prop="sname" />
+      <el-table-column label="用户" align="center" prop="userName" />
+      <el-table-column label="流程状态" align="center" prop="orderStatus">
+        <template slot-scope="{row}">
+          <span v-if="row.toStatus == 0">待支付</span>
+          <span v-if="row.toStatus == 1">已支付</span>
+          <span v-if="row.toStatus == 2">已完成</span>
+          <span v-if="row.toStatus == 7">已取消</span>
+          <span v-if="row.toStatus == 8">已退款</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" align="center" prop="toStatus">
+        <template slot-scope="{row}">
+          <span v-if="row.toStatus == 0">待发货</span>
+          <span v-if="row.toStatus == 1">已发货</span>
+          <span v-if="row.toStatus == 2">已完成</span>
+          <span v-if="row.toStatus == 3">退款中</span>
+          <span v-if="row.toStatus == 4">已退款</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间 " align="center" prop="createTime" />
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:order:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:order:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改商城订单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="" prop="storeId">
+          <el-input v-model="form.storeId" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="主订单" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入主订单" />
+        </el-form-item>
+        <el-form-item label="商品" prop="goodsId">
+          <el-input v-model="form.goodsId" placeholder="请输入商品" />
+        </el-form-item>
+        <el-form-item label="数量" prop="num">
+          <el-input v-model="form.num" placeholder="请输入数量" />
+        </el-form-item>
+        <el-form-item label="收获地址id " prop="addressId">
+          <el-input v-model="form.addressId" placeholder="请输入收获地址id " />
+        </el-form-item>
+        <el-form-item label="服务结束时间" prop="overTime">
+          <el-date-picker clearable
+            v-model="form.overTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择服务结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="完成凭证" prop="voucher">
+          <el-input v-model="form.voucher" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="" prop="logistics">
+          <el-input v-model="form.logistics" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="" prop="logisticsCode">
+          <el-input v-model="form.logisticsCode" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="refundLogistics">
+          <el-input v-model="form.refundLogistics" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="" prop="refundLogisticsCode">
+          <el-input v-model="form.refundLogisticsCode" placeholder="请输入" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/mallManagement/order";
+
+export default {
+  name: "Order",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 商城订单表格数据
+      orderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        // storeId: undefined,
+        // orderId: undefined,
+        title: undefined,
+        // num: undefined,
+        // addressId: undefined,
+        // status: undefined,
+        // overTime: undefined,
+        // voucher: undefined,
+        // logistics: undefined,
+        // logisticsCode: undefined,
+        // refundLogistics: undefined,
+        // refundLogisticsCode: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询商城订单列表 */
+    getList() {
+      this.loading = true;
+      listOrder(this.queryParams).then(response => {
+        this.orderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        storeId: undefined,
+        orderId: undefined,
+        goodsId: undefined,
+        num: undefined,
+        addressId: undefined,
+        status: undefined,
+        overTime: undefined,
+        voucher: undefined,
+        logistics: undefined,
+        logisticsCode: undefined,
+        refundLogistics: undefined,
+        refundLogisticsCode: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加商城订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getOrder(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改商城订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateOrder(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addOrder(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除商城订单编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delOrder(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/order/export', {
+        ...this.queryParams
+      }, `order_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/operation/article/index.vue

@@ -87,17 +87,23 @@
       <el-table-column label="文章标题" align="center" prop="title" />
       <el-table-column label="封面图" align="center" prop="cover">
         <template slot-scope="{ row }">
-          <el-image
+          <!-- <el-image
             style="width: 30px; height: 30px"
             :src="row.cover"
             :preview-src-list="[row.cover]"
           >
-          </el-image>
+          </el-image> -->
+          <span>{{ row.cover ? "已设置" : "未设置" }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="城市" align="center" prop="cityName" />
-      <el-table-column label="内容" align="center" prop="content" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="内容"
+        align="center"
+        prop="content"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="收藏数" align="center" prop="appreciateNum" />
       <el-table-column label="点赞数" align="center" prop="collectNum" />
       <el-table-column label="评论数" align="center" prop="" />
@@ -234,7 +240,6 @@ export default {
   created() {
     this.getList();
     this.cityVoListAxios();
-
   },
   methods: {
     /** 查询文章列表 */
@@ -370,4 +375,3 @@ export default {
   },
 };
 </script>
-

src/views/operation/banner/index.vue

@@ -9,7 +9,11 @@
       label-width="68px"
     >
       <el-form-item label="位置" prop="site">
-        <el-select v-model="queryParams.site" placeholder="请选择">
+        <el-select
+          v-model="queryParams.site"
+          placeholder="请选择"
+          @change="handleQuery"
+        >
           <el-option
             v-for="item in placeOptions"
             :key="item.value"
@@ -49,7 +53,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -60,13 +64,18 @@
           v-hasPermi="['accompany:carousel:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
+    <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="首页" name="1"></el-tab-pane>
+      <el-tab-pane label="商场首页" name="2"></el-tab-pane>
+    </el-tabs> -->
+
     <el-table
       v-loading="loading"
       :data="carouselList"
@@ -84,12 +93,19 @@
       <el-table-column label="城市" align="center" prop="cityName" />
       <el-table-column label="图片" align="center" prop="imgUrl">
         <template slot-scope="{ row }">
-          <el-image
+          <!-- <el-image
             style="width: 30px; height: 30px"
             :src="row.imgUrl"
             :preview-src-list="[row.imgUrl]"
           >
-          </el-image>
+          </el-image> -->
+          <imageUpload
+            v-if="row.imgUrl"
+            v-model="row.imgUrl"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
         </template>
       </el-table-column>
       <el-table-column label="链接" align="center" prop="linkUrl" />
@@ -140,13 +156,22 @@
     />
 
     <!-- 添加或修改轮播图对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="位置" prop="site">
           <!-- <el-input v-model="form.site" placeholder="请输入位置" /> -->
           <el-select clearable v-model="form.site" placeholder="请选择">
             <el-option
-              v-for="item in placeOptions"
+              v-for="item in [
+                {
+                  value: 1,
+                  label: '首页',
+                },
+                {
+                  value: 2,
+                  label: '商城首页',
+                },
+              ]"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -229,6 +254,7 @@ export default {
   name: "Carousel",
   data() {
     return {
+      activeName: "1",
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -253,12 +279,13 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        cityId: undefined,
+        // cityId: undefined,
+        // site: undefined,
+        // descr: undefined,
+        // imgUrl: undefined,
+        // linkUrl: undefined,
+        // status: undefined,
         site: undefined,
-        descr: undefined,
-        imgUrl: undefined,
-        linkUrl: undefined,
-        status: undefined,
       },
       // 表单参数
       form: {},
@@ -294,6 +321,13 @@ export default {
     this.cityVoListAxios();
   },
   methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+      this.activeName = tab.name;
+      this.$set(this.queryParams, "site", parseInt(this.activeName));
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
     /** 查询轮播图列表 */
     getList() {
       this.loading = true;
@@ -338,8 +372,7 @@ export default {
         cityId: undefined,
         site: undefined,
         descr: undefined,
-        imgUrl:
-          "https://img1.baidu.com/it/u=1747836562,3788666482&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
+        imgUrl: undefined,
         linkUrl: undefined,
         status: undefined,
         createBy: undefined,

src/views/operation/business/index.vue

@@ -92,11 +92,20 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="提供医院" align="center" prop="hospitals" />
+      <el-table-column label="提供医院" align="center" prop="hospitalsList">
+        <template slot-scope="scope">
+          <el-tag
+            v-for="(item, index) in scope.row.hospitalsList"
+            :key="index"
+            style="margin-right: 8px"
+            >{{ item }}</el-tag
+          >
+        </template>
+      </el-table-column>
       <el-table-column label="业务名称" align="center" prop="name" />
       <el-table-column label="服务" align="center" prop="name">
         <template slot-scope="{ row }">
-          <el-button type="text" >查看服务</el-button>
+          <el-button type="text">查看服务</el-button>
         </template>
       </el-table-column>
       <el-table-column type="expand">
@@ -113,14 +122,17 @@
                 </el-image>
               </template>
             </el-table-column>
-            <el-table-column prop="a" label="高价" />
+            <el-table-column prop="highPrice" label="高价" />
             <el-table-column prop="price" label="价格" />
             <el-table-column prop="fenmo" label="平台分成" />
             <el-table-column prop="duration" label="时长(小时)" />
             <el-table-column prop="overtime" label="超时计费/30分钟" />
             <el-table-column label="服务时段">
               <template slot-scope="{ row }">
-                <span>{{ row.startTime }} - {{ row.endTime }}</span>
+                <span v-if="row.startTime && row.endTime"
+                  >{{ row.startTime }} - {{ row.endTime }}</span
+                >
+                <span v-else>未设置</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -141,7 +153,7 @@
           </el-table>
         </template>
       </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="name" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
       <el-table-column
         label="操作"
         align="center"
@@ -177,14 +189,24 @@
     />
 
     <!-- 添加或修改业务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="提供医院" prop="hospitals">
-          <el-input
-            v-model="form.hospitals"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+        <el-form-item label="提供医院" prop="hospitalsIdsList">
+          <el-select
+            v-model="form.hospitalsIdsList"
+            multiple
+            clearable=""
+            filterable
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in hospitalsList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="业务名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入业务名称" />
@@ -212,7 +234,7 @@
           label-width="80px"
         >
           <el-form-item label="服务名称" prop="name">
-            <el-input v-model="serveForm.name" placeholder="请输入内容">
+            <el-input v-model="serveForm.name" placeholder="请输入服务名称">
               <template slot="prepend">
                 <i class="el-icon-edit"></i>
               </template>
@@ -221,35 +243,50 @@
           <el-form-item label="Cover" prop="cover">
             <imageUpload v-model="serveForm.cover"></imageUpload>
           </el-form-item>
-          <el-form-item label="高价" prop="">
-            <el-input placeholder="请输入">
-              <template slot="prepend"> ￥ </template>
-            </el-input>
+          <el-form-item label="高价" prop="highPrice">
+            <strong>￥</strong>
+            <el-input-number
+              v-model="serveForm.highPrice"
+              controls-position="right"
+              :min="0"
+            ></el-input-number>
           </el-form-item>
           <el-form-item label="价格" prop="price">
-            <el-input v-model="serveForm.price" placeholder="请输入">
-              <template slot="prepend"> ￥ </template>
-            </el-input>
+            <strong>￥</strong>
+            <el-input-number
+              v-model="serveForm.price"
+              controls-position="right"
+              :min="0"
+            ></el-input-number>
           </el-form-item>
           <el-form-item label="平台分成" prop="fenmo">
-            <el-input v-model="serveForm.fenmo" placeholder="请输入">
-              <template slot="prepend"> % </template>
-            </el-input>
+            <strong>%</strong>
+            <el-input-number
+              v-model="serveForm.fenmo"
+              controls-position="right"
+              :min="0"
+            ></el-input-number>
           </el-form-item>
           <el-form-item label="服务时长" prop="duration">
             <el-input-number
               v-model="serveForm.duration"
-              :min="1"
+              :min="0"
             ></el-input-number>
           </el-form-item>
           <el-form-item label="超时付费" prop="overtime">
-            <el-input v-model="serveForm.overtime" placeholder="请输入">
+            <!-- <el-input v-model="serveForm.overtime" placeholder="请输入">
               <template slot="prepend"> ￥ </template>
-            </el-input>
+            </el-input> -->
+            <strong>￥</strong>
+            <el-input-number
+              v-model="serveForm.overtime"
+              controls-position="right"
+              :min="0"
+            ></el-input-number>
             <div>每30分钟。未满30分钟按30分钟算</div>
           </el-form-item>
 
-          <el-form-item label="服务时段" prop="name">
+          <el-form-item label="服务时段" prop="date">
             <el-time-picker
               is-range
               arrow-control
@@ -257,6 +294,7 @@
               range-separator="至"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              value-format="HH:mm:ss"
               placeholder="选择时间范围"
             >
             </el-time-picker>
@@ -274,7 +312,7 @@
           @click="submitServeForm"
           >确 定</el-button
         >
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancelServeForm">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -291,6 +329,7 @@ import {
   addServe,
   updateServe,
 } from "@/api/operation/business";
+import { listHospital } from "@/api/hispotalManage/hospital";
 
 export default {
   name: "Business",
@@ -329,13 +368,35 @@ export default {
       rules: {},
       openServe: false,
       serveForm: {},
-      serveRules: {},
+      serveRules: {
+        name: [{ required: true, message: "请输入服务名称", trigger: "blur" }],
+        highPrice: [
+          {
+            required: true,
+            message: "请输入高价",
+            trigger: ["blur", "change"],
+          },
+        ],
+        price: [
+          {
+            required: true,
+            message: "请输入高价",
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
+      hospitalsList: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    hospitalsListAxios() {
+      listHospital({ pageNum: 1, pageSize: 99999 }).then((response) => {
+        this.hospitalsList = response.rows;
+      });
+    },
     /** 查询业务列表 */
     getList() {
       this.loading = true;
@@ -350,11 +411,15 @@ export default {
       this.open = false;
       this.reset();
     },
+    cancelServeForm() {
+      this.openServe = false;
+      this.resetServe();
+    },
     // 表单重置
     reset() {
       this.form = {
         id: undefined,
-        hospitals: undefined,
+        hospitals: [],
         name: undefined,
         createBy: undefined,
         createTime: undefined,
@@ -369,14 +434,16 @@ export default {
       this.serveForm = {
         name: undefined,
         cover: undefined,
-        price: undefined,
-        fenmo: undefined,
-        duration: undefined,
-        overtime: undefined,
+        highPrice: 0,
+        price: 0,
+        fenmo: 0,
+        duration: 0,
+        overtime: 0,
         startTime: undefined,
         endTime: undefined,
         info: undefined,
-      }
+        date: [],
+      };
       this.resetForm("serveForm");
     },
     /** 搜索按钮操作 */
@@ -404,6 +471,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.loading = true;
+      this.hospitalsListAxios();
       this.reset();
       const id = row.id || this.ids;
       getBusiness(id).then((response) => {
@@ -415,10 +483,19 @@ export default {
     },
     // 修改服务
     handleUpdateServe(row) {
+      this.openServe = true;
+      this.resetServe();
       const id = row.id;
       getServe(id).then((response) => {
         this.serveForm = response.data;
-        this.openServe = true;
+        if (response.data && response.data.startTime && response.data.endTime) {
+          this.$set(this.serveForm, "date", [
+            response.data.startTime,
+            response.data.endTime,
+          ]);
+        } else {
+          this.$set(this.serveForm, "date", undefined);
+        }
       });
     },
     /** 提交按钮 */
@@ -455,10 +532,14 @@ export default {
       this.$refs["serveForm"].validate((valid) => {
         if (valid) {
           this.buttonLoading = true;
-          updateServe(this.serveForm)
+          updateServe({
+            ...this.serveForm,
+            startTime: this.serveForm.date && this.serveForm.date.length ? this.serveForm.date[0] : '',
+            endTime: this.serveForm.date && this.serveForm.date.length ? this.serveForm.date[1] : '',
+          })
             .then((response) => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.openServe = false;
               this.getList();
             })
             .finally(() => {

src/views/operation/news/index.vue

 <template>
   <div class="app-container">
-    <el-form
+    <!-- <el-form
       :model="queryParams"
       ref="queryForm"
       size="small"
@@ -16,9 +16,9 @@
           @click="handleQuery"
           >刷新</el-button
         >
-        <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -43,7 +43,7 @@
             v-hasPermi="['system:information:edit']"
           >修改</el-button>
         </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -54,7 +54,7 @@
           v-hasPermi="['system:information:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
           <el-button
             type="warning"
@@ -65,7 +65,7 @@
             v-hasPermi="['system:information:export']"
           >导出</el-button>
         </el-col> -->
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table
@@ -79,12 +79,19 @@
       <el-table-column label="城市" align="center" prop="cityName" />
       <el-table-column label="封面" align="center" prop="cover">
         <template slot-scope="{ row }">
-          <el-image
+          <!-- <el-image
             style="width: 30px; height: 30px"
             :src="row.cover"
             :preview-src-list="[row.cover]"
           >
-          </el-image>
+          </el-image> -->
+          <imageUpload
+            v-if="row.cover"
+            v-model="row.cover"
+            :limit="1"
+            :isShowTip="false"
+            :disabled="true"
+          ></imageUpload>
         </template>
       </el-table-column>
       <el-table-column label="内容" align="center" prop="info">
@@ -92,6 +99,8 @@
           <el-button type="text" @click="handleLook(row)">点击查看</el-button>
         </template>
       </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
       <el-table-column
         label="操作"
         align="center"

src/views/operation/notice/index.vue

@@ -9,7 +9,7 @@
       label-width="68px"
     >
       <el-form-item label="位置" prop="site">
-        <el-select v-model="queryParams.site" placeholder="请选择">
+        <el-select v-model="queryParams.site" placeholder="请选择" @change="handleQuery">
           <el-option
             v-for="item in placeOptions"
             :key="item.value"
@@ -57,7 +57,7 @@
           >修改</el-button
         >
       </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -68,7 +68,7 @@
           v-hasPermi="['system:notice:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button
           type="warning"

src/views/orderManagement/order/index.vue

+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="订单号" prop="orderSn">
+        <el-input
+          v-model="queryParams.orderSn"
+          placeholder="请输入订单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:order:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:order:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:order:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:order:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="orderList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="订单号"
+        align="center"
+        prop="orderSn"
+        key="orderSn"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="订单价"
+        align="center"
+        prop="payMoney"
+        key="payMoney"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="服务"
+        align="center"
+        prop="serviceName"
+        key="serviceName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="城市"
+        align="center"
+        prop="cityName"
+        key="cityName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="医院"
+        align="center"
+        prop="hname"
+        key="hname"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="科室"
+        align="center"
+        prop="title"
+        key="title"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="就诊人员"
+        align="center"
+        prop="userVsitorVo.name"
+        key="userVsitorVo"
+      >
+        <template slot-scope="{ row }">
+          <el-button
+            v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
+            type="text"
+            @click="clickSeeVisitor(row)"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="接单人" align="center" prop="ename">
+        <template slot-scope="{ row }">
+          <span v-if="row.ename">{{ row.ename }}</span>
+          <span v-else>未接单</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" key="remark">
+        <template slot-scope="{ row }">
+          <el-button v-if="row.remark" type="text" @click="clickSeeROWrEM(row)"
+            >点击查看</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="就诊时间"
+        align="center"
+        prop="visitTime"
+        key="visitTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="预约电话"
+        align="center"
+        prop="phone"
+        key="phone"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="当前状态" align="center" prop="tStatus">
+        <template slot-scope="{ row }">
+          <span v-if="row.tStatus == 0">已发布</span>
+          <span v-if="row.tStatus == 1">已接单</span>
+          <span v-if="row.tStatus == 2">已完成</span>
+          <span v-if="row.tStatus == 3">退款中</span>
+          <span v-if="row.tStatus == 4">已退款</span>
+          <span v-if="row.tStatus == 6">进行中</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" align="center" prop="yStatus">
+        <template slot-scope="{ row }">
+          <span v-if="row.tStatus == 0">待支付</span>
+          <span v-if="row.tStatus == 1">已支付</span>
+          <span v-if="row.tStatus == 2">已完成</span>
+          <span v-if="row.tStatus == 7">已取消</span>
+          <span v-if="row.tStatus == 8">已退款</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否好评" align="center" prop="isSatisfaction">
+        <template slot-scope="{ row }">
+          <!-- 0-未评价，1-好评，2-差评 -->
+          <span v-if="row.isSatisfaction == 0">未评价</span>
+          <span v-if="row.isSatisfaction == 1">好评</span>
+          <span v-if="row.isSatisfaction == 2">差评</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="评价"
+        align="center"
+        prop="evaluationContent"
+        key="evaluationContent"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="服务完成时间"
+        align="center"
+        prop="overTime"
+        key="overTime"
+        width="180"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="完成凭证"
+        align="center"
+        prop="voucher"
+        key="voucher"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        key="createTime"
+        :show-overflow-tooltip="true"
+      />
+      <!-- <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:order:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:order:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改预约陪诊订单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="主订单" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入主订单" />
+        </el-form-item>
+        <el-form-item label="医院" prop="hid">
+          <el-input v-model="form.hid" placeholder="请输入医院" />
+        </el-form-item>
+        <el-form-item label="就诊人员" prop="visitor">
+          <el-input v-model="form.visitor" placeholder="请输入就诊人员" />
+        </el-form-item>
+        <el-form-item label="科室" prop="did">
+          <el-input v-model="form.did" placeholder="请输入科室" />
+        </el-form-item>
+        <el-form-item label="就诊时间" prop="visitTime">
+          <el-input v-model="form.visitTime" placeholder="请输入就诊时间" />
+        </el-form-item>
+        <el-form-item label="预约电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入预约电话" />
+        </el-form-item>
+        <el-form-item label="服务完成时间" prop="overTime">
+          <el-date-picker
+            clearable
+            v-model="form.overTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择服务完成时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="完成凭证" prop="voucher">
+          <el-input
+            v-model="form.voucher"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      title="订单备注"
+      :visible.sync="openArticle"
+      width="50%"
+      append-to-body
+    >
+      <div class="hidden-dialog">
+        <div class="content" v-html="rowArticle"></div>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      title="就诊人员信息"
+      :visible.sync="openArticleInfo"
+      width="600px"
+      append-to-body
+    >
+      <div class="contl">
+        <div class="contl-item">
+          <p class="contl-item-label">姓名：</p>
+          <p class="contl-item-rig">{{ VisitorData.name }}</p>
+        </div>
+        <div class="contl-item">
+          <p class="contl-item-label">性别：</p>
+          <p class="contl-item-rig" v-if="VisitorData.sex == 1">男</p>
+          <p class="contl-item-rig" v-else-if="VisitorData.sex == 0">女</p>
+          <p class="contl-item-rig" v-else>未知</p>
+        </div>
+        <div class="contl-item">
+          <p class="contl-item-label">身份证号：</p>
+          <p class="contl-item-rig">{{ VisitorData.idcard }}</p>
+        </div>
+        <div class="contl-item">
+          <p class="contl-item-label">是否成年：</p>
+          <p class="contl-item-rig" v-if="VisitorData.isAdult == 1">未成年</p>
+          <p class="contl-item-rig" v-if="VisitorData.isAdult == 0">已成年</p>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listOrder,
+  getOrder,
+  delOrder,
+  addOrder,
+  updateOrder,
+} from "@/api/orderManagement/order";
+
+export default {
+  name: "Order",
+  data() {
+    return {
+      openArticleInfo: false,
+      openArticle: false,
+      rowArticle: "",
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 预约陪诊订单表格数据
+      orderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderSn: undefined,
+        // orderId: undefined,
+        // hid: undefined,
+        // visitor: undefined,
+        // did: undefined,
+        // visitTime: undefined,
+        // phone: undefined,
+        // status: undefined,
+        // overTime: undefined,
+        // voucher: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+      },
+      VisitorData: {
+        name: "",
+        sex: "",
+        idcard: "",
+        isAdult: "",
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    clickSeeROWrEM(row) {
+      this.openArticle = true;
+      this.rowArticle = row.remark;
+    },
+    clickSeeVisitor(row) {
+      this.VisitorData = {
+        name: "",
+        sex: "",
+        idcard: "",
+        isAdult: "",
+      };
+      this.openArticleInfo = true;
+      this.VisitorData = row.userVsitorVo;
+    },
+    /** 查询预约陪诊订单列表 */
+    getList() {
+      this.loading = true;
+      listOrder(this.queryParams).then((response) => {
+        this.orderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        orderId: undefined,
+        hid: undefined,
+        visitor: undefined,
+        did: undefined,
+        visitTime: undefined,
+        phone: undefined,
+        status: undefined,
+        overTime: undefined,
+        voucher: undefined,
+        delFlag: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加预约陪诊订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids;
+      getOrder(id).then((response) => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改预约陪诊订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateOrder(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
+          } else {
+            addOrder(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除预约陪诊订单编号为"' + ids + '"的数据项？')
+        .then(() => {
+          this.loading = true;
+          return delOrder(ids);
+        })
+        .then(() => {
+          this.loading = false;
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {})
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/order/export",
+        {
+          ...this.queryParams,
+        },
+        `order_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.hidden-dialog {
+  height: 500px;
+  overflow-x: hidden;
+}
+.content {
+  width: 100%;
+}
+
+.contl {
+  padding: 20px;
+  width: calc(100 - 40px);
+  color: #333333;
+  font-size: 16px;
+  &-item {
+    display: flex;
+    &-label {
+      width: 20%;
+    }
+    &-rig {
+      width: 80%;
+    }
+  }
+}
+</style>

src/views/system/user/index.vue

@@ -150,11 +150,11 @@
               v-hasPermi="['system:user:export']"
             >导出</el-button>
           </el-col> -->
-          <right-toolbar
+          <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
             :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
         </el-row>
 
         <el-table
@@ -206,21 +206,13 @@
             align="center"
             prop="createTime"
             width="160"
-          >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
+          />
           <el-table-column
             label="更新时间"
             align="center"
-            prop="createTime"
+            prop="updateTime"
             width="160"
-          >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
+          />
           <el-table-column
             label="操作"
             align="center"
@@ -327,9 +319,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="确认密码" prop="password">
+            <el-form-item label="确认密码" prop="passwordT">
               <el-input
-                v-model="form.password"
+                v-model="form.passwordT"
                 placeholder="请输入确认密码"
                 type="password"
                 maxlength="20"
@@ -356,13 +348,13 @@
           </el-col>
           <template v-if="title === '修改'">
             <el-col :span="24">
-              <el-form-item label="创建时间" prop="">
-                <el-input disabled />
+              <el-form-item label="创建时间" prop="createTime">
+                <el-input v-model="form.createTime" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="更新时间" prop="">
-                <el-input disabled />
+              <el-form-item label="更新时间" prop="updateTime">
+                <el-input v-model="form.updateTime" disabled />
               </el-form-item>
             </el-col>
           </template>
@@ -555,6 +547,13 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
+const equalToPassword = (rule, value, callback) => {
+  if (this.form.password !== value) {
+    callback(new Error("两次输入的密码不一致"));
+  } else {
+    callback();
+  }
+};
 export default {
   name: "User",
   dicts: ["sys_normal_disable", "sys_user_sex"],
@@ -620,7 +619,7 @@ export default {
         // phonenumber: undefined,
         // status: undefined,
         // deptId: undefined
-        userType: 'sys_user'
+        userType: "sys_user",
       },
       // 列信息
       columns: [
@@ -655,6 +654,10 @@ export default {
             trigger: "blur",
           },
         ],
+        passwordT: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" },
+        ],
         email: [
           {
             type: "email",
@@ -748,6 +751,9 @@ export default {
         remark: undefined,
         postIds: [],
         roleIds: [],
+        createTime: undefined,
+        updateTime: undefined,
+        passwordT: undefined,
       };
       this.resetForm("form");
     },
@@ -808,7 +814,8 @@ export default {
         this.open = true;
         // this.title = "修改用户";
         this.title = "修改";
-        this.form.password = "";
+        this.$set(this.form, "password", '');
+        this.$set(this.form, "passwordT", '');
       });
     },
     /** 重置密码按钮操作 */

src/views/user/companion/index.vue

@@ -37,9 +37,9 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item label="陪诊员名称" prop="userName">
+          <el-form-item label="陪诊员名称" prop="name">
             <el-input
-              v-model="queryParams.userName"
+              v-model="queryParams.name"
               placeholder="请输入陪诊员名称"
               clearable
               style="width: 240px"
@@ -150,11 +150,11 @@
                 v-hasPermi="['system:user:export']"
               >导出</el-button>
             </el-col> -->
-          <right-toolbar
+          <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
             :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
         </el-row>
 
         <el-table
@@ -163,96 +163,151 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column
-            label="ID"
-            align="center"
-            key="userId"
-            prop="userId"
-          />
+          <el-table-column label="ID" align="center" key="id" prop="id" />
           <el-table-column
             label="陪诊员"
             align="center"
-            key="userName"
-            prop="userName"
+            key="name"
+            prop="name"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="职业开始年份"
             align="center"
-            key="nickName"
-            prop="nickName"
+            key="startYear"
+            prop="startYear"
             :show-overflow-tooltip="true"
+            width="100"
           />
           <el-table-column
             label="用户"
             align="center"
-            key="deptName"
-            prop="dept.deptName"
+            key="userName"
+            prop="userName"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="所属商户"
             align="center"
-            key="deptName"
-            prop="dept.deptName"
+            key="companyName"
+            prop="companyName"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="身份证正面照"
             align="center"
-            key="deptName"
-            prop="dept.deptName"
-          />
+            key="cardFront"
+            prop="cardFront"
+            width="170"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.cardFront"
+                v-model="row.cardFront"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
           <el-table-column
             label="身份证反面照"
             align="center"
-            key="deptName"
-            prop="dept.deptName"
-          />
+            key="cardReverse"
+            prop="cardReverse"
+            width="170"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.cardReverse"
+                v-model="row.cardReverse"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
           <el-table-column
             label="健康证"
             align="center"
-            key="deptName"
-            prop="dept.deptName"
-          />
+            key="healthCertificate"
+            prop="healthCertificate"
+            width="170"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.healthCertificate"
+                v-model="row.healthCertificate"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
           <el-table-column
             label="当前身份"
             align="center"
-            key="deptName"
-            prop="dept.deptName"
-          />
+            key="nowType"
+            prop="nowType"
+          >
+            <template slot-scope="{ row }">
+              <span v-if="row.nowType == 1">陪诊员</span>
+              <span v-if="row.nowType == 2">陪护员</span>
+            </template>
+          </el-table-column>
           <el-table-column
             label="总收益"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
+            key="totalRevenue"
+            prop="totalRevenue"
           />
           <el-table-column
             label="当前余额"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
+            key="balance"
+            prop="balance"
           />
           <el-table-column
             label="城市"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
+            key="cityName"
+            prop="cityName"
           />
           <!-- <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> -->
-          <el-table-column
-            label="状态"
-            align="center"
-            key="status"
-            v-if="columns[5].visible"
-          >
-            <template slot-scope="scope">
-              <el-switch
+          <el-table-column label="状态" align="center" key="status">
+            <template slot-scope="{ row }">
+              <!-- <el-switch
                 v-model="scope.row.status"
                 active-value="0"
                 inactive-value="1"
                 @change="handleStatusChange(scope.row)"
-              ></el-switch>
+              ></el-switch> -->
+              <el-select
+                v-model="row.status"
+                placeholder="请选择状态"
+                @change="changeStatus($event, row)"
+              >
+                <el-option
+                  v-for="item in [
+                    {
+                      label: '待审核',
+                      value: 0,
+                    },
+                    {
+                      label: '正常',
+                      value: 1,
+                    },
+                    {
+                      label: '禁用',
+                      value: 2,
+                    },
+                  ]"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column
@@ -260,11 +315,7 @@
             align="center"
             prop="createTime"
             width="160"
-          >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
+          />
           <!-- <el-table-column
               label="更新时间"
               align="center"
@@ -604,14 +655,14 @@ import {
   resetUserPwd,
   changeUserStatus,
   deptTreeSelect,
-} from "@/api/system/user";
+} from "@/api/user/companion/index.js";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "UserCompanion",
-  dicts: ["sys_normal_disable", "sys_user_sex"],
+  // dicts: ["sys_normal_disable", "sys_user_sex"],
   components: { Treeselect },
   data() {
     return {
@@ -670,11 +721,11 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
+        name: undefined,
         // phonenumber: undefined,
         // status: undefined,
         // deptId: undefined
-        userType: 'app_user'
+        // userType: 'app_user'
       },
       // 列信息
       columns: [
@@ -740,6 +791,17 @@ export default {
     });
   },
   methods: {
+    changeStatus(e, row) {
+      console.log("changeStatus", e, row);
+      updateUser({
+        ...row,
+        status: e,
+      }).then((response) => {
+        this.$modal.msgSuccess("修改成功");
+        this.open = false;
+        this.getList();
+      });
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;

src/views/user/merchant/index.vue

@@ -37,9 +37,9 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item label="商户名称" prop="userName">
+          <el-form-item label="商户名称" prop="name">
             <el-input
-              v-model="queryParams.userName"
+              v-model="queryParams.name"
               placeholder="请输入商户名称"
               clearable
               style="width: 240px"
@@ -150,11 +150,11 @@
                 v-hasPermi="['system:user:export']"
               >导出</el-button>
             </el-col> -->
-          <right-toolbar
+          <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
             :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
         </el-row>
 
         <el-table
@@ -163,99 +163,122 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column
-            label="ID"
-            align="center"
-            key="userId"
-            prop="userId"
-          />
+          <el-table-column label="ID" align="center" key="id" prop="id" />
           <el-table-column
             label="商户名称"
             align="center"
-            key="userName"
-            prop="userName"
+            key="name"
+            prop="name"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="创建人"
             align="center"
-            key="nickName"
-            prop="nickName"
+            key="createBy"
+            prop="createBy"
             :show-overflow-tooltip="true"
           />
           <el-table-column
-            label="商户电话"
-            align="center"
-            key="phonenumber"
-            prop="phonenumber"
-            width="120"
-          />
-          <el-table-column
             label="商户手机"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
+            key="phone"
+            prop="phone"
             width="120"
           />
           <el-table-column
             label="商户地址"
             align="center"
-            key="deptName"
-            prop="dept.deptName"
+            key="address"
+            prop="address"
             :show-overflow-tooltip="true"
           />
           <el-table-column
             label="城市"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
+            key="cityName"
+            prop="cityName"
             width="120"
           />
           <el-table-column
             label="营业执照"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
-          />
+            key="businessLicense"
+            prop="businessLicense"
+            width="170"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.businessLicense"
+                v-model="row.businessLicense"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
           <el-table-column
             label="是否缴纳保证金"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
-            width="120"
-          />
+            key="isCashDeposit"
+            prop="isCashDeposit"
+          >
+            <template slot-scope="{ row }">
+              <span v-if="row.isCashDeposit == 0">否</span>
+              <span v-if="row.isCashDeposit == 1">是</span>
+            </template>
+          </el-table-column>
           <el-table-column
             label="保证金金额"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
+            key="cashDeposit"
+            prop="cashDeposit"
           />
           <el-table-column
             label="总收益"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
+            key="totalRevenue"
+            prop="totalRevenue"
           />
           <el-table-column
             label="当前余额"
             align="center"
-            key="phonenumber"
-            prop="phonenumber"
+            key="balance"
+            prop="balance"
           />
-          <!-- <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> -->
-          <el-table-column
-            label="状态"
-            align="center"
-            key="status"
-            v-if="columns[5].visible"
-          >
-            <template slot-scope="scope">
-              <el-switch
+          <el-table-column label="状态" align="center" key="status">
+            <template slot-scope="{ row }">
+              <!-- <el-switch
                 v-model="scope.row.status"
                 active-value="0"
                 inactive-value="1"
                 @change="handleStatusChange(scope.row)"
-              ></el-switch>
+              ></el-switch> -->
+              <el-select
+                v-model="row.status"
+                placeholder="请选择状态"
+                @change="changeStatus($event, row)"
+              >
+                <el-option
+                  v-for="item in [
+                    {
+                      label: '待审核',
+                      value: 0,
+                    },
+                    {
+                      label: '正常',
+                      value: 1,
+                    },
+                    {
+                      label: '禁用',
+                      value: 2,
+                    },
+                  ]"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column
@@ -263,11 +286,7 @@
             align="center"
             prop="createTime"
             width="160"
-          >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
+          />
           <!-- <el-table-column
               label="更新时间"
               align="center"
@@ -607,14 +626,14 @@ import {
   resetUserPwd,
   changeUserStatus,
   deptTreeSelect,
-} from "@/api/system/user";
+} from "@/api/user/merchant/index.js";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "UserMerchant",
-  dicts: ["sys_normal_disable", "sys_user_sex"],
+  // dicts: ["sys_normal_disable", "sys_user_sex"],
   components: { Treeselect },
   data() {
     return {
@@ -673,11 +692,11 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
+        name: undefined,
         // phonenumber: undefined,
         // status: undefined,
         // deptId: undefined
-        userType: 'merchant_user'
+        // userType: "merchant_user",
       },
       // 列信息
       columns: [
@@ -743,6 +762,17 @@ export default {
     });
   },
   methods: {
+    changeStatus(e, row) {
+      console.log("changeStatus", e, row);
+      updateUser({
+        ...row,
+        status: e,
+      }).then((response) => {
+        this.$modal.msgSuccess("修改成功");
+        this.open = false;
+        this.getList();
+      });
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;

src/views/user/whole/index.vue

@@ -150,11 +150,11 @@
                 v-hasPermi="['system:user:export']"
               >导出</el-button>
             </el-col> -->
-          <right-toolbar
+          <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
             :columns="columns"
-          ></right-toolbar>
+          ></right-toolbar> -->
         </el-row>
 
         <el-table
@@ -179,15 +179,25 @@
           <el-table-column
             label="头像"
             align="center"
-            key="nickName"
-            prop="nickName"
-            :show-overflow-tooltip="true"
-          />
+            key="avatar"
+            prop="avatar"
+          >
+            <template slot-scope="{ row }">
+              <imageUpload
+                v-if="row.avatar"
+                v-model="row.avatar"
+                :limit="1"
+                :isShowTip="false"
+                :disabled="true"
+              ></imageUpload>
+            </template>
+          </el-table-column>
+          <!-- TODO 用户类型 无字段 -->
           <el-table-column
             label="用户类型"
             align="center"
             key="deptName"
-            prop="dept.deptName"
+            prop=""
             :show-overflow-tooltip="true"
           />
           <el-table-column
@@ -626,7 +636,7 @@ export default {
         // phonenumber: undefined,
         // status: undefined,
         // deptId: undefined
-        userType: ''
+        userType: "",
       },
       // 列信息
       columns: [

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
         target: `http://192.168.0.169:8089`,
-        // target: `http://192.168.0.124:8089`,
+        // target: `http://192.168.0.170:8089`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''