|
@@ -167,35 +167,7 @@
|
|
|
<!-- 打印 -->
|
|
|
<div id="print"></div>
|
|
|
<!-- 导出选择弹框 -->
|
|
|
- <a-modal
|
|
|
- v-model="exportShow"
|
|
|
- :footer="null"
|
|
|
- :maskClosable="false"
|
|
|
- centered
|
|
|
- title="导出excel"
|
|
|
- @cancel="exportShow=false"
|
|
|
- >
|
|
|
- <div style="line-height: 48px;padding: 0 30px;">
|
|
|
- <div>盘点单号:{{ basicInfoData&&basicInfoData.checkWarehouseNo }}</div>
|
|
|
- <div>盘点类型:{{ (basicInfoData&&basicInfoData.checkTypeDictValue) || '--' }}
|
|
|
- <span v-if="basicInfoData&&basicInfoData.checkType=='SELECT'">({{ (basicInfoData&&basicInfoData.warehouseFlagDictValue) || '--' }})</span>
|
|
|
- </div>
|
|
|
- <div>产品范围:
|
|
|
- <a-radio-group v-model="productScopeFlag">
|
|
|
- <a-radio :value="true">
|
|
|
- 所有盘点产品
|
|
|
- </a-radio>
|
|
|
- <a-radio :value="false">
|
|
|
- 有盈亏的产品
|
|
|
- </a-radio>
|
|
|
- </a-radio-group>
|
|
|
- </div>
|
|
|
- <div class="btn-cont" style="text-align: center;padding-top: 40px;">
|
|
|
- <a-button id="inventoryChecking-export-save" @click="exportShow=false">取消</a-button>
|
|
|
- <a-button type="primary" id="inventoryChecking-export-back" @click="handlePrint('export')" style="margin-left: 15px;">确定导出</a-button>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </a-modal>
|
|
|
+ <exportModal :openModal="exportShow" :itemData="basicInfoData" :nowType="nowType" @ok="handlePrint" @close="exportShow=false" />
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -204,11 +176,12 @@ import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import ProductType from '@/views/common/productType.js'
|
|
|
import printModal from './printModal.vue'
|
|
|
+import exportModal from './exportModal.vue'
|
|
|
import { hdPrint } from '@/libs/JGPrint.js'
|
|
|
import { checkWarehouseDetailList, checkWarehouseDetailCount, checkWarehouseInventory, checkWarehouseDetail, checkWarehouseDetailSave, checkWarehouseCheckZero, checkWarehouseWarehouse, checkWarehouseDetailExport, checkWarehouseDetailPrint } from '@/api/checkWarehouse'
|
|
|
export default {
|
|
|
name: 'MakeInventory',
|
|
|
- components: { STable, VSelect, ProductType, printModal },
|
|
|
+ components: { STable, VSelect, ProductType, printModal, exportModal },
|
|
|
mixins: [commonMixin],
|
|
|
props: {},
|
|
|
data () {
|
|
@@ -253,8 +226,7 @@ export default {
|
|
|
localDataSource: [],
|
|
|
openPrintModal: false,
|
|
|
nowType: null,
|
|
|
- printerType: 'NEEDLE', // 打印机类型
|
|
|
- productScopeFlag: true
|
|
|
+ printerType: 'NEEDLE' // 打印机类型
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -278,7 +250,6 @@ export default {
|
|
|
methods: {
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.productScopeFlag = true
|
|
|
this.queryParam.productName = ''
|
|
|
this.queryParam.productCode = ''
|
|
|
this.queryParam.warehouseSn = undefined
|
|
@@ -412,11 +383,11 @@ export default {
|
|
|
this.exportShow = true
|
|
|
},
|
|
|
// 打印导出
|
|
|
- handlePrint (type) {
|
|
|
+ handlePrint (type, data) {
|
|
|
if (type == 'export') {
|
|
|
this.exportShow = false
|
|
|
this.nowType = type
|
|
|
- this.handleOk()
|
|
|
+ this.handleOk(data)
|
|
|
} else {
|
|
|
this.nowType = type
|
|
|
this.openPrintModal = true
|
|
@@ -429,7 +400,7 @@ export default {
|
|
|
if (this.nowType == 'export') { // 导出
|
|
|
url = checkWarehouseDetailExport
|
|
|
type = 'export'
|
|
|
- params = { checkWarehouseSn: this.$route.params.sn, productScopeFlag: this.productScopeFlag }
|
|
|
+ params = { checkWarehouseSn: this.$route.params.sn, ...objs }
|
|
|
} else { // 打印
|
|
|
params = JSON.parse(JSON.stringify(objs))
|
|
|
params.printType = this.printerType
|