页面修改

src/components/Hotel/DiDa/HotelDetails.vue

@@ -940,7 +940,6 @@
         let date = (dt.getDate() + 1).toString().padStart(2, "0");
         return year + "-" + month + "-" + date;
       },
-
       getPrice(price) {
         return Math.ceil(price);
       },

src/components/SingleAirTicket/douyinOrder.vue

@@ -332,12 +332,12 @@
                       <template v-if="subItem.Code==5">
                         {{ subItem.Content  }}
                         <template v-if="subItem.FileList&&subItem.FileList.length>0">
-                          <br />
-                          <font>附件</font>
                           <br />
                           <template v-for="(tItem,tIndex) in subItem.FileList">
-                            <img :src="tItem" style="width:40px;height:40px;padding-right:5px;"
-                              @click="showImg(subItem.FileList)" />
+                            <el-tooltip class="item" effect="dark" content="点击查看图片" placement="top">
+                              <img :src="tItem" style="width:100px;height:100px;padding-right:5px;cursor:pointer;"
+                                @click="showImg(subItem.FileList)" />
+                            </el-tooltip>
                           </template>
                         </template>
                       </template>
@@ -366,8 +366,6 @@
         layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
       </el-pagination>
     </div>
-
-
     <el-dialog custom-class="w500" title="分配销售人员" :visible.sync="isShowSellDig">
       <div style="padding-bottom:20px">
         <el-form label-width="120px">
