Merge remote-tracking branch 'origin/dev'

2022-12-07 10:42:48 +08:00 · 2022-12-07 10:42:48 +08:00 · 0663aa6794
commit 0663aa6794
parent 438dac1db8 7ea79d5ed4
11 changed files with 556 additions and 418 deletions
--- a/public/index.html
+++ b/public/index.html
@ -1,13 +1,17 @@
 <!DOCTYPE html>
 <html>
-  <head>
+
+<head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="renderer" content="webkit">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= webpackConfig.name %></title>
+    <title>
+        <%= webpackConfig.name %>
+    </title>
    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
+    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=6b427d1f3e633c70e11ca6e304444a63"></script>
    <style>
        html,
        body,
@ -16,6 +20,7 @@
            margin: 0px;
            padding: 0px;
        }
+
        .chromeframe {
            margin: 0.2em 0;
            background: #ccc;
@ -85,7 +90,6 @@
            animation: spin 1.5s linear infinite;
        }

-
        @-webkit-keyframes spin {
            0% {
                -webkit-transform: rotate(0deg);
@ -112,7 +116,6 @@
            }
        }

-
        #loader-wrapper .loader-section {
            position: fixed;
            top: 0;
@ -133,7 +136,6 @@
            right: 0;
        }

-
        .loaded #loader-wrapper .loader-section.section-left {
            -webkit-transform: translateX(-100%);
            -ms-transform: translateX(-100%);
@ -194,8 +196,9 @@
            opacity: 0.5;
        }
    </style>
-  </head>
-  <body>
+</head>
+
+<body>
    <div id="app">
        <div id="loader-wrapper">
            <div id="loader"></div>
@ -204,5 +207,6 @@
            <div class="load_title">正在加载系统资源，请耐心等待</div>
        </div>
    </div>
-  </body>
+</body>
+
 </html>
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@ -56,13 +56,13 @@ export default {
    type: {
      type: String,
      default: "url",
-    }
+    },
  },
  data() {
    return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/richTextPictureUrl", // 上传的图片服务器地址
      headers: {
-        Authorization: "Bearer " + getToken()
+        Authorization: "Bearer " + getToken(),
      },
      Quill: null,
      currentValue: "",
@ -82,7 +82,7 @@ export default {
            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
            [{ align: [] }], // 对齐方式
            ["clean"], // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
+            ["link", "image", "video"], // 链接、图片、视频
          ],
        },
        placeholder: "请输入内容",
@ -126,7 +126,7 @@ export default {
      const editor = this.$refs.editor;
      this.Quill = new Quill(editor, this.options);
      // 如果设置了上传地址则自定义图片上传事件
-      if (this.type == 'url') {
+      if (this.type == "url") {
        let toolbar = this.Quill.getModule("toolbar");
        toolbar.addHandler("image", (value) => {
          this.uploadType = "image";
@ -176,7 +176,14 @@ export default {
        // 获取光标所在位置
        let length = quill.getSelection().index;
        // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        quill.insertEmbed(
+          length,
+          "image",
+          process.env.VUE_APP_BASE_API + res.fileName
+        );
+
+        this.$emit("imgs", res.fileName);
+
        // 调整光标到最后
        quill.setSelection(length + 1);
      } else {
@ -191,7 +198,8 @@ export default {
 </script>

 <style>
-.editor, .ql-toolbar {
+.editor,
+.ql-toolbar {
  white-space: pre-wrap !important;
  line-height: normal !important;
 }
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@ -366,6 +366,7 @@
          style="margin-top: 20px"
        >
          <editor
+          @imgs="imgs"
            :min-height="100"
            style="width: 90%; margin: 0 auto"
            v-model="form.goodsRemark"
@ -506,8 +507,8 @@ export default {
  name: "OperateGoodsInfo",
  data() {
    return {
+      imgsurl: { pictureUrlList: [] },
      imgone: "",
-
      imageUrl: "", //商品图片
      value: "",
      datas: null,
@ -627,6 +628,9 @@ export default {
    this.infos();
  },
  methods: {
+    imgs(item) {
+      this.imgsurl.pictureUrlList.push(item);
+    },
    upwhetherShelf(row) {
      console.log(row);
      if (row.whetherShelf == false) {
@ -718,6 +722,10 @@ export default {
          console.log(res);
        });
      }
+      if (this.imgsurl.pictureUrlList.length > 0) {
+        updatePicture(this.imgsurl).then((res) => {});
+      }
+      this.imgsurl = { pictureUrlList: [] };
      this.open = false;
      this.reset();
      this.StationName = "请选择所属护理站";
--- a/src/views/system/goodsInfo/goodsInfojs.js
+++ b/src/views/system/goodsInfo/goodsInfojs.js
@ -18,6 +18,7 @@ export default {
    name: "OperateGoodsInfo",
    data() {
        return {
+            imgsurl: { pictureUrlList: [] },
            imgone: "",
            imageUrl: "", //商品图片
            value: "",
@ -138,6 +139,9 @@ export default {
        this.infos();
    },
    methods: {
+        imgs(item) {
+            this.imgsurl.pictureUrlList.push(item);
+        },
        upwhetherShelf(row) {
            console.log(row);
            if (row.whetherShelf == false) {
@ -229,6 +233,10 @@ export default {
                    console.log(res);
                });
            }
+            if (this.imgsurl.pictureUrlList.length > 0) {
+                updatePicture(this.imgsurl).then((res) => { });
+            }
+            this.imgsurl = { pictureUrlList: [] };
            this.open = false;
            this.reset();
            this.StationName = "请选择所属护理站";
@ -239,8 +247,8 @@ export default {
                    goodsPrice: "",
                    goodsStock: "",
                    sort: "",
-                }, ],
-            }, ];
+                },],
+            },];
        },

        handleQuery2() {
@ -292,7 +300,7 @@ export default {
                goodsStock: "",
                sort: "",
                ids: 9999999,
-            }, ];
+            },];
            this.resetForm("form");
        },
        /** 搜索按钮操作 */
@ -335,7 +343,7 @@ export default {
                goodsStock: "",
                sort: "",
                ids: 9999999,
-            }, ];
+            },];
            this.open = true;
        },
        /** 修改按钮操作 */
