Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -997,7 +997,7 @@
 
   .RegistrationList .GO_SimulaDrop {
     position: absolute;
-    right: 10px;
+    right: 5px;
     top: 5px;
     color: #d1d1d1;
   }
@@ -1007,7 +1007,7 @@
     height: 24px;
     margin: 0 3px 3px 0;
     overflow: hidden;
-    max-width: 200px;
+    max-width: 194px;
     white-space: nowrap;
     text-overflow: ellipsis;
     font-size: 12px;
@@ -1069,29 +1069,14 @@
   .SimulateDrop-box {
     width: 210px;
     min-height: 34px;
+    max-height: 68px;
+    overflow-y: scroll;
     position: relative;
     padding: 5px 21px 5px 6px;
     float: left;
-    /* margin: 4px 0 0 10px; */
     border: 1px solid #d1d1d1;
   }
 
-  .SD_flight {
-    display: inline-block;
-    height: 24px;
-    margin: 0 3px 3px 0;
-    padding: 0 8px;
-    line-height: 22px;
-    background-color: #f0f2f5;
-  }
-
-  .SimulaDrop {
-    position: absolute;
-    top: 3px;
-    right: 10px;
-    color: #c0c4cc;
-  }
-
   ._TravelPricePopover .jiDiv {
     width: 750px;
     max-height: 400px;
@@ -1756,9 +1741,7 @@
                         <td>
                           <el-input class="w80" type="Number" :max='addMsg.GuestNum' v-model="item.Number"
                             @keyup.native="initScenic()"></el-input>
-                          <!--  -->
                         </td>
-
                       </tr>
                     </table>
                   </div>
@@ -1766,7 +1749,7 @@
                 <div slot="reference" class="SimulateDrop-box">
                   <span class="SD_flight"
                     v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}*{{subItem.Number}}</span>
-                  <i class="iconfont icon-arrow-down SimulaDrop"></i>
+                  <i class="iconfont icon-arrow-down GO_SimulaDrop"></i>
                 </div>
               </el-popover>
             </el-form-item>

src/components/orderCommon/order-form2.vue

@@ -60,6 +60,8 @@
   /deep/.SimulateDrop-box {
     width: 176px;
     min-height: 34px;
+    max-height: 68px;
+    overflow-y:scroll;
     position: relative;
     padding: 5px 21px 5px 6px;
     float: left;
@@ -608,56 +610,7 @@
             </el-form-item>
           </el-col>
         </template>
-        <el-col :span="4" v-if="showCity && pagesTitle == '跟团游产品'">
-          <!-- {{ScenicRefundList}} -->
-          <el-form-item :label="$t('salesModule.ScenicRefund')">
-            <el-popover popper-class="_TravelPricePopover" trigger="click">
-              <div>
-                <div class="ScenicDiv">
-                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr>
-                      <!-- <td class="_color_666">{{$t('fnc.xuanze')}}</td> -->
-                      <td class="_color_666">{{$t('visaT.jdname')}}</td>
-                      <td class="_color_666">{{$t('fnc.tkjine')}}</td>
-                      <td class="_color_666">{{$t('fnc.qxrenshu')}}</td>
-                    </tr>
-                    <tr v-for="item in ScenicRefundList">
-                      <!--  <td>
-                                <el-checkbox :checked="item.IsChecked" ></el-checkbox>
-                                @change="getScenic(item)"
-                              </td> -->
-                      <td>
-                        {{item.CouponsName}}
-                      </td>
-                      <td>
-                        -￥{{item.RefundMoney}}
-                      </td>
-                      <td>
-                        <el-input class="w80" type="Number" :max='addMsg.GuestNum' v-model="item.Number"
-                          @keyup.native="initScenic()"></el-input>
-                        <!--  -->
-                      </td>
 
-                    </tr>
-                  </table>
-                </div>
-              </div>
-              <div slot="reference" class="SimulateDrop-box">
-                <span class="SD_flight"
-                  v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}*{{subItem.Number}}</span>
-                <i class="iconfont icon-arrow-down SimulaDrop"></i>
-              </div>
-            </el-popover>
-          </el-form-item>
-          <!-- <el-form-item :label="$t('salesModule.ScenicRefund')">
-            <el-select filterable multiple class="multiple_input" v-model="addMsg.ScenicRefundArr"
-              :placeholder="$t('pub.pleaseSel')" @change="ScenicRefundMethods">
-              <el-option v-for="(item, index) in ScenicRefundList" :label="item.ScenicName" :value="item.Id"
-                :key="index">
-              </el-option>
-            </el-select>
-          </el-form-item> -->
-        </el-col>
         <el-col :span="4" v-if="showCity || pagesTitle == '当地游产品'">
           <el-form-item :label="$t('salesModule.MsgMoney')">
             <el-select filterable v-model="addMsg.IsShowMessagesMoney" :placeholder="$t('pub.pleaseSel')">
@@ -730,7 +683,45 @@
             </div>
           </el-form-item>
         </el-col>
+        <el-col :span="4" v-if="showCity && pagesTitle == '跟团游产品'">
+          <el-form-item :label="$t('salesModule.ScenicRefund')">
+            <el-popover popper-class="_TravelPricePopover" trigger="click">
+              <div>
+                <div class="ScenicDiv">
+                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tr>
+                      <td class="_color_666">{{$t('visaT.jdname')}}</td>
+                      <td class="_color_666">{{$t('fnc.tkjine')}}</td>
+                      <td class="_color_666">{{$t('fnc.qxrenshu')}}</td>
+                      <td class="_color_666">{{$t('fnc.tkjine')}}</td>
+                    </tr>
+                    <tr v-for="item in ScenicRefundList">
+                      <td>
+                        {{item.CouponsName}}
+                      </td>
+                      <td>
+                        -￥{{item.RefundMoney}}
+                      </td>
+                      <td>
+                        <el-input class="w80" type="Number" :max='addMsg.GuestNum' v-model="item.Number"
+                          @keyup.native="initScenic()"></el-input>
+                      </td>
+                      <td>
+                        - {{item.Number*item.RefundMoney}}
+                      </td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
+              <div slot="reference" class="SimulateDrop-box">
+                <span class="SD_flight" v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}</span>
+                <i class="iconfont icon-arrow-down SimulaDrop"></i>
+              </div>
+            </el-popover>
+          </el-form-item>
+        </el-col>
       </el-row>
+
       <template v-if="pagesTitle == '当地游产品'">
         <el-row :gutter="20" style="margin-bottom: 20px">
           <el-col :span="24">
@@ -2048,7 +2039,7 @@
             }
           });
         }
- 
+
         //单地接
         let dandijie = 0;
         if (this.addMsg.GroupType == 4) {