From b9f3f4fe08e4644b3c261ef3fd7e33669350ca13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Fri, 2 Dec 2022 15:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/index.vue             | 38 ++++++++-----
 src/views/system/OperateGoodsInfo/index.vue | 10 +++-
 src/views/system/goodsInfo/goodsInfojs.js   | 62 ++++++++++++---------
 src/views/system/goodsInfo/index.vue        |  1 +
 src/views/system/station/index.vue          | 12 +++-
 src/views/system/stationItem/index.vue      | 21 +++----
 6 files changed, 89 insertions(+), 55 deletions(-)

diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index c4ddef8..a9f2520 100644
--- 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/richTextPictureUrl", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken()
+        Authorization: "Bearer " + getToken(),
       },
       Quill: null,
       currentValue: "",
@@ -73,16 +73,16 @@ export default {
         modules: {
           // 工具栏配置
           toolbar: [
-            ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
-            ["blockquote", "code-block"],                    // 引用  代码块
-            [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
-            [{ indent: "-1" }, { indent: "+1" }],            // 缩进
-            [{ size: ["small", false, "large", "huge"] }],   // 字体大小
-            [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
-            [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
-            [{ align: [] }],                                 // 对齐方式
-            ["clean"],                                       // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
+            ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
+            ["blockquote", "code-block"], // 引用  代码块
+            [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表
+            [{ indent: "-1" }, { indent: "+1" }], // 缩进
+            [{ size: ["small", false, "large", "huge"] }], // 字体大小
+            [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+            [{ align: [] }], // 对齐方式
+            ["clean"], // 清除文本格式
+            ["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;
 }
diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index 6ff0e10..64e12f4 100644
--- 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 = "请选择所属护理站";
diff --git a/src/views/system/goodsInfo/goodsInfojs.js b/src/views/system/goodsInfo/goodsInfojs.js
index ee63a6d..9ecc3eb 100644
--- 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: "",
@@ -53,22 +54,22 @@ export default {
             nursetotal: 0,
             nurseStationId: null,
             goods: [{
-                    value: "BUSINESS",
-                    label: "买卖",
-                },
-                {
-                    value: "LEASE",
-                    label: "租赁",
-                },
+                value: "BUSINESS",
+                label: "买卖",
+            },
+            {
+                value: "LEASE",
+                label: "租赁",
+            },
             ],
             options: [{
-                    value: 0,
-                    label: "否",
-                },
-                {
-                    value: 1,
-                    label: "是",
-                },
+                value: 0,
+                label: "否",
+            },
+            {
+                value: 1,
+                label: "是",
+            },
             ],
             // goodAttributeDetailsLists:[],
             goodDetailsLists: [],
@@ -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() {
@@ -259,7 +267,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
             }),
-            this.handleQuery2();
+                this.handleQuery2();
         },
         addcancel() {
             this.resetQuery2();
@@ -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;
         },
         /** 修改按钮操作 */
@@ -366,9 +374,9 @@ export default {
             this.$refs["form"].validate((valid) => {
                 if (valid) {
                     if (this.form.goodsInfoId != null) {
-                          this.form.goodDetailsLists.forEach((e) => {
+                        this.form.goodDetailsLists.forEach((e) => {
                             e.goodsPrice = Number(e.goodsPrice);
-                          });
+                        });
                         this.form.id = this.form.goodsInfoId;
                         updateGoodsInfo(this.form).then((response) => {
                             var obj = { pictureUrlList: [] };
@@ -387,7 +395,7 @@ export default {
                     } else {
                         this.form.goodDetailsLists.forEach((e) => {
                             e.goodsPrice = Number(e.goodsPrice);
-                          });
+                        });
                         addGoodsInfo(this.form).then((response) => {
                             console.log(this.form);
                             this.$modal.msgSuccess("新增成功");
@@ -404,10 +412,10 @@ export default {
         handleDelete(row) {
             console.log("row :>> ", row);
             this.$confirm("是否确认删除订单信息的数据项？", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
                 .then(() => {
                     var obj = { pictureUrlList: [] };
                     obj.pictureUrlList.push(row.goodsPictureUrl);
@@ -421,7 +429,7 @@ export default {
                         // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
                     });
                 })
-                .catch(() => {});
+                .catch(() => { });
         },
         // handleDelete(row) {
         //   const ids = row.id || this.ids;
diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index a2c9fb2..6419e87 100644
--- 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"
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index ba7780d..16fea33 100644
--- 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;
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index 4395e76..3af67b6 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -285,20 +285,13 @@
           prop="nurseStationItem.nurseItemContent"
         >
           <editor
+          @imgs="imgs"
             :min-height="82"
             style="width: 90%"
             maxlength="300"
+          
             v-model="form.nurseStationItem.nurseItemContent"
           ></editor>
-          <!-- <el-input
-          
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4 }"
-            placeholder="请输入内容"
-            style="width: 208px"
-            v-model="form.nurseStationItem.nurseItemContent"
-          > -->
-          <!-- </el-input> -->
         </el-form-item>
         <el-form-item label="项目时长和价格" required>
           <el-table
@@ -692,6 +685,7 @@ export default {
   name: "NurseItem",
   data() {
     return {
+      imgsurl: { pictureUrlList: [] },
       imageUrl: "",
       imgone: "",
       handstationlist: [],
@@ -809,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;
     },
@@ -950,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();
     },