修改

src/components/TravelManager/Lxy/addGuide.vue

@@ -46,7 +46,9 @@
         </el-form-item>
         <el-form-item label="简介">
 <!--          <UE style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true" ref="ue"></UE>-->
-          <quill-editor  :options="editorOption"  v-model="addMsg.Introduction"></quill-editor>
+              <my-edit  v-on:edit-value="addMsg.Introduction  = arguments[0]" v-bind:editValue="addMsg.Introduction"
+              v-bind:toolbarShow="toolbar"  v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
+          <!-- <quill-editor  :options="editorOption"  v-model="addMsg.Introduction"></quill-editor> -->
         </el-form-item>
 
       </el-form>
@@ -65,13 +67,13 @@
 <script>
   // import ChooseImg from "@/components/global/ChooseImg.vue";
   // import UE from "@/components/global/UE.vue";
-  import warmtipTrip from "../../TravelManager/travelLineTrip/warmtipTrip";
+  import MyEdit from "../../EditTemplate.vue";
 
   export default {
     components: {
       // ChooseImg,
       // UE,
-      warmtipTrip
+      "my-edit": MyEdit
     },
     data() {
       return {
@@ -85,25 +87,27 @@
           EmergencyPhone:'',
           Introduction:'',
         },
-
-        editorOption: {
-          modules:{
-            toolbar:[
-              ['bold', 'italic', 'underline', 'strike', 'image'],        // toggled buttons
-              [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
-              [{ 'color': [] }, {'background': [] }],
-              [{ 'font': [] }],
-              [{ 'align': [] }],
-              [{ 'size': ['small', false, 'large', 'huge'] }],
-              [{ 'list': 'ordered'}, { 'list': 'bullet' }]
-            ]
-          }
+        toolbar: {
+          clean: true, 
+          font: false, //字体
+          narrative: false, //叙述,
+          image:true,
+          bold: true, //加粗
+          underline: true, //下划线
+          header1: true, //H1
+          header2: true, //H2
+          fontColor: true, //字体颜色
+          fontBackgroundColor: true, //背景颜色
         },
+        DefaultList: [],
+        placeholder: "请输入",
+     
         defaultMsg: "",
         config: {
           initialFrameWidth: null,
           initialFrameHeight: 350
         },
+       
         rules: {
 
           Name: [{
@@ -354,4 +358,8 @@
     height: 32px;
     margin: 0 5px;
   }
+  .addGuide .ql-toolbar.ql-snow .ql-formats {
+    margin-right: 5px;
+    line-height: 24px;
+}
   </style>

src/components/TravelManager/Lxy/directorGoodsEdit.vue

@@ -493,6 +493,8 @@
               <el-row>
                 <el-col :span="242">
 <!--                  <UE style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true" ref="ue"></UE>-->
+                  <my-edit  v-on:edit-value="addMsg.GoodsDetails  = arguments[0]" v-bind:editValue="addMsg.GoodsDetails"
+                  v-bind:toolbarShow="toolbar"  v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
                 </el-col>
               </el-row>
             </el-card>
@@ -643,11 +645,11 @@
           <h3 style="padding:15px 0">一级分类</h3>
           <div class="app-goods-cat-list active">
             <el-checkbox-group v-model="NewCategoryList" @change="handleCheckChange">
-              <div v-for="(item, index) in fenleiData" :key="index+'19'" flex="dir:left box:first" class="cat-item">
+              <div v-for="(item, index) in fenleiData" :key="index+'19'" flex="dir:left box:first" class="cat-item" style="display: flex;align-items: center;">
                 <el-checkbox :label="item.Id">
                   <span style="display: none;">{{ item.Name }}</span>
                 </el-checkbox>
-                <div flex="box:last cross:center">
+                <div flex="box:last cross:center" style="display: flex;align-items: center;">
                   <span>{{ item.Name }}</span>
                   <i v-if="item.ChildList.length > 0" @click="getChild2(item.ChildList)"
                     class="el-icon-arrow-right"></i>
@@ -660,11 +662,11 @@
           <h3 style="padding:15px 0">二级分类</h3>
           <div class="app-goods-cat-list active">
             <el-checkbox-group v-model="NewCategoryList" @change="handleCheckChange">
-              <div v-for="(item, index) in childList2" :key="index+'20'" flex="dir:left box:first" class="cat-item">
+              <div v-for="(item, index) in childList2" :key="index+'20'" flex="dir:left box:first" class="cat-item" style="display: flex;align-items: center;">
                 <el-checkbox :label="item.Id">
                   <span style="display: none;">{{ item.Name }}</span>
                 </el-checkbox>
-                <div flex="box:last cross:center">
+                <div flex="box:last cross:center" style="display: flex;align-items: center;">
                   <span>{{ item.Name }}</span>
                   <i v-if="item.ChildList.length > 0" @click="getChild3(item.ChildList)"
                     class="el-icon-arrow-right"></i>
@@ -677,11 +679,11 @@
           <h3 style="padding:15px 0">三级分类</h3>
           <div class="app-goods-cat-list active">
             <el-checkbox-group v-model="NewCategoryList" @change="handleCheckChange">
-              <div v-for="(item, index) in childList3" :key="index+'21'" flex="dir:left box:first" class="cat-item">
+              <div v-for="(item, index) in childList3" :key="index+'21'" flex="dir:left box:first" class="cat-item" style="display: flex;align-items: center;">
                 <el-checkbox :label="item.Id">
                   <span style="display: none;">{{ item.Name }}</span>
                 </el-checkbox>
-                <div flex="box:last cross:center">
+                <div flex="box:last cross:center" style="display: flex;align-items: center;">
                   <span>{{ item.Name }}</span>
                   <i class="el-icon-arrow-right"></i>
                 </div>
@@ -750,12 +752,16 @@
   // import Choosevideo from "@/components/global/Choosevideo.vue";
   import region_Choice from "./view/regionChoice";
   // import UE from "@/components/global/UE.vue";
-  import draggable from "vuedraggable"
+  import draggable from "vuedraggable";
+  import MyEdit from "../../EditTemplate.vue";
+
   export default {
     components: {
       // ChooseImg,
       // Choosevideo,
       region_Choice,
+      "my-edit": MyEdit,
+
       // UE,
       draggable
     },
@@ -1040,7 +1046,21 @@
           }
         },
         subDateList: [], //日期数组
-        My_cateList:[]
+        My_cateList:[],
+        toolbar: {
+          clean: true, 
+          font: false, //字体
+          narrative: false, //叙述,
+          image:true,
+          bold: true, //加粗
+          underline: true, //下划线
+          header1: true, //H1
+          header2: true, //H2
+          fontColor: true, //字体颜色
+          fontBackgroundColor: true, //背景颜色
+        },
+        DefaultList: [],
+        placeholder: "请输入",
       };
     },
     created() {
@@ -1216,13 +1236,13 @@
               this.addMsg.MemberPriceList = this.memberList1;
               this.addMsg.MemberPriceTreeList = this.memberList1;
             }
-            let mall_userInfo = JSON.parse(localStorage.mall_userInfo)
-            if (mall_userInfo.TenantId == 1 && mall_userInfo.MallBaseId == 1 && this.SupplierId == '') {
-              this.Error("请选择供应商!");
-              return
-            } else {
+            // let mall_userInfo = JSON.parse(localStorage.mall_userInfo)
+            // if (mall_userInfo.TenantId == 1 && mall_userInfo.MallBaseId == 1 && this.SupplierId == '') {
+            //   this.Error("请选择供应商!");
+            //   return
+            // } else {
               this.addMsg.SupplierId = this.SupplierId != '' ? this.SupplierId : 0;
-            }
+            // }
 
             if (this.addMsg.PresentFXGrade == '') { //没选择的时候默认为0
               this.addMsg.PresentFXGrade = 0
@@ -1527,9 +1547,9 @@
                 GradeCommissionList: this.GradeCommissionList
               };
               this.disList1.push(objNew);
-              if (this.addMsg.GoodsDetails && this.addMsg.GoodsDetails != "") {
-                this.defaultMsg = this.addMsg.GoodsDetails;
-              }
+              // if (this.addMsg.GoodsDetails && this.addMsg.GoodsDetails != "") {
+              //   this.defaultMsg = this.addMsg.GoodsDetails;
+              // }
               this.NewCategoryList = [];
               this.addMsg.CategoryList.forEach(item => {
                 item.Name = item.CategoryName;
@@ -2118,5 +2138,9 @@
   .directorGoodsEdit .w130 {
     width: 130px !important;
   }
+  .directorGoodsEdit .ql-toolbar.ql-snow .ql-formats {
+    margin-right: 5px;
+    line-height: 24px;
+}
 
 </style>

src/components/TravelManager/Lxy/directorGoodsList.vue

@@ -165,11 +165,11 @@
           <h3 style="padding:15px 0">一级分类</h3>
           <div class="app-goods-cat-list active">
             <el-checkbox-group v-model="checkList">
-              <div v-for="(item,index) in fenleiData" :key="index" flex="dir:left box:first" class="cat-item">
+              <div v-for="(item,index) in fenleiData" :key="index" flex="dir:left box:first" class="cat-item" style="display: flex;align-items: center;">
                 <el-checkbox :label="item">
                   <span style="display: none;">{{item.Name}}</span>
                 </el-checkbox>
-                <div flex="box:last cross:center">
+                <div flex="box:last cross:center" style="display: flex;align-items: center;">
                   <span>{{item.Name}}</span>
                   <i v-if="item.ChildList.length>0" @click="getChild2(item.ChildList)" class="el-icon-arrow-right"></i>
                 </div>
@@ -182,11 +182,11 @@
           <h3 style="padding:15px 0">二级分类</h3>
           <div class="app-goods-cat-list active">
             <el-checkbox-group v-model="checkList">
-              <div v-for="(item,index) in childList2" :key="index" flex="dir:left box:first" class="cat-item">
+              <div v-for="(item,index) in childList2" :key="index" flex="dir:left box:first" class="cat-item" style="display: flex;align-items: center;" >
                 <el-checkbox :label="item">
                   <span style="display: none;">{{item.Name}}</span>
                 </el-checkbox>
-                <div flex="box:last cross:center">
+                <div flex="box:last cross:center" style="display: flex;align-items: center;">
                   <span>{{item.Name}}</span>
                   <i v-if="item.ChildList.length>0" @click="getChild3(item.ChildList)" class="el-icon-arrow-right"></i>
                 </div>
@@ -195,15 +195,15 @@
 
           </div>
         </el-col>
-        <el-col v-show="childList3.length>0" :span="8" style="padding:0 10px;box-sizing:border-box">
+        <el-col v-show="childList3.length>0" :span="8" style="padding:0 10px;box-sizing:border-box" >
           <h3 style="padding:15px 0">三级分类</h3>
           <div class="app-goods-cat-list active">
             <el-checkbox-group v-model="checkList">
-              <div v-for="(item,index) in childList3" :key="index" flex="dir:left box:first" class="cat-item">
+              <div v-for="(item,index) in childList3" :key="index" flex="dir:left box:first" class="cat-item" style="display: flex;align-items: center;">
                 <el-checkbox :label="item">
                   <span style="display: none;">{{item.Name}}</span>
                 </el-checkbox>
-                <div flex="box:last cross:center">
+                <div flex="box:last cross:center" style="display: flex;align-items: center;">
                   <span>{{item.Name}}</span>
                   <i class="el-icon-arrow-right"></i>
                 </div>
@@ -722,4 +722,12 @@
     padding: 20px;
     box-sizing: border-box;
   }
+  .directorGoodsList .el-pagination ul li {
+    text-align: center;
+    line-height: 28px;
+    position: static !important;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
 </style>

src/components/TravelManager/Lxy/directorGuideList.vue

@@ -255,8 +255,7 @@
         this.$router.push({
           name: 'addGuide',
           query: {
-            ID:row.ID,
-            blank: "y"
+            ID:row.ID
           }
         });
       },

src/components/TravelManager/Lxy/directorSetting.vue

@@ -196,7 +196,9 @@
             </div>
             <el-row>
               <el-col :span="242">
-                <UE style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true" ref="ue"></UE>
+                <!-- <UE style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true" ref="ue"></UE> -->
+                <my-edit  v-on:edit-value="addMsg.InsuranceDescription  = arguments[0]" v-bind:editValue="addMsg.InsuranceDescription"
+              v-bind:toolbarShow="toolbar"  v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
               </el-col>
             </el-row>
           </el-card>
@@ -385,12 +387,15 @@
   // import chooseMenu from "../common/chooseMenu.vue";
   // import ChooseImg from "@/components/global/ChooseImg.vue";
   // import UE from "@/components/global/UE.vue";
+  import MyEdit from "../../EditTemplate.vue";
 
   export default {
     components: {
       // chooseMenu,
       // UE,
       // ChooseImg
+      "my-edit": MyEdit
+
     },
     data() {
 
@@ -429,6 +434,20 @@
         },
         choicImg: false,
         imgType: -1,
+        toolbar: {
+          clean: true, 
+          font: false, //字体
+          narrative: false, //叙述,
+          image:true,
+          bold: true, //加粗
+          underline: true, //下划线
+          header1: true, //H1
+          header2: true, //H2
+          fontColor: true, //字体颜色
+          fontBackgroundColor: true, //背景颜色
+        },
+        DefaultList: [],
+        placeholder: "请输入",
       };
     },
     created() {
@@ -460,8 +479,8 @@
         this.$refs[formName].validate((valid) => {
 
           if (valid) {
-            let content = this.$refs.ue.getUEContent();
-            this.addMsg.InsuranceDescription = content;
+            // let content = this.$refs.ue.getUEContent();
+            // this.addMsg.InsuranceDescription = content;
             let cmd = "/api/GuideCar/SetGuideCarInfo";
             this.saveload = true
             this.lxymallapipost(cmd, this.addMsg,
@@ -488,9 +507,9 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.addMsg = res.data.data;
-            if (this.addMsg.InsuranceDescription && this.addMsg.InsuranceDescription != "") {
-              this.defaultMsg = this.addMsg.InsuranceDescription;
-            }
+            // if (this.addMsg.InsuranceDescription && this.addMsg.InsuranceDescription != "") {
+            //   this.defaultMsg = this.addMsg.InsuranceDescription;
+            // }
           }
         })
       },
@@ -583,5 +602,9 @@
     margin-top: 10px;
     box-sizing: border-box;
   }
+  .directorSetting .ql-toolbar.ql-snow .ql-formats {
+    margin-right: 5px;
+    line-height: 24px;
+}
 
 </style>