组件选择菜单调整

src/assets/css/cssReset.css

@@ -1872,5 +1872,9 @@ input[type="number"] {
     color: #67C23A;
 }
 
+.webset_choosemenu .el-dialog__body{
+    padding: 0;
+    padding-left: 20px;
+}
 
 /************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file

src/components/FinancialModule/addFinancialDocuments.vue

@@ -803,7 +803,8 @@
                 <span class="el-select ">
                   <el-tooltip :content="$t('objFill.dianfuduixiangtips')" placement="top">
                     <el-checkbox v-model="KingdeeClientIDCheck" @change="changeKingdeeClientID"
-                      :style="{'margin-top':KingdeeClientIDCheck?'0px':'6px'}">{{$t('objFill.v101.FinancialModule.dianfudx')}}</el-checkbox>
+                      :style="{'margin-top':KingdeeClientIDCheck?'0px':'6px'}">
+                      {{$t('objFill.v101.FinancialModule.dianfudx')}}</el-checkbox>
                   </el-tooltip>
                   <template v-if="KingdeeClientIDCheck">
                     <el-select v-model="msg.KingdeeClientID" class="w135 _border_b_1" filterable remote reserve-keyword
@@ -1501,7 +1502,7 @@
         );
       },
       deleteRow(i, obj) {
-        if(obj.OffEditExpeItem) return
+        if (obj.OffEditExpeItem) return
         obj.show = false;
         this.msg.Description = this.Description;
         this.msg.detailList.splice(i, 1);
@@ -2074,7 +2075,7 @@
             });
           } else {
             this.resultCode = res.data.resultCode;
-            if(res.data.resultCode==11020){//超预算提醒
+            if (res.data.resultCode == 11020) { //超预算提醒
               this.$confirm(res.data.message, this.$t('tips.tips'), {
                 confirmButtonText: this.$t('objFill.ckbjd'),
                 cancelButtonText: this.$t('pub.cancelBtn'),
@@ -2083,15 +2084,15 @@
                 this.$router.push({
                   name: 'OfferChange',
                   query: {
-                    'offerid':res.data.data,
-                    'Qtype':3,
+                    'offerid': res.data.data,
+                    'Qtype': 3,
                     'blank': 'y',
                   }
                 });
               }).catch(() => {
 
               });
-            }else{
+            } else {
               this.$message.error(res.data.message);
             }
           }
@@ -2107,7 +2108,8 @@
         }, res => {
           if (res.data.resultCode == 1) {
             res.data.data.forEach(y => {
-              y.contentTips = y.AuditDescription + (y.AuditWay == "2" ? this.$t('fnc.huiqian') : this.$t('fnc.huoqian'))
+              y.contentTips = y.AuditDescription + (y.AuditWay == "2" ? this.$t('fnc.huiqian') : this.$t(
+                'fnc.huoqian'))
             })
             this.AuditListData.AuditList = res.data.data;
             let data = JSON.parse(JSON.stringify(this.AuditListData.AuditList));
@@ -2428,7 +2430,7 @@
                   // 台湾提成汇率
                   if (this.orderObj && this.orderObj.Rate) {
                     item.Rate = this.orderObj.Rate
-                  } else if(!item.Rate) {
+                  } else if (!item.Rate) {
                     item.Rate = x.Rate
                   }
 
@@ -2484,8 +2486,8 @@
           if (res.data.resultCode == 1) {
             let data = res.data.data;
 
-            let arrList = function(list){
-              list.forEach(x=>{
+            let arrList = function (list) {
+              list.forEach(x => {
                 x.OffEditExpeItem = false
               })
             }
@@ -2505,15 +2507,10 @@
             this.msg.DepositCustomerId = data.DepositCustomerId ? Number(data.DepositCustomerId) : ''
             if (this.msg.DepositCustomerId) this.isDepositCustomer = true
             if (id || id === 0) {
-              // if (!this.orderObj) {
-              //     this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
-              // }
               if (!this.orderObj && id > 0) {
                 this.msg.RB_Branch_Id = this.msg.RB_Branch_Id
-                //console.log(this.msg.RB_Branch_Id,'-----')
               } else {
                 this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
-                //console.log(this.msg.RB_Branch_Id,'-----')
                 if ((this.$route.query.id == 245 ||
                     this.$route.query.id == 246 ||
                     this.$route.query.id == 247 ||
@@ -2529,23 +2526,19 @@
             } else {
               this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 ? this.getLocalStorage().RB_Branch_id : this.msg
                 .RB_Branch_Id;
-                //console.log(this.msg.RB_Branch_Id,'-----')
             }
 
 
             if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
               this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
-              //console.log(this.msg.RB_Branch_Id,'-----')
             } else if ((this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null &&
                 this.orderObj.RB_Branch_Id != undefined)) || (this.crmOrderObj && (this.crmOrderObj.RB_Branch_Id !=
                 '' && this.crmOrderObj.RB_Branch_Id != null &&
                 this.crmOrderObj.RB_Branch_Id != undefined))) {
               this.msg.RB_Branch_Id = this.orderObj && this.orderObj.RB_Branch_Id >= 0 ? this.orderObj
                 .RB_Branch_Id : this.crmOrderObj.RB_Branch_Id
-                //console.log(this.msg.RB_Branch_Id,'-----')
             } else if (this.$route.query.companyID) {
               this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
-              //console.log(this.msg.RB_Branch_Id,'-----')
             }
             this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
             this.msg.PayDate = this.msg.PayDate;
@@ -2556,7 +2549,7 @@
             let allPrice = 0
             let yballPrice = 0
             data.DetailList.forEach(x => {
-              if(data.OtherType==87&&data.TemplateId==126&&x.CostTypeId==223) {
+              if (data.OtherType == 87 && data.TemplateId == 126 && x.CostTypeId == 223) {
                 x.OffEditExpeItem = true
                 this.OffEditExpeItem = true
               }
@@ -2808,12 +2801,14 @@
             });
           }
           this.companyList = data;
-          this.companyList.forEach(x=>{
-            if((this.orderObj && this.orderObj.LineId && this.orderObj.LineId=='90'&&x.Id==1247)||this.$route.query.companyID==x.Id){
+          this.companyList.forEach(x => {
+            if ((this.orderObj && this.orderObj.LineId && this.orderObj.LineId == '90' && x.Id == 1247) || this
+              .$route.query.companyID == x.Id) {
               x.disabled = false
             }
-            if(x.Id==1247 && this.companyMsg.RB_Group_Id==2 && (this.EmployeeId==57 || this.EmployeeId==2822)){
-              x.disabled = false;//ld 2024-10-15 肖姐付款单  强制可以选择欧亚公司
+            if (x.Id == 1247 && this.companyMsg.RB_Group_Id == 2 && (this.EmployeeId == 57 || this.EmployeeId ==
+                2822)) {
+              x.disabled = false; //ld 2024-10-15 肖姐付款单  强制可以选择欧亚公司
             }
           })
 
@@ -2844,10 +2839,8 @@
                               .crmOrderObj.RB_Branch_Id)) {
                             this.msg.RB_Branch_Id = this.orderObj && this.orderObj.RB_Branch_Id >= 0 ?
                               this.orderObj.RB_Branch_Id : this.crmOrderObj.RB_Branch_Id
-                              //console.log(this.msg.RB_Branch_Id,'-----')
                           } else {
-                            this.msg.RB_Branch_Id = Id>0?Id:x.Id
-                            //console.log(this.msg.RB_Branch_Id,'-----')
+                            this.msg.RB_Branch_Id = Id > 0 ? Id : x.Id
                           }
 
                         }
@@ -2856,27 +2849,27 @@
                               .crmOrderObj.RB_Branch_Id)) {
                             this.msg.RB_Branch_Id = this.orderObj && this.orderObj.RB_Branch_Id >= 0 ?
                               this.orderObj.RB_Branch_Id : this.crmOrderObj.RB_Branch_Id
-                              //console.log(this.msg.RB_Branch_Id,'-----')
                           } else {
                             this.msg.RB_Branch_Id = x.Id
-                            //console.log(this.msg.RB_Branch_Id,'-----')
                           }
                         }
                         num = num + 1
                       }
                     })
-                    if(this.orderObj.Id==90&&x.Id==1247){
+                    if (this.orderObj.Id == 90 && x.Id == 1247) {
                       x.disabled = false
                     }
                   })
 
                   this.companyList = data;
-                  this.companyList.forEach(x=>{
-                    if((this.orderObj && this.orderObj.LineId && this.orderObj.LineId=='90'&&x.Id==1247)||this.$route.query.companyID==x.Id){
+                  this.companyList.forEach(x => {
+                    if ((this.orderObj && this.orderObj.LineId && this.orderObj.LineId == '90' && x.Id ==
+                        1247) || this.$route.query.companyID == x.Id) {
                       x.disabled = false
                     }
-                    if(x.Id==1247 && this.companyMsg.RB_Group_Id==2 && (this.EmployeeId==57 || this.EmployeeId==2822)){
-                      x.disabled = false;//ld 2024-10-15 肖姐付款单  强制可以选择欧亚公司
+                    if (x.Id == 1247 && this.companyMsg.RB_Group_Id == 2 && (this.EmployeeId == 57 || this
+                        .EmployeeId == 2822)) {
+                      x.disabled = false; //ld 2024-10-15 肖姐付款单  强制可以选择欧亚公司
                     }
                   })
                 }
@@ -3092,10 +3085,8 @@
           .RB_Branch_Id != undefined)) {
         this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj && this.orderObj
           .RB_Branch_Id >= 0 ? this.orderObj.RB_Branch_Id : this.crmOrderObj.RB_Branch_Id;
-          //console.log(this.msg.RB_Branch_Id,'-----')
       } else {
         this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
-        //console.log(this.msg.RB_Branch_Id,'-----')
       }
       this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id;
       this.IsUploadPic = this.$route.query.IsUploadPic;

src/components/LeaderManagement/AlipayManagement.vue

@@ -308,7 +308,6 @@
         })
       },
       AddMsgBaseInfo(obj){//给编辑数据赋值
-        console.log("obj",obj);
         this.addMsg.InstitutionName=obj.InstitutionName;//制度名称
         this.addMsg.Id=obj.ID;
         this.outerVisible=true,

src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue

@@ -509,7 +509,6 @@
     },
     watch: {
       OfferArray: function (oldValue, newValue) {
-        console.log("DirectNew_Watch")
         this.initData()
       }
     },

src/components/WebSet/WebSiteEdit.vue

@@ -233,7 +233,6 @@
       </div>
     </div>
     <el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px">
-    
       <!--视频-->
       <plugvideodialog v-if="currentEditItem.Id=='white_label_video'" :plugData="currentEditItemData"></plugvideodialog>
       <!--轮播图-->

src/components/WebSet/home/indexNav.vue

@@ -303,7 +303,7 @@
         </tbody>
       </table>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">

src/components/WebSet/home/indexRoll1.vue

@@ -213,7 +213,7 @@
         </tbody>
       </table>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" class="webset_choosemenu" append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">
@@ -299,6 +299,9 @@
         if (chooseMenuObj) {
           this.clickItem.SubName = chooseMenuObj.MenuName;
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
+          if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
+            this.clickItem.FileUrl = chooseMenuObj.ImgUrl;
+          }
         }
         this.$refs.chooseMenu.initMenuCheck();
       },

src/components/WebSet/home/indexRoll2.vue

@@ -214,7 +214,7 @@
         </tbody>
       </table>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">

src/components/WebSet/home/indexSlider1.vue

@@ -213,7 +213,7 @@
         </tbody>
       </table>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">

src/components/WebSet/plug-in/b2b_dialog.vue

@@ -70,6 +70,7 @@
     background-position: center;
     background-size: cover;
   }
+
 </style>
 <template>
   <div class="b2bDialog">
@@ -241,10 +242,12 @@
               TCID: item.TCID,
               Title: item.Title,
               DayNum: item.DayNum,
-              Price: item.B2BPrice,
+              Price: item.B2CPrice,
               LinkUrl: LinkUrl,
             };
+            if (obj.imgUrl && obj.imgUrl != '') {
               this.plugData.Details[this.clickIndex].TripImageUrl = obj.imgUrl;
+            }
             this.plugData.Details[this.clickIndex].Price = obj.Price;
             this.plugData.Details[this.clickIndex].DayNum = obj.DayNum;
             this.plugData.Details[this.clickIndex].TripTitle = obj.Title;
@@ -255,4 +258,5 @@
     },
     mounted() {},
   };
+
 </script>

src/components/WebSet/plug-in/b2blink_dialog.vue

@@ -146,7 +146,7 @@
               TCID: item.TCID,
               Title: item.Title,
               DayNum: item.DayNum,
-              Price: item.B2BPrice,
+              Price: item.B2CPrice,
               LinkUrl: LinkUrl,
             };
             this.plugData.TripImage = obj.imgUrl;

src/components/WebSet/plug-in/banner_dialog.vue

@@ -51,6 +51,7 @@
     background-position: center;
     background-size: cover;
   }
+
 </style>
 <template>
   <div class="bannerdialog">
@@ -118,7 +119,7 @@
         </el-row>
       </template>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">
@@ -166,10 +167,14 @@
         if (chooseMenuObj) {
           this.clickItem.LinkTitle = chooseMenuObj.MenuName;
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
+          if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
+            this.clickItem.ImageUrl = chooseMenuObj.ImgUrl;
+          }
         }
         this.$refs.chooseMenu.initMenuCheck();
       },
     },
     mounted() {},
   };
+
 </script>

src/components/WebSet/plug-in/choose_trip.vue

@@ -85,10 +85,11 @@
   .choose_trip .table-striped>tr:nth-of-type(odd) {
     background-color: #f9f9f9;
   }
+
 </style>
 <template>
   <div class="choose_trip">
-    <el-form >
+    <el-form>
       <el-row>
         <el-col :span="6">
           <el-form-item :label="$t('system.table_ssLine')" label-width="115px;">
@@ -167,7 +168,7 @@
           {{ $t("ground.tianshu") }}
         </th>
         <th>
-          {{ $t("objFill.jiage") }}
+          {{$t('Operation.Op_directPrice')}}
         </th>
         <th>
           {{ $t("objFill.v101.tuanweizku") }}
@@ -416,4 +417,5 @@
       this.getLineList();
     },
   };
+
 </script>

src/components/WebSet/plug-in/group_dialog.vue

@@ -102,7 +102,7 @@
               TCID: item.TCID,
               Title: item.Title,
               DayNum: item.DayNum,
-              Price: item.B2BPrice,
+              Price: item.B2CPrice,
               Seat: totalSeat,
               LinkUrl: LinkUrl,
               Substitute: item.IsSubstitution > 0,

src/components/WebSet/plug-in/imglink_dialog.vue

@@ -50,6 +50,7 @@
     background-position: center;
     background-size: cover;
   }
+
 </style>
 <template>
   <div class="WebSiteimgLink">
@@ -185,24 +186,28 @@
               TCID: item.TCID,
               Title: item.Title,
               DayNum: item.DayNum,
-              Price: item.B2BPrice,
+              Price: item.B2CPrice,
             };
             if (this.checkIndex == 1) {
+              if (obj.imgUrl && obj.imgUrl != '') {
                 this.plugData.ImageUrl1 = obj.imgUrl;
+              }
               this.plugData.TripTitle1 = obj.Title;
             }
             if (this.checkIndex == 2) {
+              if (obj.imgUrl && obj.imgUrl != '') {
                 this.plugData.ImageUrl2 = obj.imgUrl;
+              }
               this.plugData.TripTitle2 = obj.Title;
             }
             this.$refs.chooseTrip.clearData();
           });
         }
       },
-
     },
     mounted() {
 
     },
   };
+
 </script>

src/components/WebSet/plug-in/linkpicture_dialog.vue

@@ -63,12 +63,13 @@
       <el-row style="margin-bottom:20px;">
         <el-col :span="12">
           <el-form-item>
-            <el-button type="primary" size="small" @click="isShowTripDailog=true,clickIndex=1">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
+            <el-button type="primary" size="small" @click="isShowTripDailog=true,clickIndex=1">
+              {{$t('objFill.v101.xuanzhexingc')}}</el-button>
           </el-form-item>
           <el-form-item>
             <div class="webSliderDiv" @click="clickIndex=1">
-              <el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
-                :show-file-list="false" action="">
+              <el-upload :http-request="UploadAttachment" :multiple="true"
+                accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
                 <div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage1 + ')'}"></div>
                 <div class="addIconDiv">
                   <i class="web_addImg iconfont icon-img_haha"></i>
@@ -81,12 +82,13 @@
         </el-col>
         <el-col :span="12">
           <el-form-item>
-            <el-button type="primary" size="small" @click="isShowTripDailog=true,clickIndex=2">{{$t('objFill.v101.xuanzhexingc')}}</el-button>
+            <el-button type="primary" size="small" @click="isShowTripDailog=true,clickIndex=2">
+              {{$t('objFill.v101.xuanzhexingc')}}</el-button>
           </el-form-item>
           <el-form-item>
             <div class="webSliderDiv" @click="clickIndex=2">
-              <el-upload :http-request="UploadAttachment" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
-                :show-file-list="false" action="">
+              <el-upload :http-request="UploadAttachment" :multiple="true"
+                accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
                 <div class="sectionImg" :style="{backgroundImage:'url(' + plugData.TripImage2 + ')'}"></div>
                 <div class="addIconDiv">
                   <i class="web_addImg iconfont icon-img_haha"></i>
@@ -157,20 +159,24 @@
               TCID: item.TCID,
               Title: item.Title,
               DayNum: item.DayNum,
-              Price: item.B2BPrice,
+              Price: item.B2CPrice,
             };
             if (this.clickIndex == 1) {
+              if (obj.imgUrl && obj.imgUrl != '') {
                 this.plugData.TripImage1 = obj.imgUrl;
-              this.plugData.TripTitle1=obj.Title;
+              }
+              this.plugData.TripTitle1 = obj.Title;
             }
             if (this.clickIndex == 2) {
+              if (obj.imgUrl && obj.imgUrl != '') {
                 this.plugData.TripImage2 = obj.imgUrl;
-              this.plugData.TripTitle2=obj.Title;
+              }
+              this.plugData.TripTitle2 = obj.Title;
             }
             this.$refs.chooseTrip.clearData();
           });
         }
-        this.plugData.Describe=this.plugData.TripTitle1+"\r\n"+this.plugData.TripTitle2;
+        this.plugData.Describe = this.plugData.TripTitle1 + "\r\n" + this.plugData.TripTitle2;
       },
     },
     mounted() {},

src/components/WebSet/plug-in/other_dialog.vue

@@ -14,10 +14,11 @@
   .otherDialog .table-striped>tr:nth-of-type(odd) {
     background-color: #f9f9f9;
   }
+
   .otherDialog .webSliderDiv {
     line-height: 0;
     height: 115px;
-    width:400px;
+    width: 400px;
     border: 1px solid #ccc;
     cursor: pointer;
     position: relative;
@@ -53,10 +54,11 @@
   .otherDialog .webSliderDiv>div {
     height: 100%;
   }
-  .otherDialog .sectionImg{
-    position:absolute;
-    width:100%;
-    height:100%;
+
+  .otherDialog .sectionImg {
+    position: absolute;
+    width: 100%;
+    height: 100%;
     background-position: center;
     background-size: cover;
   }
@@ -95,7 +97,8 @@
             </td>
             <td>
               <el-upload :http-request="UploadAttachment" :show-file-list="false" :multiple="true" accept="" action=''>
-                <el-button size="small" type="primary" @click="checkIndex=index">{{$t('tips.dianjishanhcuan')}}</el-button>
+                <el-button size="small" type="primary" @click="checkIndex=index">{{$t('tips.dianjishanhcuan')}}
+                </el-button>
               </el-upload>
             </td>
             <td>
@@ -125,8 +128,9 @@
           <el-col :span="24">
             <el-form-item :label="$t('objFill.v101.duanluoneir')">
               <!-- <el-input type="textarea" :rows="4" v-model="plugData.ParagraphContent"></el-input> -->
-              <my-edit  style="height:60vh"  v-on:edit-value="plugData.ParagraphContent  = arguments[0]" v-bind:editValue="plugData.ParagraphContent"
-                    v-bind:toolbarShow="toolbar"  v-bind:referenceList="DefaultList"></my-edit>
+              <my-edit style="height:60vh" v-on:edit-value="plugData.ParagraphContent  = arguments[0]"
+                v-bind:editValue="plugData.ParagraphContent" v-bind:toolbarShow="toolbar"
+                v-bind:referenceList="DefaultList"></my-edit>
             </el-form-item>
           </el-col>
         </el-row>
@@ -156,15 +160,16 @@
           </el-col>
         </el-row>
       </template>
-
     </el-form>
   </div>
 </template>
 <script>
-import MyEdit from "@/components/EditTemplate.vue";
+  import MyEdit from "@/components/EditTemplate.vue";
   export default {
     props: ["plugData"],
-    components:{MyEdit},
+    components: {
+      MyEdit
+    },
     data() {
       return {
         checkIndex: 0,
@@ -172,7 +177,7 @@ import MyEdit from "@/components/EditTemplate.vue";
           clean: true,
           font: false, //字体
           narrative: false, //叙述,
-          image:false,
+          image: false,
           bold: true, //加粗
           underline: true, //下划线
           header1: true, //H1
@@ -190,27 +195,24 @@ import MyEdit from "@/components/EditTemplate.vue";
       UploadAttachment(file) {
         let newArr = [];
         newArr.push(file.file);
-        let fileName = file.file.name;
         var path = "/Upload/WebSite/";
         this.UploadSelfFileT(path, newArr, x => {
           var str = x.data.FilePath;
           var imgUrl = this.domainManager().ViittoFileUrl + str;
           this.plugData.DownLoadList[this.checkIndex].LinkUrl = imgUrl;
-          this.plugData.DownLoadList[this.checkIndex].LinkTitle=fileName;
+          this.plugData.DownLoadList[this.checkIndex].LinkTitle = fileName;
         });
       },
       //上传图片
-      UploadAttachment2(file){
+      UploadAttachment2(file) {
         let newArr = [];
         newArr.push(file.file);
-        let fileName = file.file.name;
         var path = "/Upload/WebSite/";
         this.UploadSelfFileT(path, newArr, x => {
           var str = x.data.FilePath;
           var imgUrl = this.domainManager().ViittoFileUrl + str;
           this.plugData.ImageUrl = imgUrl;
         });
-
       }
     },
     mounted() {

src/components/WebSet/plug-in/paragraphLink_dialog.vue

@@ -42,6 +42,7 @@
   .paragraphLink .webSliderDiv>div {
     height: 100%;
   }
+
 </style>
 <template>
   <div class="paragraphLink">
@@ -126,7 +127,6 @@
           this.plugData.ImageUrl = imgUrl;
         });
       },
-
       //获取选择行程数据
       getChooseTripData() {
         var tempArray = this.$refs.chooseTrip.getChooseData();
@@ -145,9 +145,11 @@
               TCID: item.TCID,
               Title: item.Title,
               DayNum: item.DayNum,
-              Price: item.B2BPrice,
+              Price: item.B2CPrice,
             };
+            if (obj.imgUrl && obj.imgUrl != '') {
               this.plugData.ImageUrl = obj.imgUrl;
+            }
             this.plugData.TripTitle = obj.Title;
             this.plugData.LinkUrl = LinkUrl;
             this.$refs.chooseTrip.clearData();
@@ -159,4 +161,5 @@
 
     },
   };
+
 </script>

src/components/WebSet/plug-in/picture_dialog.vue

@@ -55,6 +55,7 @@
     border-radius: 50%;
     overflow: hidden;
   }
+
 </style>
 <template>
   <div class="pictureDialog">
@@ -296,13 +297,18 @@
             };
             if (this.plugData.Type == 1 || this.plugData.Type == 2 || this.plugData.Type == 3 || this.plugData
               .Type == 4 || this.plugData.Type == 5 || this.plugData.Type == 6) {
+              if (obj.imgUrl && obj.imgUrl != '') {
                 this.plugData.Details[this.checkIndex].ImageUrl = obj.imgUrl;
+              }
               this.plugData.Details[this.checkIndex].Price = obj.Price;
               this.plugData.Details[this.checkIndex].TripTitle = obj.Title;
               this.plugData.Details[this.checkIndex].DayNum = obj.DayNum;
               this.plugData.Details[this.checkIndex].LinkUrl = obj.LinkUrl;
             } else {
+              if (obj.imgUrl && obj.imgUrl != '') {
                 this.plugData.Details[this.checkIndex].ImageUrl = obj.imgUrl;
+              }
+
               this.plugData.Details[this.checkIndex].Price2 = obj.Price;
               this.plugData.Details[this.checkIndex].TripTitle2 = obj.Title;
               this.plugData.Details[this.checkIndex].DayNum2 = obj.DayNum;
@@ -316,4 +322,5 @@
     },
     mounted() {},
   };
+
 </script>

src/components/WebSet/plug-in/qrcode_dialog.vue

@@ -130,7 +130,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">

src/components/WebSet/plug-in/searchf_dialog.vue

@@ -95,7 +95,6 @@
       UploadAttachment(file) {
         let newArr = [];
         newArr.push(file.file);
-        let fileName = file.file.name;
         var path = "/Upload/WebSite/";
         this.UploadSelfFileT(path, newArr, x => {
           var str = x.data.FilePath;

src/components/WebSet/plug-in/searchs_dialog.vue

@@ -46,6 +46,7 @@
     background-position: center;
     background-size: cover;
   }
+
 </style>
 <template>
   <div class="searchsdialog">
@@ -83,7 +84,7 @@
         </el-row>
       </template>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">
@@ -130,10 +131,14 @@
         this.isShowMenuDialog = false;
         if (chooseMenuObj) {
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
+          if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
+            this.clickItem.ImageUrl = chooseMenuObj.ImgUrl;
+          }
         }
         this.$refs.chooseMenu.initMenuCheck();
       },
     },
     mounted() {},
   };
+
 </script>

src/components/WebSet/plug-in/sectionTitle_dialog.vue

@@ -204,7 +204,6 @@
       UploadAttachment(file) {
         let newArr = [];
         newArr.push(file.file);
-        let fileName = file.file.name;
         var path = "/Upload/WebSite/";
         this.UploadSelfFileT(path, newArr, x => {
           var str = x.data.FilePath;

src/components/WebSet/plug-in/slider_dialog.vue

@@ -40,6 +40,7 @@
     background: rgba(0, 0, 0, 0.5);
     color: #fff;
   }
+
 </style>
 <template>
   <div class="WebSite_slider">
@@ -89,7 +90,7 @@
         </tbody>
       </table>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="500px" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">
@@ -139,10 +140,14 @@
         this.isShowMenuDialog = false;
         if (chooseMenuObj) {
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
+          if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
+            this.clickItem.LinkImg = chooseMenuObj.ImgUrl;
+          }
         }
         this.$refs.chooseMenu.initMenuCheck();
       },
     },
     mounted() {}
   };
+
 </script>

src/components/administrative/empBankAccountAll.vue

@@ -801,7 +801,6 @@ export default {
               }
               this.supplierList.push(Obj)
             })
-            console.log(dataList,'====')
             if(this.addMsg.ObjIdStr&&this.supplierList&&this.supplierList.length>0){
               this.addMsg.ObjID = Number(this.supplierList[0].ID)
             }

src/components/administrative/model/AirTicketMessage.vue

 <template>
-  <el-dialog custom-class='PingFangSC' :title="$t('objFill.v101.header.kaipiaotips')" :visible.sync="AirTicketVisible" center
-      :before-close="closeChangeMachie" width="1100px">
+  <el-dialog custom-class='PingFangSC' :title="$t('objFill.v101.header.kaipiaotips')" :visible.sync="AirTicketVisible"
+    center :before-close="closeChangeMachie" width="1100px">
     <div v-if="AirTicketListObj && AirTicketListObj.Data&&AirTicketListObj.Data.length>0" style="margin-top: 10px;">
       <p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;display:flex;">
         <span style="width: 70%; display: block;">{{$t('objFill.v101.header.weikaipiaoList')}}</span>
@@ -50,7 +50,7 @@
 
 <script>
   export default {
-    props:["AirTicketListObj"],
+    props: ["AirTicketListObj"],
     data() {
       return {
         AirTicketVisible: true
@@ -61,7 +61,6 @@
     },
     methods: {
       closeChangeMachie(done) {
-        console.log("我进来了");
         this.$emit('AirTicketVisible')
       },
       //跳转机票列表
@@ -75,4 +74,5 @@
       },
     }
   }
+
 </script>

src/components/administrative/userManagement.vue

@@ -138,10 +138,12 @@
               "></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="$t('adm.adm_bindaccountinfo')" placement="top">
-            <el-button v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="primary" class="zidingyiFz" icon="iconfont icon-bangdingzhagnhuxinxi" circle
-              @click="goUrl('empBankAccount', item.EmployeeId)"></el-button>
+            <el-button v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="primary" class="zidingyiFz"
+              icon="iconfont icon-bangdingzhagnhuxinxi" circle @click="goUrl('empBankAccount', item.EmployeeId)">
+            </el-button>
           </el-tooltip>
-          <el-tooltip v-if="isSelectFinaceJJ" class="item" effect="dark" :content="$t('objFill.danjujiaojie')" placement="top">
+          <el-tooltip v-if="isSelectFinaceJJ" class="item" effect="dark" :content="$t('objFill.danjujiaojie')"
+            placement="top">
             <el-button type="primary" class="zidingyiFz" icon="iconfont icon-zhuanhuan2" circle
               @click="goUrl('GetWOrkTransferPageLis', item.EmployeeId)"></el-button>
           </el-tooltip>
@@ -315,7 +317,8 @@
           <tr>
             <td>
               <el-form-item :label="$t('system.table_phone')" prop="EmMobile">
-                <el-input class="w217" type="text"  maxlength="20" v-model="addMsg.EmMobile" :placeholder="$t('pub.pleaseImport')">
+                <el-input class="w217" type="text" maxlength="20" v-model="addMsg.EmMobile"
+                  :placeholder="$t('pub.pleaseImport')">
                 </el-input>
               </el-form-item>
             </td>
@@ -383,17 +386,19 @@
       <template v-if="AlipayBindMsg.ShareCode&&AlipayBindMsg.ShareCode.length>0">
         <div style="display:block;text-align:center;">
           <p style="color:red;">请用支付宝扫一扫,扫描当前二维码激活企业支付宝员工信息</p>
-          <el-image style="width: 100px; height: 100px"  :src="'data:image/png;base64,'+AlipayBindMsg.ShareCode"  fit="cover"></el-image>
+          <el-image style="width: 100px; height: 100px" :src="'data:image/png;base64,'+AlipayBindMsg.ShareCode"
+            fit="cover"></el-image>
         </div>
       </template>
       <template v-else>
         <el-form :model="ulmMsg" label-width="120px" :rules="AlipayBindMsg" ref="AlipayBindMsg">
           <el-form-item label="支付宝登录账号" prop="Identity">
-            <el-input class="w217" type="text" v-model="AlipayBindMsg.Identity" :placeholder="$t('pub.pleaseImport')" >
+            <el-input class="w217" type="text" v-model="AlipayBindMsg.Identity" :placeholder="$t('pub.pleaseImport')">
             </el-input>
           </el-form-item>
           <el-form-item :label="$t('pub.mbPhoneNum')" prop="mbPhoneNum">
-            <el-input class="w217" type="text" v-model="AlipayBindMsg.EmployeeMobile" :placeholder="$t('pub.pleaseImport')" >
+            <el-input class="w217" type="text" v-model="AlipayBindMsg.EmployeeMobile"
+              :placeholder="$t('pub.pleaseImport')">
             </el-input>
           </el-form-item>
         </el-form>
@@ -434,9 +439,9 @@
       };
 
       return {
-        qjGroupId:-1,
-        F_Finance_Create:false,//制单权限
-        userInfo:{},
+        qjGroupId: -1,
+        F_Finance_Create: false, //制单权限
+        userInfo: {},
         UseNum: 0,
         TotalNum: 0,
         leaveBtn: "",
@@ -607,12 +612,12 @@
         departMentList: [],
         layerPostList: [],
         PostList: [],
-        AlipayBindShow:false,
-        AlipayBindMsg:{
-          Id:0,
-          Identity:"",//identity传已注册支付宝且可以登录支付宝的手机号或邮箱 ；
-          EmployeeMobile:"",//员工手机号
-          ShareCode:"",
+        AlipayBindShow: false,
+        AlipayBindMsg: {
+          Id: 0,
+          Identity: "", //identity传已注册支付宝且可以登录支付宝的手机号或邮箱 ；
+          EmployeeMobile: "", //员工手机号
+          ShareCode: "",
         },
         leaves: {
           t1: this.$t('pub.jobSel')
@@ -621,9 +626,9 @@
     },
     mounted() {
       let userInfo = this.getLocalStorage();
-      this.userInfo=this.getLocalStorage();
+      this.userInfo = this.getLocalStorage();
       this.GetSupperOrderEditAuth();
-      this.qjGroupId=this.QjGroupId();
+      this.qjGroupId = this.QjGroupId();
       this.getPostMsg.RB_Group_Id = this.getCompanyMsg.RB_Group_Id = this.getDepartmentMsg.RB_Group_Id = this.addMsg
         .RB_Group_id = this.msg.RB_Group_id =
         userInfo.RB_Group_id; //集团
@@ -655,17 +660,16 @@
           return value;
         }
       },
-      SetAlipayBind(){
-        if(this.AlipayBindMsg.Identity.length==0){
+      SetAlipayBind() {
+        if (this.AlipayBindMsg.Identity.length == 0) {
           this.$message.error("请输入支付宝登陆账号");
-          return ;
+          return;
         }
         this.apipost(
           "alipay_post_AlipayCommerceEcEmployeeAdd", this.AlipayBindMsg,
           res => {
             if (res.data.resultCode == 1) {
-              console.log("res.data",res.data);
-              this.AlipayBindMsg.ShareCode=res.data.data.SignUrl;
+              this.AlipayBindMsg.ShareCode = res.data.data.SignUrl;
             } else {
               this.$message.error(res.data.message);
             }
@@ -673,7 +677,7 @@
           err => {}
         );
       },
-      DelAlipayBind(item){
+      DelAlipayBind(item) {
         this.$confirm("是否解绑支付宝账户信息?", this.$t('tips.tips'), {
             confirmButtonText: this.$t('pub.sureBtn'),
             cancelButtonText: this.$t('pub.cancelBtn'),
@@ -681,7 +685,9 @@
           })
           .then(() => {
             this.apipost(
-            "alipay_post_AlipayCommerceEcEmployeeDelete", {Id:item.EmployeeId},
+              "alipay_post_AlipayCommerceEcEmployeeDelete", {
+                Id: item.EmployeeId
+              },
               res => {
                 if (res.data.resultCode == 1) {
                   this.getList();
@@ -696,21 +702,20 @@
             this.$message.info("取消解绑支付宝账户");
           });
       },
-      AlipayBindBase(obj){
-        this.AlipayBindShow=true;
-        this.AlipayBindMsg.Id=obj.EmployeeId;
-        this.AlipayBindMsg.EmployeeMobile=obj.EmLoginMobile;
-        this.AlipayBindMsg.ShareCode="";
-        console.log("AlipayBindBase",this.AlipayBindMsg);
+      AlipayBindBase(obj) {
+        this.AlipayBindShow = true;
+        this.AlipayBindMsg.Id = obj.EmployeeId;
+        this.AlipayBindMsg.EmployeeMobile = obj.EmLoginMobile;
+        this.AlipayBindMsg.ShareCode = "";
       },
-      AlipayBaseReset(obj){
-        if(this.AlipayBindMsg.ShareCode&&this.AlipayBindMsg.ShareCode.length>0){
+      AlipayBaseReset(obj) {
+        if (this.AlipayBindMsg.ShareCode && this.AlipayBindMsg.ShareCode.length > 0) {
           this.getList();
         }
-        this.AlipayBindShow=false;
-        this.AlipayBindMsg.Id=0;
-        this.AlipayBindMsg.EmployeeMobile="";
-        this.AlipayBindMsg.ShareCode="";
+        this.AlipayBindShow = false;
+        this.AlipayBindMsg.Id = 0;
+        this.AlipayBindMsg.EmployeeMobile = "";
+        this.AlipayBindMsg.ShareCode = "";
       },
       GetSupperOrderEditAuth() {
         var actionCodeNew = this.$AuthCode.F_Finance_Create;

src/components/commonPage/priceCode.vue

@@ -40,7 +40,6 @@
         } else {
           msg.pUrl = "/html/ImpressionOpinionSurvey/busSign.html"
         }
-        console.log("createPriceImg", msg)
         this.$http({
           headers: {
             'Content-Type': 'application/json'

src/components/guestlogin.vue

@@ -6,9 +6,11 @@
 
 <template>
   <div>
-    <input type="button" :value="$t('objFill.v101.shoujihaoyz')" style="width:95%;height:200px;" @click="changeLoginType(1)" />
+    <input type="button" :value="$t('objFill.v101.shoujihaoyz')" style="width:95%;height:200px;"
+      @click="changeLoginType(1)" />
     <br />
-    <input type="button" :value="$t('objFill.v101.huzhaohyz')" style="width:95%;height:200px;" @click="changeLoginType(2)" />
+    <input type="button" :value="$t('objFill.v101.huzhaohyz')" style="width:95%;height:200px;"
+      @click="changeLoginType(2)" />
   </div>
 </template>
 
@@ -52,7 +54,6 @@
           res => {
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
-              console.log(tempData);
               if (tempData && tempData.length > 0) {
                 this.qMsg.GuestId = tempData[0].Id;
                 this.qMsg.SurName = tempData[0].SurName;

src/components/orderCommon/order-form2.vue

@@ -2525,7 +2525,6 @@
           this.addMsg.SonControlID = oldValue.SonControlID;
           this.SingleDMCPrice = oldValue.SingleDMCPrice;
           this.SingleAirticketMoney = oldValue.AirticketMoney;
-          console.log("SingleAirticketMoney", this.SingleAirticketMoney);
           this.SingleDMCPricex = oldValue.SingleDMCPrice;
           this.priceObj = JSON.parse(JSON.stringify(oldValue));
           if (this.pagesTitle == "当地游产品") {

src/plug/index.js

@@ -122,9 +122,7 @@ export default {
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
-        domainUrl = "http://192.168.5.56";
-        domainUrl = "http://192.168.5.39:8083";
-        // domainUrl = "http://reborn.oytour.com"
+        domainUrl = "http://192.168.5.214";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";
@@ -684,8 +682,6 @@ export default {
         var res = {
           data: data
         }
-        let str = `CheckUserAuth_authCode:` + authCode;
-        console.log(str, data);
         successCall(res);
       },
       //供应商版请求接口方法
@@ -1045,7 +1041,6 @@ export default {
             aliurl += '/' + objectKey
           }
         }
-        console.log("aliurl", aliurl);
         var resultJson = {
           data: "",
           message: "",
@@ -1158,7 +1153,6 @@ export default {
       },
       //Blob文件上传
       Vue.prototype.uploadSelfBlob = function (path, files, paramsObj, successCall) {
-        console.log("paramsObj", paramsObj);
         let that = this;
         var uploadUrl = that.domainManager().UploadUrl + "/Upload/UploadBlob?fileType=1&fileLimit=5&&filePath=" + path;
         var formData = new FormData();