@ -421,7 +429,7 @@ export default {
                        // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
                    });
                })
-                .catch(() => {});
+                .catch(() => { });
        },
        // handleDelete(row) {
        //   const ids = row.id || this.ids;
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@ -349,6 +349,7 @@
          style="margin-top: 20px"
        >
          <editor
+          @imgs="imgs"
            :min-height="100"
            style="width: 90%; margin: 0 auto"
            v-model="form.goodsRemark"
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@ -298,26 +298,23 @@
        </el-form-item>
        <el-form-item label="下单方式" prop="buySource">
          <el-input
-            :value="buySourceinfo(orderList.buySource)"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            :value="orderChannelinfo(orderList.orderChannel)"
+            disabled
            style="width: 240px"
          />
        </el-form-item>
        <el-form-item label="购买来源" prop="orderChannel">
          <el-input
-            :value="orderChannelinfo(orderList.orderChannel)"
-            clearable
-            @keyup.enter.native="handleQuery"
-            :disabled="true"
+            :value="buySourceinfo(orderList.buySource)"
+            disabled
            style="width: 240px"
          />
        </el-form-item>
-        <el-form-item label="综合评分" v-if="ratelist.compositeScore">
+              <el-form-item label="综合评分" v-if="orderList.compositeScore">
          <div style="width: 240px">
            <el-rate
-              v-model="ratelist.compositeScore"
+              v-if="orderList.compositeScore"
+              v-model="orderList.compositeScore"
              style="padding-top: 7px"
              disabled
              show-score
@ -325,20 +322,24 @@
              score-template="{value}"
            >
            </el-rate>
+            <el-input
+              v-else
+              type="text"
+              disabled
+              style="width: 240px"
+              placeholder="未评分"
+            ></el-input>
          </div>
        </el-form-item>
-        <el-form-item label="评价内容" v-if="ratelist.evaluateContent">
+        <el-form-item label="评价内容" v-if="orderList.evaluateContent">
          <el-input
            type="textarea"
            disabled
-            style="width: 240px"
-            v-model="ratelist.evaluateContent"
+            style="width: 610px"
+            v-model="orderList.evaluateContent"
          />
        </el-form-item>
-        <el-form-item
-          label="评价图片"
-          v-if="ratelist.orderEvaluatePictureInfoList"
-        >
+        <el-form-item label="评价图片" v-if="ratelist">
          <div
            style="
              display: flex;
@ -347,8 +348,8 @@
            "
          >
            <img
