修改

d1accf94 · ‘巴博尔’ · cc5c28c2 · d1accf94 · d1accf94 · d1accf94
Commit d1accf94 authored Sep 15, 2023 by ‘巴博尔’
14 changed files
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/src/App.vue
+++ b/src/App.vue
+<!--
+ * @Author: ‘巴博尔’ 2164119982@qq.com
+ * @Date: 2023-09-07 10:41:26
+ * @LastEditors: ‘巴博尔’ 2164119982@qq.com
+ * @LastEditTime: 2023-09-15 15:56:29
+ * @FilePath: \peizhen-vue\src\App.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
  <div id="app">
    <router-view />
@@ -13,12 +21,16 @@ export default {
  components: { ThemePicker },
  metaInfo() {
    return {
-            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
+      title:
-            titleTemplate: title => {
+        this.$store.state.settings.dynamicTitle &&
-                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
+        this.$store.state.settings.title,
-            }
+      titleTemplate: (title) => {
-        }
+        return title
-    }
+          ? `${title} - ${process.env.VUE_APP_TITLE}`
+          : process.env.VUE_APP_TITLE;
+      },
+    };
+  },
 };
 </script>
 <style scoped>
@@ -26,3 +38,8 @@ export default {
  display: none;
 }
 </style>
+<style lang="css">
+.el-tooltip__popper {
+  max-width: 50%;
+}
+</style>
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png
--- a/src/views/hispotalManage/doctor/index.vue
+++ b/src/views/hispotalManage/doctor/index.vue
@@ -270,7 +270,6 @@ export default {
  },
  methods: {
    getListT() {
-      this.loading = true;
      listHospital({
        pageNum: 1,
        pageSize: 999999,

--- a/src/views/hispotalManage/hospital/index.vue
+++ b/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-11 13:56:36
+ * @LastEditTime: 2023-09-15 17:40:54
 * @FilePath: \peizhen-vue\src\views\hispotalManage\hospital\index.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -161,9 +161,19 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column
-      <el-table-column label="医院名称" align="center" prop="name" />
+        label="ID"
-      <el-table-column label="Logo" align="center" prop="logo">
+        align="center"
+        prop="id"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="医院名称"
+        align="center"
+        prop="name"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="Logo" align="center" prop="logo" width="170">
        <template slot-scope="{ row }">
          <imageUpload
            v-if="row.logo"
@@ -174,9 +184,24 @@
          ></imageUpload>
        </template>
      </el-table-column>
-      <el-table-column label="等级" align="center" prop="levelName" />
+      <el-table-column
-      <el-table-column label="类别" align="center" prop="categoryName" />
+        label="等级"
-      <el-table-column label="城市" align="center" prop="cityId" />
+        align="center"
+        prop="levelName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="类别"
+        align="center"
+        prop="categoryName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="城市"
+        align="center"
+        prop="cityName"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column label="介绍" align="center" prop="introduce">
        <template slot-scope="scope">
          {{ scope.row.introduce ? "已设置" : "未设置" }}
@@ -192,7 +217,11 @@
          >
        </template>
      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="{ row }">
+          <span>{{ row.status == 0 ? "禁用" : "启用" }}</span>
+        </template>
+      </el-table-column>
      <!-- <el-table-column label="经度" align="center" prop="lng" />
      <el-table-column label="纬度" align="center" prop="lat" />
      <el-table-column label="医院类别" align="center" prop="category" />
@@ -435,7 +464,7 @@ export default {
        lat: undefined,
        category: undefined,
        introduce: undefined,
-        departments: [],
+        departments: undefined,
        status: undefined,
        createBy: undefined,
        createTime: undefined,

--- a/src/views/hispotalManage/office/index.vue
+++ b/src/views/hispotalManage/office/index.vue
@@ -258,7 +258,9 @@ export default {
      // 表单参数
      form: {},
      // 表单校验
-      rules: {},
+      rules: {
+        title: [{ required: true, message: "请输入名称", trigger: "blur" }],
+      },
    };
  },
  created() {

--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -55,9 +55,9 @@
      </el-form-item>
    </el-form>
    <!--  底部  -->
-    <div class="el-login-footer">
+    <!-- <div class="el-login-footer">
      <span>Copyright © 2018-2023 疯狂的狮子Li All Rights Reserved.</span>
-    </div>
+    </div> -->
  </div>
 </template>

--- a/src/views/mallManagement/apply/index.vue
+++ b/src/views/mallManagement/apply/index.vue
@@ -2,7 +2,7 @@
 * @Author: ‘巴博尔’ 2164119982@qq.com
 * @Date: 2023-09-11 15:43:21
 * @LastEditors: ‘巴博尔’ 2164119982@qq.com
- * @LastEditTime: 2023-09-12 16:38:39
+ * @LastEditTime: 2023-09-15 18:30:08
 * @FilePath: \peizhen-vue\src\views\mallManagement\apply\index.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -111,7 +111,7 @@
      <el-table-column
        label="商户名称"
        align="center"
-        prop="uid"
+        prop="name"
        key="name"
        :show-overflow-tooltip="true"
      />
@@ -148,7 +148,7 @@
          <imageUpload
            v-if="row.businessLicense"
            v-model="row.businessLicense"
-            :limit="1"
+            :limit="row.businessLicense.split(',').length"
            :isShowTip="false"
            :disabled="true"
          ></imageUpload>
@@ -166,7 +166,7 @@
          <imageUpload
            v-if="row.foodBusinessLicense"
            v-model="row.foodBusinessLicense"
-            :limit="1"
+            :limit="row.foodBusinessLicense.split(',').length"
            :isShowTip="false"
            :disabled="true"
          ></imageUpload>
@@ -184,7 +184,7 @@
          <imageUpload
            v-if="row.drugBusinessLicense"
            v-model="row.drugBusinessLicense"
-            :limit="1"
+            :limit="row.drugBusinessLicense.split(',').length"
            :isShowTip="false"
            :disabled="true"
          ></imageUpload>
@@ -202,7 +202,7 @@
          <imageUpload
            v-if="row.medicalBusinessLicense"
            v-model="row.medicalBusinessLicense"
-            :limit="1"
+            :limit="row.medicalBusinessLicense.split(',').length"
            :isShowTip="false"
            :disabled="true"
          ></imageUpload>
@@ -220,21 +220,21 @@
          <imageUpload
            v-if="row.twoMedicalBusinessLicense"
            v-model="row.twoMedicalBusinessLicense"
-            :limit="1"
+            :limit="row.twoMedicalBusinessLicense.split(',').length"
            :isShowTip="false"
            :disabled="true"
          ></imageUpload>
        </template>
      </el-table-column>
      <el-table-column
-        label="是否缴纳保证金"
+        label="保证金金额"
        align="center"
        prop="cashDeposit"
        :show-overflow-tooltip="true"
        width="120"
      />
      <el-table-column
-        label="保证金金额"
+        label="是否缴纳保证金"
        align="center"
        prop="isCashDeposit"
        key="isCashDeposit"

--- a/src/views/operation/article/index.vue
+++ b/src/views/operation/article/index.vue
@@ -83,8 +83,18 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column
-      <el-table-column label="文章标题" align="center" prop="title" />
+        label="id"
+        align="center"
+        prop="id"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="文章标题"
+        align="center"
+        prop="title"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column label="封面图" align="center" prop="cover">
        <template slot-scope="{ row }">
          <!-- <el-image
@@ -97,16 +107,36 @@
        </template>
      </el-table-column>
-      <el-table-column label="城市" align="center" prop="cityName" />
+      <el-table-column
+        label="城市"
+        align="center"
+        prop="cityName"
+        :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
-      <el-table-column label="点赞数" align="center" prop="collectNum" />
+        label="收藏数"
-      <el-table-column label="评论数" align="center" prop="" />
+        align="center"
+        prop="appreciateNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="点赞数"
+        align="center"
+        prop="collectNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="评论数"
+        align="center"
+        prop="plNum"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column
        label="操作"

--- a/src/views/operation/banner/index.vue
+++ b/src/views/operation/banner/index.vue
@@ -82,16 +82,32 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column
-      <el-table-column label="描述" align="center" prop="descr" />
+        label="ID"
+        align="center"
+        prop="id"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="描述"
+        align="center"
+        prop="descr"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column
        label="位置"
        align="center"
        prop="site"
        :formatter="getSiteName"
+        :show-overflow-tooltip="true"
      />
-      <el-table-column label="城市" align="center" prop="cityName" />
+      <el-table-column
-      <el-table-column label="图片" align="center" prop="imgUrl">
+        label="城市"
+        align="center"
+        prop="cityName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="图片" align="center" prop="imgUrl" width="180">
        <template slot-scope="{ row }">
          <!-- <el-image
            style="width: 30px; height: 30px"
@@ -108,9 +124,19 @@
          ></imageUpload>
        </template>
      </el-table-column>
-      <el-table-column label="链接" align="center" prop="linkUrl" />
+      <el-table-column
+        label="链接"
+        align="center"
+        prop="linkUrl"
+        :show-overflow-tooltip="true"
+      />
      <!-- 状态；0-禁用，1-启用 -->
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        :show-overflow-tooltip="true"
+      >
        <template slot-scope="scope">
          <el-switch
            @change="handleChangeStatus($event, scope.row)"

--- a/src/views/operation/business/index.vue
+++ b/src/views/operation/business/index.vue
@@ -91,7 +91,12 @@
      @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="ID"
+        align="center"
+        prop="id"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column label="提供医院" align="center" prop="hospitalsList">
        <template slot-scope="scope">
          <el-tag
@@ -102,7 +107,12 @@
          >
        </template>
      </el-table-column>
-      <el-table-column label="业务名称" align="center" prop="name" />
+      <el-table-column
+        label="业务名称"
+        align="center"
+        prop="name"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column label="服务" align="center" prop="name">
        <template slot-scope="{ row }">
          <el-button type="text">查看服务</el-button>
@@ -111,23 +121,53 @@
      <el-table-column type="expand">
        <template slot-scope="props">
          <el-table key="inside" :data="props.row.servicesVoList">
-            <el-table-column prop="name" label="服务名称"></el-table-column>
+            <el-table-column
-            <el-table-column prop="cover" label="封面">
+              prop="name"
+              label="服务名称"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column prop="cover" label="封面" width="170">
              <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-model="row.cover"
+                  :limit="row.cover.split(',').length"
+                  :disabled="true"
+                  :isShowTip="false"
+                ></imageUpload>
              </template>
            </el-table-column>
-            <el-table-column prop="highPrice" label="高价" />
+            <el-table-column
-            <el-table-column prop="price" label="价格" />
+              prop="highPrice"
-            <el-table-column prop="fenmo" label="平台分成" />
+              label="高价"
-            <el-table-column prop="duration" label="时长(小时)" />
+              :show-overflow-tooltip="true"
-            <el-table-column prop="overtime" label="超时计费/30分钟" />
+            />
-            <el-table-column label="服务时段">
+            <el-table-column
+              prop="price"
+              label="价格"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              prop="fenmo"
+              label="平台分成"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              prop="duration"
+              label="时长(小时)"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              prop="overtime"
+              label="超时计费/30分钟"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column label="服务时段" :show-overflow-tooltip="true">
              <template slot-scope="{ row }">
                <span v-if="row.startTime && row.endTime"
                  >{{ row.startTime }} - {{ row.endTime }}</span
@@ -153,7 +193,13 @@
          </el-table>
        </template>
      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        width="180"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column
        label="操作"
        align="center"
@@ -534,8 +580,14 @@ export default {
          this.buttonLoading = true;
          updateServe({
            ...this.serveForm,
-            startTime: this.serveForm.date && this.serveForm.date.length ? this.serveForm.date[0] : '',
+            startTime:
-            endTime: this.serveForm.date && this.serveForm.date.length ? this.serveForm.date[1] : '',
+              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("修改成功");

--- a/src/views/operation/news/index.vue
+++ b/src/views/operation/news/index.vue
@@ -77,10 +77,25 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column
-      <el-table-column label="标题" align="center" prop="title" />
+        label="ID"
-      <el-table-column label="城市" align="center" prop="cityName" />
+        align="center"
-      <el-table-column label="封面" align="center" prop="cover">
+        prop="id"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="标题"
+        align="center"
+        prop="title"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="城市"
+        align="center"
+        prop="cityName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="封面" align="center" prop="cover" width="170">
        <template slot-scope="{ row }">
          <!-- <el-image
            style="width: 30px; height: 30px"
@@ -91,7 +106,7 @@
          <imageUpload
            v-if="row.cover"
            v-model="row.cover"
-            :limit="1"
+            :limit="row.cover.split(',').length"
            :isShowTip="false"
            :disabled="true"
          ></imageUpload>
@@ -102,8 +117,20 @@
          <el-button type="text" @click="handleLook(row)">点击查看</el-button>
        </template>
      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column
-      <el-table-column label="更新时间" align="center" prop="updateTime" />
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        width="180"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column
        label="操作"
        align="center"

--- a/src/views/operation/notice/index.vue
+++ b/src/views/operation/notice/index.vue
@@ -9,7 +9,11 @@
      label-width="68px"
    >
      <el-form-item label="位置" prop="site">
-        <el-select v-model="queryParams.site" placeholder="请选择" @change="handleQuery">
+        <el-select
+          v-model="queryParams.site"
+          placeholder="请选择"
+          @change="handleQuery"
+        >
          <el-option
            v-for="item in placeOptions"
            :key="item.value"
@@ -92,14 +96,30 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column
-      <el-table-column label="城市" align="center" prop="cityName" />
+        label="ID"
-      <el-table-column label="内容" align="center" prop="info" />
+        align="center"
+        prop="id"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="城市"
+        align="center"
+        prop="cityName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="内容"
+        align="center"
+        prop="info"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column
        label="位置"
        align="center"
        prop="site"
        :formatter="getSiteName"
+        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="操作"
@@ -147,7 +167,12 @@
          />
        </el-form-item>
        <el-form-item label="城市" prop="cityId">
-          <el-select filterable clearable v-model="form.cityId" placeholder="请输入城市">
+          <el-select
+            filterable
+            clearable
+            v-model="form.cityId"
+            placeholder="请输入城市"
+          >
            <el-option
              v-for="item in cityVoList"
              :key="item.id"

--- a/src/views/orderManagement/dbmyOrder/index.vue
+++ b/src/views/orderManagement/dbmyOrder/index.vue
@@ -139,6 +139,7 @@
            v-model="row.prescriptionAttachment"
            :isShowTip="false"
            :disabled="true"
+            :limit="row.prescriptionAttachment.split(',').length"
          />
        </template>
      </el-table-column>
@@ -579,6 +580,17 @@ export default {
        this.dbmyOrderList = response.rows;
        this.total = response.total;
        this.loading = false;
+        // if (this.dbmyOrderList && this.dbmyOrderList.length) {
+        //   this.dbmyOrderList.forEach((item, index) => {
+        //     this.$set(this.dbmyOrderList, index, {
+        //       ...item,
+        //       prescriptionAttachment: item.prescriptionAttachment
+        //         ? JSON.parse(item.prescriptionAttachment).join(",")
+        //         : "",
+        //     });
+        //   });
+        //   console.log(this.dbmyOrderList, "this.dbmyOrderList");
+        // }
      });
    },
    // 取消按钮