Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/advance-packingList/adPaList-clothes.vue

@@ -151,9 +151,9 @@
     <a-card :bordered="false" style="margin:10px 0">
       <div class="table-operator">
         <a-button type="primary" @click="addAdpacking" icon="plus">新增</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls1('预装箱单-成衣','0')">预装箱单列表导出</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls1('预装箱单-列表','0')">预装箱单列表导出</a-button>
         <a-button type="primary" icon="download" @click="handleExportXls('预装箱单-成衣','1')">预装箱单成衣导出-装箱单</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls2('预装箱单列表')">预装箱单成衣导出</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls2('预装箱单成衣')">预装箱单成衣导出</a-button>
         <a-upload productName="file" :showUploadList="false"  :multiple="false"  :headers="tokenHeader"  :action="importExcelUrl"   @change="handleImportExcel" :customRequest="uploadFlie">
           <a-button type="primary" icon="import">导入-来源出运明细</a-button>
         </a-upload>

src/views/cost-allocation-total/costDetailDrawer.vue

@@ -261,7 +261,7 @@
 
     <!--tabs 组件引入  -->
     <a-card :bordered="true" style=" marginTop:10px;">
-      <div><tabs ref="unitTabs" :showSelect='showSelect'  @number="number" :showAll="showAll"/></div>
+      <div><tabs ref="unitTabs" :showSelect='showSelect'  @number="number" :showAll="showAll" @FabInQua="FabInQua"/></div>
     </a-card>
 
     <!-- 事故单 -->

src/views/cost-allocation-total/modal/fabRemQuaModal.vue

@@ -7,6 +7,7 @@
     width="86%"
     style="top:330px;left:100px;"
     :footer="null"
+    @cancel='cancel'
   >
     <!-- tabel 加载 -->
     <a-spin :spinning="confirmLoading">