-              style="width: 240px"
-              v-for="(item, index) in ratelist.orderEvaluatePictureInfoList"
+               style="width: 23%;height:100%;margin:1%"
+              v-for="(item, index) in ratelist"
              :src="baseurl + item.evaluatePictureUrl"
              alt=""
              :key="index"
@ -662,7 +663,6 @@ export default {
  },
  created() {
    this.baseurl = baseurl;
-    this.getList();
    this.info();
    this.infos();
  },
@ -745,15 +745,10 @@ export default {
      getGoodsOrderlist(id).then((res) => {
        this.orderList = res.data;
        this.innerorder = true;
+        this.ratelist = {};
        if (row.orderStatus == "EVALUATED") {
-          this.ratelist = {};
-          selectOrderEvaluate(id).then((res) => {
-            if (res.data) {
-              this.ratelist = res.data;
-            }
-          });
+          this.ratelist = res.data.orderEvaluatePictureInfoList;
        } else {
-          this.ratelist = {};
        }
      });
    },
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@ -297,7 +297,26 @@
          >
          </el-table-column>
        </el-table>
+        <el-form-item
+          label="预约服务位置"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
+        >
+          <el-input
+            v-model="query.serviceLocationName"
+            disabled
+            style="width: 250px"
+          />
+        </el-form-item>
      </el-form>
+      <div
+        id="container"
+        v-if="
+          this.query.orderStatus == 'COMPLETE' ||
+          this.query.orderStatus == 'EVALUATED'
+        "
+      ></div>
    </el-dialog>
    <!-- 派单弹框 -->
    <el-dialog
