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

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -268,10 +268,10 @@
                   <tr>
                     <td width="80" style="text-align:right;">{{$t('pub.pubRemark')}}：</td>
                     <td>
-                      <el-input type='textarea' rows="2" class='w120' v-model='subItem.Remarks'></el-input>
+                      <el-input type='textarea' rows="6" class='w120' v-model='subItem.Remarks'></el-input>
                     </td>
                   </tr>
-                  <tr>
+                  <tr style="display:none;">
                     <td width="80" style="text-align:right;">
                       {{$t('ground.canpeibz')}}：
                     </td>

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -35,13 +35,17 @@
             <el-input v-model='msg.TCNUM'></el-input>
           </span>
         </li>
-        <li><span><em>{{$t('sm.Date')}}</em>
+        <li><span><em>出团{{$t('sm.Date')}}</em>
             <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
             -
             <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
           </span>
         </li>
-        <li><span><em>导入日期</em>
+        <li>
+        
+          <span>  <el-tooltip class="item" effect="dark" content="导入购物佣金数据的日期（需要选择导入日期的起始时间才有效）" placement="top">
+            <em>导入日期</em>
+    </el-tooltip>
             <el-date-picker v-model='msg.CStartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
             -
             <el-date-picker v-model='msg.CEndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>