From 563c60ab9d465e275bf18b57fde7b51c4bc020da Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 29 十一月 2023 15:32:56 +0800
Subject: [PATCH] 出入库明细单打印功能调整，新引入三方库:html2Canvas,jsPdf,vue-office
---
src/views/overview/AddOverviewDialog.vue | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index ee5287f..50a1b04 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -288,10 +288,17 @@
</div>
<!-- 鐗╂祦淇℃伅 -->
<div v-if="activeName==='two'&&this.workType===2">
- <el-form label-position="left" label-width="80px" :model="shipmentsInfo">
+ <el-form
+ label-position="right"
+ :model="shipmentsInfo"
+ label-width="120px"
+ size="mini"
+ style="margin-top: 20px;"
+ >
<el-col :span="12">
- <el-form-item label="鎵胯繍鍟�" style="width: 80%;" >
- <el-select :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="璇烽�夋嫨" style="width: 100%;">
+ <el-form-item label="鎵胯繍鍟�" >
+ <el-select
+ size="mini" :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="璇烽�夋嫨" style="width: 90%;">
<el-option
v-for="item in shipmentsInfo.carrier"
:key="item.id"
@@ -302,33 +309,33 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="杩愬崟鍙�" style="width: 80%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
+ <el-form-item label="杩愬崟鍙�" >
+ <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏀惰揣浜�" style="width: 80%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverName"></el-input>
+ <el-form-item label="鏀惰揣浜�">
+ <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverName"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鑱旂郴鐢佃瘽" style="width: 80%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverPhone"></el-input>
+ <el-form-item label="鑱旂郴鐢佃瘽">
+ <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverPhone"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏀惰揣鍦板潃" style="width: 80%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.receiverAddr"></el-input>
+ <el-form-item label="鏀惰揣鍦板潃">
+ <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverAddr"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閲嶉噺" style="width: 80%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
+ <el-form-item label="閲嶉噺">
+ <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐗╂祦閲嶉噺" style="width: 80%;">
- <el-input :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
+ <el-form-item label="鐗╂祦閲嶉噺">
+ <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
</el-form-item>
</el-col>
</el-form>
@@ -895,11 +902,18 @@
await printReceipts(this.editCommonConfig.infomation.id).then((res) => {
console.log(res)
if (res.code === 200) {
- this.$message.success("鎵撳嵃鎴愬姛")
- const link = document.createElement('a');
- link.href = res.data;
- link.download = '鍑哄簱鍗�.xlsx';
- link.click();
+ // this.$message.success("鎵撳嵃鎴愬姛")
+ // const link = document.createElement('a');
+ // link.href = res.data;
+ // link.download = '鍑哄簱鍗�.xlsx';
+ // link.click();
+ this.$router.push({
+ name:"previewExcel",
+ params:{
+ url:res.data,
+ baseOperationType:this.editConfig.infomation.baseOperationType||undefined,
+ }
+ })
}
})
}
--
Gitblit v1.8.0