@@ -467,6 +465,10 @@
     methods: {
       //设置抖音订单跟单人员
       SetDYOrderEmp() {
+        if (this.postMsg.EmpId <= 0) {
+          this.Error("请选择人员!");
+          return;
+        }
         this.apipost('douyin_SetDouYinMainOrderUpdateBy', this.postMsg, res => {
           if (res.data.resultCode == 1) {
             this.isShowSellDig = false;

src/components/SingleAirTicket/douyinSellOrder.vue

@@ -206,6 +206,48 @@
     border: 1px solid #e5e5e5;
   }
 
+  .page_iisMg .nav_Main {
+    margin-top: 10px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+  }
+
+  .page_iisMg .nav_IconContent {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+  }
+
+  .page_iisMg .nav_IconContent div>div {
+    display: inline-block;
+  }
+
+  .page_iisMg .colapp-image {
+    background-size: cover;
+    background-position: center center;
+    width: 100px;
+    height: 100px;
+    border-radius: 0%;
+  }
+
+  .page_iisMg .delBtn {
+    position: absolute;
+    right: -8px;
+    top: -8px;
+    padding: 4px 4px !important;
+  }
+
+  .page_iisMg .add-image-btn {
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    color: #419efb;
+    border: 1px solid #e2e2e2;
+    cursor: pointer;
+    text-align: center;
+  }
+
 </style>
 <template>
   <div class="page_iisMg">
@@ -327,8 +369,10 @@
                           <font>附件</font>
                           <br />
                           <template v-for="(tItem,tIndex) in subItem.FileList">
-                            <img :src="tItem" style="width:40px;height:40px;padding-right:5px;"
-                              @click="showImg(subItem.FileList)" />
+                            <el-tooltip class="item" effect="dark" content="点击查看图片" placement="top">
+                              <img :src="tItem" style="width:100px;height:100px;padding-right:5px;cursor:pointer;"
+                                @click="showImg(subItem.FileList)" />
+                            </el-tooltip>
                           </template>
                         </template>
                       </template>
@@ -360,7 +404,7 @@
 
     <el-dialog custom-class="w500" title="标记订单信息" :visible.sync="isShowStatus">
       <div style="padding-bottom:20px">
-        <el-form label-width="120px">
+        <el-form label-width="100px">
           <el-row>
             <template v-if="UpdateApply.OperateContentList&&UpdateApply.OperateContentList.length>0">
               <el-col :span="24" :gutter="35" :key="indexo" v-for="(itemo, indexo) in UpdateApply.OperateContentList"
@@ -395,19 +439,26 @@
                   <!--图文-->
                   <template v-if="itemo.Code=='5'">
                     <el-input v-model="itemo.Content" type="textarea" style="width:90%;"></el-input>
-                    <template v-if="itemo.FileList&& itemo.FileList.length>0">
-                      <template v-for="(sItem,sIndex) in itemo.FileList">
-                        <div :key="sIndex+200000" style="width:100px;height:80px;border:1px solid red;">
-                          <img :src="sItem" style="width:400px;height:80px;" /><br />
-                          <a style="color:blue;">删除</a>
+                    <div class="nav_Main">
+                      <div class="nav_IconContent">
+
+                        <div v-for="(sItem, sindex) in itemo.FileList" :key="sindex+'2'"
+                          style="margin-right: 20px; position: relative; ">
+                          <div class="colapp-image" :style="{
+                                  backgroundImage: 'url(' + sItem + ')'
+                                }"></div>
+                          <el-button @click="delImg(itemo,sindex)" class="delBtn" type="danger" icon="el-icon-close"
+                            circle>
+                          </el-button>
                         </div>
-                      </template>
-                    </template>
-                    <br />
-                    <el-upload :http-request="UploadAttachment" :multiple="true"
-                      accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
-                      <i class="el-icon-plus" @click="getClickItem(itemo)"></i>
-                    </el-upload>
+                      </div>
+                      <div v-if="itemo.FileList.length<9" class="add-image-btn">
+                        <el-upload :http-request="UploadAttachment" :multiple="true" ref="my-upload"
+                          accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+                          <i class="el-icon-plus" @click="getClickItem(itemo)"></i>
+                        </el-upload>
+                      </div>
+                    </div>
                   </template>
                 </el-form-item>
               </el-col>
@@ -501,6 +552,9 @@
       },
     },
     methods: {
+      delImg(item, index) {
+        item.FileList.splice(index, 1);
+      },
       //初始化图片查看器
       inited(viewer) {
         this.$viewer = viewer
@@ -531,23 +585,31 @@
         this.UpdateApply.OperateContentList.splice(i, 1);
       },
       setStatus: function (item) {
+        console.log("item", item);
         this.UpdateApply.Id = item.Id;
         this.UpdateApply.OperateContentList = [];
         if (item.OperateContent && item.OperateContent.length > 0) {
           this.UpdateApply.OperateContentList = JSON.parse(JSON.stringify(item.OperateContent));
-        }
-        this.AllOperateContentList.forEach(item => {
-          if (this.UpdateApply.OperateContentList.findIndex(item1 => item1.Name === item.Name) == -1) {
+          this.UpdateApply.OperateContentList.forEach(sItem => {
+            var cObj = this.AllOperateContentList.find(qitem => {
+              return qitem.Name === sItem.Name;
+            });
+            if (cObj && cObj.OptionList) {
+              sItem.OptionList = cObj.OptionList;
+            }
+          });
+        } else {
+          this.AllOperateContentList.forEach(sItem => {
             this.UpdateApply.OperateContentList.push({
-              Name: item.Name,
-              Code: item.Code,
-              OptionList: item.OptionList,
+              Name: sItem.Name,
+              Code: sItem.Code,
+              OptionList: sItem.OptionList,
               Content: '', //操作内容
               ContentList: [], //多选列表
               FileList: [], //文件列表
             });
-          }
-        });
+          });
+        }
         this.isShowStatus = true;
       },
       //更新订单信息

src/components/platformModule/menuManagement.vue

@@ -40,7 +40,8 @@
           </span>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" name="" id="" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
+          <input type="button" class="hollowFixedBtn" name="" id="" :value="$t('pub.searchBtn')"
+            @click="resetPageIndex(),getList()" />
           <input type="button" @click="outerVisible = true,dialogTitle='新增权限菜单',clearMessage();" class="normalBtn"
             :value="$t('pub.addBtn')" />
         </li>

src/plug/index.js

@@ -1173,7 +1173,9 @@ export default {
                 .then(res => {
                   successCall(res);
                 }).catch(function (reason) {
-                  that.$refs['my-upload'].clearFiles();
+                  if (that.$refs['my-upload']) {
+                    that.$refs['my-upload'].clearFiles();
+                  }
                   that.$message.error('上传失败！');
                   that.MsgBus.$emit('UploadSelfFileErr')
                 });