Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-antd into demo_

src/views/preparation/report/PreparationsPosition.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :loading="loading" title="筹建统计报表">
+  <a-card :loading="loading" title="统计报表">
 
     <div class="salesCard">
       <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">

src/views/preparation/report/modules/Detail.vue

@@ -30,7 +30,7 @@ export default {
       preparationMap: {},
       columns: [
         {
-          title: '筹建名称',
+          title: '内容',
           checked: true,
           width: '150',
           dataIndex: 'name'

src/views/purchase/purchase-order-page/PurchaseOrderPage.vue

@@ -20,7 +20,7 @@
       </div>
 
       <div class="table-operator" style="margin-bottom: 8px;">
-        <a-button v-if="$auth('purchase-purchase-orders-add')" type="primary" icon="plus" @click="$refs.baseForm.base()">采购申请</a-button>
+        <a-button v-if="$auth('longyanpurchaseorder-menu-add')" type="primary" icon="plus" @click="$refs.baseForm.base()">采购申请</a-button>
         <!--        <a-button v-if="$auth('purchase-purchase-orders-add')" style="margin-left: 8px" type="primary" icon="plus" @click="$refs.addSpareForm.base()">新增物料</a-button>-->
         <!-- <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-orders-del')">
           <a-menu slot="overlay">