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

src/components/SalesModule/SalesFinancialDetail.vue

@@ -302,6 +302,7 @@ export default {
         Sort: '2',
         EmployeeId: '',
         IsNotCancelFinance: 1,
+        IsSellOrderForm:1
       },
       GetFinancLogList: [],
       LogLoading: true,

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -57,7 +57,7 @@
           <th width="80">返佣总计</th>
           <th width="80">汇率</th>
           <th width="80">凭证</th>
-          <th width="80">财务单据</th>
+          <th width="80" style="display:none;">财务单据</th>
           <th width="80">操作</th>
         </tr>
         <tr v-if="list.length==0">
@@ -154,8 +154,8 @@
                     v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </div>
               </td>
-              <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
-                <template v-for="subItem in item.CommonReport.PriceShopList">
+              <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0' style="display:none;">
+                <template v-for="subItem in item.CommonReport.PriceShopList" >
                   <div>
                     <!--subItem.ShopDetailsList-->
                     <p style="cursor: pointer;color:blue;" @click="CreateBill(subItem.ShopDetailsList,outItem.StaticsReportList)">生成单据</p>