@ -509,11 +528,12 @@ import {
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
 import baseurl from "@/api/baseurl.js";
-import { selectOrderEvaluate } from "@/api/system/goodsOrder";
+
 export default {
  name: "order",
  data() {
    return {
+      map: null,
      baseurl: null,
      orderStatuslist: [
        {
@ -618,11 +638,54 @@ export default {
  },
  created() {
    this.baseurl = baseurl;
-    this.getList();
    this.info();
    this.infos();
  },
  methods: {
+    init(query) {
+      this.map = new AMap.Map("container", {
+        resizeEnable: true, //设置地图可缩放
+        zoom: 18, //设置地图的层级
+        center: [query.serveLocationLongitude, query.serveLocationLatitude], //设置地图中心点  更多配置项参照高德官网的配置
+      });
+      var layer = new AMap.LabelsLayer({
+        zooms: [3, 20],
+        zIndex: 1000,
+        // 开启标注避让，默认为开启，v1.4.15 新增属性
+        collision: true,
+        // 开启标注淡入动画，默认为开启，v1.4.15 新增属性
+        animation: true,
+      });
+      this.map.add(layer);
+      var labelMarker = new AMap.LabelMarker({
+        name: "",
+        position: [query.serveLocationLongitude, query.serveLocationLatitude],
+        icon: {
+          type: "image",
+          image: "https://a.amap.com/jsapi_demos/static/images/poi-marker.png",
+          clipOrigin: [280, 8],
+          clipSize: [50, 68],
+          size: [25, 34],
+          anchor: "bottom-center",
+          angel: 0,
+          retina: true,
+        },
+        text: {
+          content: query.serviceLocationName,
+          direction: "top",
+          offset: [0, 0],
+          style: {
+            fontSize: 13,
+            fontWeight: "normal",
+            fillColor: "#fff",
+            padding: "2, 5",
+            backgroundColor: "#22884f",
+          },
+        },
+      });
+
+      layer.add(labelMarker);
+    },
    //取消预约确定按钮
    ordercacenl() {
      var obj = {
@ -671,6 +734,7 @@ export default {
    seeLook(row) {
      this.loading = true;
      const id = row.orderNo;
+      this.map = null;
      appointmentOrderDetails(id).then((res) => {
        res.data.forEach((e) => {
          if (e.serviceDate) {
@ -679,24 +743,33 @@ export default {
          }
        });
        this.query = res.data[0];
-        this.innerVisible4 = true;
        if (row.orderStatus == "EVALUATED") {
-          selectOrderEvaluate(id).then((res) => {
          if (res.data) {
-              if (res.data.evaluateSatisfaction == "COMMONLY") {
+            if (res.data[0].evaluateSatisfaction == "COMMONLY") {
              this.query.evaluateSatisfaction = "一般";
-              } else if (res.data.evaluateSatisfaction == "SATISFIED") {
+            } else if (res.data[0].evaluateSatisfaction == "SATISFIED") {
              this.query.evaluateSatisfaction = "满意";
-              } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
+            } else if (res.data[0].evaluateSatisfaction == "DISSATISFIED") {
              this.query.evaluateSatisfaction = "不满意";
            }
            this.loading = false;
            this.innerVisible4 = true;
+            setTimeout(() => {
+              this.init(this.query);
+            }, 500);
          } else {
            this.loading = false;
            this.innerVisible4 = true;
+            setTimeout(() => {
+              this.init(this.query);
+            }, 500);
          }
-          });
+        } else if (row.orderStatus == "COMPLETE") {
+          this.loading = false;
+          this.innerVisible4 = true;
+          setTimeout(() => {
+            this.init(this.query);
+          }, 500);
        } else {
          this.loading = false;
          this.innerVisible4 = true;
@ -868,5 +941,9 @@ export default {
  width: 250px;
  height: 250px;
 }
+#container {
+  width: 100%;
+  height: 600px;
+}
 </style>

--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@ -303,6 +303,7 @@
        </el-form-item>
        <el-form-item label="护理站简介" prop="agencyIntroduce">
          <editor
+            @imgs="imgs"
            :min-height="62"
            style="width: 90%; margin: 0 auto"
            v-model="form.agencyIntroduce"
@ -468,6 +469,7 @@ export default {
      }
    };
    return {
+      imgsurl: { pictureUrlList: [] },
      imageUrl: "",
      imageUrl2: "",
      imgtwo: "",
@ -604,6 +606,9 @@ export default {
    this.infos();
  },
  methods: {
+    imgs(item) {
+      this.imgsurl.pictureUrlList.push(item);
+    },
    imgUrl(imgUrl) {
      this.form.stationPictureUrl = imgUrl;
    },
@ -693,6 +698,11 @@ export default {
      if (obj.pictureUrlList.length > 0) {
        updatePicture(obj).then((res) => {});
      }
+
+      if (this.imgsurl.pictureUrlList.length > 0) {
+        updatePicture(this.imgsurl).then((res) => {});
+      }
+      this.imgsurl = { pictureUrlList: [] };
      this.open = false;
      this.reset();
    },
@ -898,8 +908,6 @@ export default {
    info() {
      //加个所属区域
      getListByUser(this.getListByUserquery).then((res) => {
-        // 页面
-        // /所属区域
        this.nurseStationlist = res.rows;
        this.total2 = res.total;
        this.loading = false;
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@ -153,11 +153,11 @@
        align="center"
        prop="nurseItemName"
      />
-      <el-table-column
+      <!-- <el-table-column
        label="提前预约时长(h)"
        align="center"
        prop="advanceAppointDuration"
-      />
+      /> -->
      <el-table-column label="创建时间" align="center" prop="createTime" />
      <el-table-column label="创建人" align="center" prop="createBy" />
      <el-table-column
@ -251,7 +251,7 @@
            maxlength="50"
          />
        </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
          label="提前预约时长"
          prop="nurseStationItem.advanceAppointDuration"
        >
@ -262,6 +262,15 @@
            type="number"
            min="0"
          />
+        </el-form-item> -->
+
+        <el-form-item label="排序" prop="nurseStationItem.sort">
+          <el-input
+            placeholder="请输入排序"
+            v-model="form.nurseStationItem.sort"
+            maxlength="10"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
        </el-form-item>
        <el-form-item label="项目头像" prop="nurseStationItem.itemPictureUrl">
          <stationAcatar
@ -271,27 +280,18 @@
            :type="'itemPictureUrl'"
          />
        </el-form-item>
-        <el-form-item label="排序" prop="nurseStationItem.sort">
-          <el-input
-            placeholder="请输入排序"
-            v-model="form.nurseStationItem.sort"
-            maxlength="10"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
-        </el-form-item>
        <el-form-item
          label="项目内容简介"
          prop="nurseStationItem.nurseItemContent"
        >
-          <el-input
+          <editor
+          @imgs="imgs"
+            :min-height="82"
+            style="width: 90%"
            maxlength="300"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4 }"
-            placeholder="请输入内容"
-            style="width: 208px"
+          
            v-model="form.nurseStationItem.nurseItemContent"
-          >
-          </el-input>
+          ></editor>
        </el-form-item>
        <el-form-item label="项目时长和价格" required>
          <el-table
@ -685,6 +685,7 @@ export default {
  name: "NurseItem",
  data() {
    return {
+      imgsurl: { pictureUrlList: [] },
      imageUrl: "",
      imgone: "",
      handstationlist: [],
@ -777,9 +778,9 @@ export default {
        "nurseStationItem.sort": [
          { required: true, message: "排序不能为空", trigger: "blur" },
        ],
-        "nurseStationItem.advanceAppointDuration": [
-          { required: true, message: "提前预约时长不能为空", trigger: "blur" },
-        ],
+        // "nurseStationItem.advanceAppointDuration": [
+        //   { required: true, message: "提前预约时长不能为空", trigger: "blur" },
+        // ],
        "nurseStationItem.itemPictureUrl": [
          {
            required: true,
@ -802,6 +803,10 @@ export default {
    // this.getList();
  },
  methods: {
+    imgs(item) {
+      console.log(item)
+      this.imgsurl.pictureUrlList.push(item);
+    },
    imgUrl(imgUrl) {
      this.form.nurseStationItem.itemPictureUrl = imgUrl;
    },
@ -943,7 +948,10 @@ export default {
      if (obj.pictureUrlList.length > 0) {
        updatePicture(obj).then((res) => {});
      }
-
+      if (this.imgsurl.pictureUrlList.length > 0) {
+        updatePicture(this.imgsurl).then((res) => {});
+      }
+      this.imgsurl = { pictureUrlList: [] };
      this.open = false;
      this.reset();
    },
@ -1110,6 +1118,7 @@ export default {
            this.form.nurseStationItemPrices.forEach((e) => {
              e.price = Number(e.price);
            });
+            this.form.nurseStationItem.advanceAppointDuration = 0;
            updateNurseItem(this.form).then((response) => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
@ -1119,6 +1128,7 @@ export default {
            this.form.nurseStationItemPrices.forEach((e) => {
              e.price = Number(e.price);
            });
+            this.form.nurseStationItem.advanceAppointDuration = 0;
            addNurseItem(this.form).then((response) => {
              this.$modal.msgSuccess("新增成功");
              this.$forceUpdate();
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@ -797,7 +797,12 @@ export default {
      const userId = row.userId || this.ids;
      getUser(userId).then((response) => {
        this.form = response.data;
+        if (!this.form.nurseStationIds) {
+          this.form.nurseStationIds = ''
+        } else {
          this.form.nurseStationIds = Number(this.form.nurseStationIds);
+
+        }
        // if (
        //   !this.form.nurseStationIds ||
        //   this.form.nurseStationIds == null ||
@ -844,7 +849,6 @@ export default {
    },
    /** 提交按钮 */
        submitForm: function () {
-      console.log(this.form);
      this.$refs["form"].validate((valid) => {
        if (valid) {
          // this.form.nurseStationIds = this.form.nurseStationIds.join(",");
@ -853,13 +857,26 @@ export default {
          // obj.push(this.form.nurseStationIds);
          // console.log(obj)
          // this.form.nurseStationIds = obj;
-          console.log(this.form);
+
          if (this.form.userId != undefined) {
+            if (!this.form.nurseStationIds) {
+              this.form.nurseStationIds = null
              updateUser(this.form).then((response) => {
                this.$modal.msgSuccess("修改成功");
                this.open = false;
                this.getList();
+                //  console.log('bbb',this.form)
              });
+            } else {
+              this.form.nurseStationIds = Number(this.form.nurseStationIds);
+              updateUser(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+                //  console.log('bbb',this.form)
+              });
+            }
+
          } else {
            addUser(this.form).then((response) => {
              this.$modal.msgSuccess("新增成功");
--- a/vue.config.js
+++ b/vue.config.js
@ -52,6 +52,9 @@ module.exports = {
        }
    },
    configureWebpack: {
+        externals: {
+            'AMap': 'AMap'
+        },
        name: name,
        resolve: {
            alias: {
@ -125,8 +128,7 @@ module.exports = {
                                }
                            }
                        })
-          config.optimization.runtimeChunk('single'),
-          {
+                    config.optimization.runtimeChunk('single'), {
                        from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
                        to: './' //到根目录下
                    }