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

src/components/ShoppingStore/ShoppingStore.vue

@@ -375,6 +375,7 @@
   .shoppingStore .impoTable {
     width: 100%;
     min-width: 1400px;
+    border-collapse: collapse;
   }
 
   .shoppingStore .impoTable td {
@@ -382,6 +383,7 @@
     font-size: 12px;
     color: #333;
     background-color: #e0f4ff;
+    border: 1px solid #dcdfe6;
     height: 34px;
   }
 
@@ -412,8 +414,8 @@
     cursor: pointer;
   }
 
-  .shoppingStore .redType .el-input__inner {
-    border-color: #e95252;
+  .shoppingStore .redType span  {
+    color: #e95252;
   }
 
   .shoppingStore .downBtn {
@@ -669,53 +671,57 @@
       </el-form>
     </div>
     <div class="btmAddStore" :class="{'fillShow':fillShow}">
-      <div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div>
+      <div class="btmTitle">导入营销数据<span class="litTip">(红色内容代表未匹配到的数据)</span></div>
       <div style="height:250px;overflow-y: auto;">
         <table class="impoTable" style="border-spacing: 0px 1px;" v-loading="tabLoading">
           <thead>
             <tr>
-              <th width="200">团号</th>
-              <th>店名</th>
-              <th>进店时间</th>
-              <th>导游名称</th>
-              <th>领队名称</th>
-              <th>购物总额</th>
-              <th>组团社提成</th>
-              <th>领队提成</th>
-              <th>导游提成</th>
-              <th>汇率</th>
-              <th>币种</th>
-              <th>操作</th>
+              <th width="120">团号</th>
+              <th width="170">店名</th>
+              <th width="100">进店时间</th>
+              <th width="80">导游名称</th>
+              <th width="80">领队名称</th>
+              <th width="80">购物总额</th>
+              <th width="100">组团社提成</th>
+              <th width="80">领队提成</th>
+              <th width="80">导游提成</th>
+              <th width="80">汇率</th>
+              <th width="80">币种</th>
+              <th width="80">操作</th>
             </tr>
             <tr v-for="(item,index) in importData" :key="item.subCode" :class="{'IsConflict':item.IsConflict==1}">
               <td :class="{'redType':item.TCIDExist==-1}">
-                <el-input v-model="item.TCNUM" class="w150"></el-input>
+                <!-- <el-input v-model="item.TCNUM" class="w150"></el-input> -->
+                <span>{{item.TCNUM}}</span>
               </td>
               <td :class="{'redType':item.ShoppingNameExist==-1}">
-                <el-select clearable class="w150" v-model='item.ShoppingID' filterable placeholder="请选择购物店">
+                <!-- <el-select clearable class="w150" v-model='item.ShoppingID' filterable placeholder="请选择购物店">
                   <el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
-                </el-select>
+                </el-select> -->
+                <span>{{item.Name}}</span>
               </td>
               <td>{{item.EnterTime}}</td>
-              <td :class="{'redType':item.GuideExist==-1}">
-                <el-select clearable class="w150" v-model='item.GuideID' filterable placeholder="请选择领队">
+              <td :class="{'redType':item.GuideID==0}">
+                <!-- <el-select clearable class="w150" v-model='item.GuideID' filterable placeholder="请选择导游">
                   <el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
-                </el-select>
+                </el-select> -->
+                <span>{{item.GuideName}}</span>
               </td>
-              <td :class="{'redType':item.LeaderName==-1}">
-                <el-select clearable class="w150" v-model='item.LeaderID' filterable placeholder="请选择导游">
+              <td :class="{'redType':item.LeaderID==0}">
+                <span>{{item.LeaderName}}</span>
+                <!-- <el-select clearable class="w150" v-model='item.LeaderID' filterable placeholder="请选择领队">
                   <el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
-                </el-select>
+                </el-select> -->
               </td>
               <td>{{item.TotalPrice}}</td>
               <td>{{item.GroupExtract}}</td>
               <td>{{item.LeaderExtract}}</td>
               <td>{{item.GuideExtract}}</td>
               <td>{{item.Rate}}</td>
-              <td :class="{'redType':item.CurrencyExist==-1}">{{item.Currency}}</td>
+              <td :class="{'redType':item.CurrencyExist==-1}"><span>{{item.Currency}}</span></td>
               <td><span class="delInfo" @click="delInfo(index)">删除</span></td>
             </tr>
           </thead>