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

src/components/SalesModule/enrollTotalTwo.vue

@@ -638,6 +638,48 @@
 </script>
 
 <style>
+  .personNolayer p {
+    height: 28px;
+    line-height: 28px;
+    padding-left: 15px;
+  }
+
+  .personNolayer p > span {
+    font-size: 12px;
+    color: #333;
+    margin-right: 25px;
+  }
+
+  .personNolayer table {
+    padding: 10px 0 0 20px;
+    width: 100%;
+    background-color: #ededed;
+    border-collapse: collapse;
+    border: 1px solid #d2d2d2;
+    font-size: 12px;
+  }
+
+  .personNolayer table th {
+    background-color: #ededed;
+    height: 34px;
+    text-indent: 15px;
+  }
+
+  .personNolayer table td {
+    background-color: #ffffff;
+    padding: 9px 15px;
+    color: #333333;
+    border: 1px solid #d2d2d2;
+  }
+
+  .personNolayer table ._color_666 {
+    color: #666666;
+  }
+
+  .personNolayer table tr._color_666 th {
+    padding: 9px 15px;
+  }
+  
   .enrollTotalSearch {
     width: 100%;
     min-height: auto;

src/components/ShoppingStore/ShoppingStore.vue

@@ -387,6 +387,9 @@
   display: block;
 }
 .shoppingStore .combottomDiv{height:400px;}
+.IsConflict td{
+  background-color:pink!important;
+}
 /* 购物店 */
 </style>
 <template>
@@ -593,7 +596,7 @@
               <th>币种</th>
               <th>操作</th>
             </tr>
-            <tr v-for="(item,index) in importData" :key="item.subCode">
+            <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>
               </td>

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -710,6 +710,47 @@ export default {
 </script>
 
 <style>
+  .personNolayer p {
+    height: 28px;
+    line-height: 28px;
+    padding-left: 15px;
+  }
+
+  .personNolayer p > span {
+    font-size: 12px;
+    color: #333;
+    margin-right: 25px;
+  }
+
+  .personNolayer table {
+    padding: 10px 0 0 20px;
+    width: 100%;
+    background-color: #ededed;
+    border-collapse: collapse;
+    border: 1px solid #d2d2d2;
+    font-size: 12px;
+  }
+
+  .personNolayer table th {
+    background-color: #ededed;
+    height: 34px;
+    text-indent: 15px;
+  }
+
+  .personNolayer table td {
+    background-color: #ffffff;
+    padding: 9px 15px;
+    color: #333333;
+    border: 1px solid #d2d2d2;
+  }
+
+  .personNolayer table ._color_666 {
+    color: #666666;
+  }
+
+  .personNolayer table tr._color_666 th {
+    padding: 9px 15px;
+  }
 .enrollTotalSearch {
   width: 100%;
   min-height: auto;