|
@@ -419,7 +419,7 @@
|
|
<el-button type="primary" @click="submitDialogForm">确 定</el-button>
|
|
<el-button type="primary" @click="submitDialogForm">确 定</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
- <print-preview ref="preView" :add-print="addPrint" @initPrint="handleInitPrint" @refreshList="handleRefreshList" :getNewDetailPrintDisString="getNewDetailPrintDisString"/>
|
|
|
|
|
|
+ <print-preview ref="preView" :add-print="addPrint" :get-oval-dateil="getOvalDateil" :get-new-detail-print-dis-string="getNewDetailPrintDisString" @initPrint="handleInitPrint" @refreshList="handleRefreshList" />
|
|
|
|
|
|
<!-- <PickupPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" /> -->
|
|
<!-- <PickupPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" /> -->
|
|
</div>
|
|
</div>
|
|
@@ -745,7 +745,7 @@ export default {
|
|
|
|
|
|
// 点击打印
|
|
// 点击打印
|
|
async toPrint() {
|
|
async toPrint() {
|
|
- const { data } = this.getNewDetailPrintDisString()
|
|
|
|
|
|
+ const { data } = await this.getNewDetailPrintDisString()
|
|
if (data) {
|
|
if (data) {
|
|
this.$confirm(<p class='text'>{data}</p>, '提示', {
|
|
this.$confirm(<p class='text'>{data}</p>, '提示', {
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
@@ -759,13 +759,16 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
- this.getDateil(this.tableSelection, 'getDtailPrintDis', this.check).then(res => {
|
|
|
|
- this.tableSelection = []
|
|
|
|
- this.$endLoading()
|
|
|
|
- this.$refs.preView.show(this.hiprintTemplate, this.outputData)
|
|
|
|
- })
|
|
|
|
|
|
+ this.getOvalDateil()
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ getOvalDateil() {
|
|
|
|
+ this.getDateil(this.tableSelection, 'getDtailPrintDis', this.check).then(res => {
|
|
|
|
+ this.tableSelection = []
|
|
|
|
+ this.$endLoading()
|
|
|
|
+ this.$refs.preView.show(this.hiprintTemplate, this.outputData)
|
|
|
|
+ })
|
|
|
|
+ },
|
|
async getNewDetailPrintDisString() {
|
|
async getNewDetailPrintDisString() {
|
|
const params = []
|
|
const params = []
|
|
const len = this.tableSelection.length
|
|
const len = this.tableSelection.length
|