diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue index f30ea55..c560947 100644 --- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue +++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue @@ -1,10 +1,10 @@ -<template> +、<template> <a-card :bordered="false" :class="'cust-erp-sub-tab'"> <!-- 操作按钮区域 --> <div class="table-operator" v-if="mainId"> <a-button v-has="'receiptDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button v-has="'receiptDetail:export'" type="primary" icon="download" @click="handleExportXls('入库单详情')">导出</a-button> - <a-button @click="batchPrint()" type="primary">打印</a-button> + <!-- <a-button @click="batchPrint()" type="primary">打印</a-button> --> <a-upload v-has="'receiptDetail:import'" name="file" @@ -49,8 +49,6 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - - <span slot="status_dictText" slot-scope="status_dictText"> <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)"> {{ status_dictText }} diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue index ee8e053..983157d 100644 --- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue +++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue @@ -97,11 +97,10 @@ <div class="table-operator"> <a-button v-has="'receiptHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button v-has="'receiptHeader:export'" type="primary" icon="download" @click="handleExportXls('入库表主表')">导出</a-button> - <a-upload v-has="'receiptHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" - @change="handleImportExcel"> + <a-upload v-has="'receiptHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-button type="primary" icon="import">导入</a-button> - <a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button> </a-upload> + <a-button v-has="'receiptHeader:print'" @click="batchPrint()" type="primary">打印</a-button> <j-super-query :fieldList="superFieldList" v-has="'receiptHeader:superQuery'" @handleSuperQuery="handleSuperQuery"/> </div>