From 7bb888c439e16b656286124ae2c84583f3308899 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 01 十二月 2023 13:57:20 +0800
Subject: [PATCH] 出入库明细打印-跳转新窗口
---
src/views/overview/AddOverviewDialog.vue | 388 +++++++++++++++++++++---------------------------------
src/router/index.js | 6
src/views/overview/previewExcel.vue | 15 -
3 files changed, 163 insertions(+), 246 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index dffb3c5..36f7228 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,6 +119,12 @@
// document.title = to.meta.title
}
})
+router.beforeEach((to, from, next) => {
+ if(from.name==="overview"){
+ localStorage.removeItem('pdfParams');
+ }
+ next();
+});
// router.beforeEach((to, from, next) => {
// must call `next`
// console.log(to, from)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index a9180cc..a97b037 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -1,11 +1,7 @@
<template>
<div class="add-common">
- <el-dialog
- :title="editCommonConfig.title + '閲囪喘鍏ュ簱'"
- :visible.sync="editConfig.visible"
- :width="dialogWidth"
- :before-close="handleClose"
- >
+ <el-dialog :title="editCommonConfig.title + '閲囪喘鍏ュ簱'" :visible.sync="editConfig.visible" :width="dialogWidth"
+ :before-close="handleClose">
<!-- 澶� -->
<div slot="title" class="dialog-header">
<span>{{ editCommonConfig.title === "鏌ョ湅" ? editCommonConfig.title : editCommonConfig.title + addName }}</span>
@@ -18,31 +14,18 @@
<i class="el-icon-s-tools"></i>
<span>鍔ㄤ綔</span>
</span>
- <el-button v-if="showEdit" :disabled="this.editConfig.infomation.status===5" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
+ <el-button v-if="showEdit" :disabled="this.editConfig.infomation.status === 5" plain size="mini"
+ style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
</div>
</div>
<!-- 鍐呭 -->
- <el-form
- ref="form"
- :model="editConfig.infomation"
- :rules="rules"
- label-position="right"
- label-width="120px"
- size="mini"
- >
+ <el-form ref="form" :model="editConfig.infomation" :rules="rules" label-position="right" label-width="120px"
+ size="mini">
<div>
<!-- <div>aaa</div> -->
- <StatusCommonView
- :showButton="showButton"
- :isValidateClick="isValidateClick"
- :isDelClick="isDelClick"
- :isCancel="isCancel"
- :list="list"
- :showCancel="showCancel"
- @delClick="delClick"
- @validateClick="validateClick"
- @btnCancel="btnCancel"
- />
+ <StatusCommonView :showButton="showButton" :isValidateClick="isValidateClick" :isDelClick="isDelClick"
+ :isCancel="isCancel" :list="list" :showCancel="showCancel" @delClick="delClick" @validateClick="validateClick"
+ @btnCancel="btnCancel" />
</div>
<div class="basic-info">
<div class="basic-info-view">
@@ -50,59 +33,26 @@
<el-col :span="12">
<el-form-item prop="companyName">
<span slot="label">{{ workType === 1 ? "渚涘簲鍟�" : workType === 2 ? "瀹㈡埛" : "鑱旂郴浜�" }}</span>
-
- <el-select
- v-if="workType === 1"
- v-model="editConfig.infomation.companyName"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- @change="companyChange"
- >
- <el-option
- v-for="item in supplierOptions"
- :key="item.SupplierId"
- :label="item.SupplierName"
- :value="{ value: item.SupplierId, label: item.SupplierName }"
- >
+
+ <el-select v-if="workType === 1" v-model="editConfig.infomation.companyName" placeholder="璇烽�夋嫨"
+ size="mini" style="width: 90%" :disabled="!showFooter" @change="companyChange">
+ <el-option v-for="item in supplierOptions" :key="item.SupplierId" :label="item.SupplierName"
+ :value="{ value: item.SupplierId, label: item.SupplierName }">
</el-option>
</el-select>
- <el-select
- v-else-if="workType === 2"
- v-model="editConfig.infomation.companyName"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- @change="companyChange"
- >
- <el-option
- v-for="item in clientOptions"
- :key="item.ClientId"
- :label="item.ClientName"
- :value="{ value: item.ClientId, label: item.ClientName }"
- >
+ <el-select v-else-if="workType === 2" v-model="editConfig.infomation.companyName" placeholder="璇烽�夋嫨"
+ size="mini" style="width: 90%" :disabled="!showFooter" @change="companyChange">
+ <el-option v-for="item in clientOptions" :key="item.ClientId" :label="item.ClientName"
+ :value="{ value: item.ClientId, label: item.ClientName }">
</el-option>
</el-select>
- <el-select
- v-else
- v-model="editConfig.infomation.companyName"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- @change="companyChange"
- >
- <el-option
- v-for="item in companyOptions"
- :key="item.id"
- :label="item.name"
- :value="{ value: item.id, label: item.name }"
- >
+ <el-select v-else v-model="editConfig.infomation.companyName" placeholder="璇烽�夋嫨" size="mini"
+ style="width: 90%" :disabled="!showFooter" @change="companyChange">
+ <el-option v-for="item in companyOptions" :key="item.id" :label="item.name"
+ :value="{ value: item.id, label: item.name }">
</el-option>
</el-select>
-
+
</el-form-item>
</el-col>
<!-- <el-col :span="12">
@@ -135,26 +85,15 @@
</el-col> -->
<el-col :span="12">
<el-form-item label="鏃ユ湡" prop="operationDate">
- <el-date-picker
- v-model="editConfig.infomation.operationDate"
- value-format="yyyy-MM-dd"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- style="width: 90%"
- :disabled="!showFooter"
- >
+ <el-date-picker v-model="editConfig.infomation.operationDate" value-format="yyyy-MM-dd" type="date"
+ placeholder="閫夋嫨鏃ユ湡" style="width: 90%" :disabled="!showFooter">
</el-date-picker>
</el-form-item>
</el-col>
<el-col v-if="showOperationType" :span="12">
<el-form-item label="鍏ュ簱绫诲瀷" prop="operationTypeId">
- <el-select
- v-model="editConfig.infomation.operationTypeId"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- >
+ <el-select v-model="editConfig.infomation.operationTypeId" placeholder="璇烽�夋嫨" size="mini"
+ style="width: 90%" :disabled="!showFooter">
<el-option v-for="item in operationTypeOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -167,68 +106,34 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏉ユ簮鍗曟嵁" prop="sourceNumber">
- <el-input
- v-model="editConfig.infomation.sourceNumber"
- placeholder="渚嬪:PO0032"
- style="width: 90%"
- :disabled="!showFooter"
- ></el-input>
+ <el-input v-model="editConfig.infomation.sourceNumber" placeholder="渚嬪:PO0032" style="width: 90%"
+ :disabled="!showFooter"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="workType !== 1" label="婧愪綅缃�" prop="fromLocationId">
- <el-select
- v-model="editConfig.infomation.fromLocationId"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- >
- <el-option
- v-for="item in toLocationOptions"
- :key="item.id"
- :label="item.jointName"
- :value="item.id"
- >
+ <el-select v-model="editConfig.infomation.fromLocationId" placeholder="璇烽�夋嫨" size="mini"
+ style="width: 90%" :disabled="!showFooter">
+ <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="workType !== 2" label="浠撳簱浣嶇疆" prop="toLocationId">
- <el-select
- v-model="editConfig.infomation.toLocationId"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- >
- <el-option
- v-for="item in toLocationOptions"
- :key="item.id"
- :label="item.jointName"
- :value="item.id"
- >
+ <el-select v-model="editConfig.infomation.toLocationId" placeholder="璇烽�夋嫨" size="mini" style="width: 90%"
+ :disabled="!showFooter">
+ <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="璐熻矗浜�" prop="contacterName">
- <el-select
- v-model="editConfig.infomation.contacterName"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 90%"
- :disabled="!showFooter"
- @change="contacterChange"
- >
- <el-option
- v-for="item in memberOptions"
- :key="item.id"
- :label="item.name"
- :value="{ value: item.id, label: item.name }"
- >
+ <el-select v-model="editConfig.infomation.contacterName" placeholder="璇烽�夋嫨" size="mini"
+ style="width: 90%" :disabled="!showFooter" @change="contacterChange">
+ <el-option v-for="item in memberOptions" :key="item.id" :label="item.name"
+ :value="{ value: item.id, label: item.name }">
</el-option>
</el-select>
</el-form-item>
@@ -249,14 +154,8 @@
</el-col> -->
<el-col :span="24">
<el-form-item label="澶囨敞" prop="comment">
- <el-input
- v-model.trim="editConfig.infomation.comment"
- size="mini"
- type="textarea"
- style="width: 96%"
- :autosize="{ minRows: 3 }"
- :disabled="!showFooter"
- ></el-input>
+ <el-input v-model.trim="editConfig.infomation.comment" size="mini" type="textarea" style="width: 96%"
+ :autosize="{ minRows: 3 }" :disabled="!showFooter"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -265,16 +164,12 @@
<el-tabs v-model="activeName" type="card">
<!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> -->
<el-tab-pane label="浜у搧" name="first"> </el-tab-pane>
- <el-tab-pane label="鐗╂祦淇℃伅" name="two" v-if="this.workType===2"></el-tab-pane>
+ <el-tab-pane label="鐗╂祦淇℃伅" name="two" v-if="this.workType === 2"></el-tab-pane>
</el-tabs>
<!-- 鎿嶄綔 -->
<div v-if="activeName === 'first'">
- <CommonFormTableView
- :product-table-list="productTableList"
- :detail-enter="!showFooter"
- @inputContent="inputContent"
- @addProductClick="addProductClick('鎿嶄綔')"
- >
+ <CommonFormTableView :product-table-list="productTableList" :detail-enter="!showFooter"
+ @inputContent="inputContent" @addProductClick="addProductClick('鎿嶄綔')">
<template v-if="showFooter" slot="tableButton">
<el-table-column label="鎿嶄綔" width="60" fixed="right" align="center">
<template slot-scope="scope">
@@ -287,55 +182,52 @@
</CommonFormTableView>
</div>
<!-- 鐗╂祦淇℃伅 -->
- <div v-if="activeName==='two'&&this.workType===2">
- <el-form
- label-position="right"
- :model="shipmentsInfo"
- label-width="120px"
- size="mini"
- style="margin-top: 20px;"
- >
+ <div v-if="activeName === 'two' && this.workType === 2">
+ <el-form label-position="right" :model="shipmentsInfo" label-width="120px" size="mini"
+ style="margin-top: 20px;">
<el-col :span="12">
- <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"
- :label="item.name"
- :value="item.id">
+ <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" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="杩愬崟鍙�" >
- <el-input style="width: 90%;" :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="鏀惰揣浜�">
- <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverName"></el-input>
+ <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="鑱旂郴鐢佃瘽">
- <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverPhone"></el-input>
+ <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="鏀惰揣鍦板潃">
- <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverAddr"></el-input>
+ <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="閲嶉噺">
- <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input>
+ <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="鐗╂祦閲嶉噺">
- <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input>
+ <el-input style="width: 90%;" :disabled="!showFooter"
+ v-model="editConfig.infomation.logisticWeight"></el-input>
</el-form-item>
</el-col>
</el-form>
@@ -385,7 +277,7 @@
getLogisticCompanyList,
printReceipts
} from "@/api/overview/overview"
-import { getSupplierList,getCompanyList,getClientList } from "@/api/common/other"
+import { getSupplierList, getCompanyList, getClientList } from "@/api/common/other"
export default {
name: "AddOverviewDialog",
props: {
@@ -427,8 +319,8 @@
operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }]
},
companyOptions: [], // 鍏徃
- supplierOptions:[],//渚涘簲鍟�
- clientOptions:[],//瀹㈡埛
+ supplierOptions: [],//渚涘簲鍟�
+ clientOptions: [],//瀹㈡埛
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
toLocationOptions: [], // 婧愪綅缃� 浠撳簱浣嶇疆
showButton: true,
@@ -439,7 +331,7 @@
isNoProduct: true, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
- isCancel:false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑�
+ isCancel: false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑�
showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
currentState: "todo", // 褰撳墠鐘舵��
detailTableList: {},
@@ -453,16 +345,18 @@
isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
operationTypeOptions: [], // 鍏ュ簱绫诲瀷鍒楄〃
shipmentsInfo: {
- carrier:[],
- waybillNumber:'',
- weight:0,
- logisticWeight:0,
+ carrier: [],
+ waybillNumber: '',
+ weight: 0,
+ logisticWeight: 0,
},
- showCancel:false, // 鍙栨秷鏄惁鍙互鏄剧ず
- list:[],
+ showCancel: false, // 鍙栨秷鏄惁鍙互鏄剧ず
+ list: [],
+ pdfParams:{}
}
},
created() {
+ localStorage.removeItem('pdfParams');
this.getCompanyList()
this.setStatusList()
this.setTableForm()
@@ -476,18 +370,18 @@
this.getLogisticCompanyList()
},
methods: {
- setStatusList(){
- console.log(this.editConfig.infomation,"edit")
- if(this.editConfig.infomation.status===5){
- this.list=[
+ setStatusList() {
+ console.log(this.editConfig.infomation, "edit")
+ if (this.editConfig.infomation.status === 5) {
+ this.list = [
{ label: "鑽夌", status: "todo", value: 1 },
{ label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
{ label: "灏辩华", status: "todo", value: 3 },
{ label: "瀹屾垚", status: "todo", value: 4 },
{ label: "宸插彇娑�", status: "todo", value: 5 }
]
- }else{
- this.list=[
+ } else {
+ this.list = [
{ label: "鑽夌", status: "todo", value: 1 },
{ label: "姝ｅ湪绛夊緟", status: "todo", value: 2 },
{ label: "灏辩华", status: "todo", value: 3 },
@@ -497,28 +391,28 @@
},
// 鑾峰彇鍏徃鍒楄〃
async getCompanyList() {
- if(this.workType === 1){
+ if (this.workType === 1) {
await getSupplierList().then((res) => {
console.log(res)
if (res.code === 200) {
this.supplierOptions = res.data
}
})
- }else if(this.workType === 2){
+ } else if (this.workType === 2) {
await getClientList().then((res) => {
console.log(res)
if (res.code === 200) {
this.clientOptions = res.data
}
})
- }else{
+ } else {
await getCompanyList().then((res) => {
console.log(res)
if (res.code === 200) {
this.companyOptions = res.data
}
})
- }
+ }
},
// 鑾峰彇浠撳簱浣嶇疆鍒楄〃
async getLocationList() {
@@ -573,13 +467,13 @@
this.showFooter = false
if (this.editConfig.infomation.status === "瀹屾垚") {
this.isValidateClick = false
- }else if(this.editConfig.infomation.status === 3){
+ } else if (this.editConfig.infomation.status === 3) {
this.isValidateClick = true
- this.showCancel=true
- }else if(this.editConfig.infomation.status===5){
- this.isCancel=true
- this.isValidateClick=true
- }else{
+ this.showCancel = true
+ } else if (this.editConfig.infomation.status === 5) {
+ this.isCancel = true
+ this.isValidateClick = true
+ } else {
this.isValidateClick = true
}
} else if (this.editConfig.infomation.status === 4 || this.editConfig.infomation.status === "瀹屾垚") {
@@ -589,7 +483,7 @@
this.showFooter = false
this.isValidateClick = false
} else if (this.editConfig.infomation.status === 5) {
- this.isCancel=true
+ this.isCancel = true
this.showButton = true
this.showEdit = false
this.showFooter = false
@@ -600,7 +494,7 @@
this.showEdit = true
this.showFooter = false
this.isValidateClick = true
- this.showCancel=true
+ this.showCancel = true
}
if (this.editConfig.title === "鏂板缓") {
this.list[0].status = "active"
@@ -626,10 +520,10 @@
this.showFooter = true
this.setTableForm()
},
- async getLogisticCompanyList(){
+ async getLogisticCompanyList() {
await getLogisticCompanyList().then((res) => {
- if(res.code===200){
- this.shipmentsInfo.carrier=res.data
+ if (res.code === 200) {
+ this.shipmentsInfo.carrier = res.data
}
})
},
@@ -698,13 +592,13 @@
sourceNumber: data.sourceNumber || "",
status: 3,
toLocationId: data.toLocationId || 0,
- waybillNumber:data.waybillNumber||'',
- weight:data.weight||0,
- logisticWeight:data.logisticWeight||0,
- logisticCompanyId:data.logisticCompanyId,
- receiverAddr:data.receiverAddr||'',
- receiverName:data.receiverName||'',
- receiverPhone:data.receiverPhone||''
+ waybillNumber: data.waybillNumber || '',
+ weight: data.weight || 0,
+ logisticWeight: data.logisticWeight || 0,
+ logisticCompanyId: data.logisticCompanyId,
+ receiverAddr: data.receiverAddr || '',
+ receiverName: data.receiverName || '',
+ receiverPhone: data.receiverPhone || ''
}
return params
},
@@ -873,7 +767,7 @@
},
// 鍙栨秷
- btnCancel(){
+ btnCancel() {
this.$confirm('纭畾鍙栨秷鍚楋紵', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -888,35 +782,38 @@
}
})
this.list.map((item) => {
- if (item.label==="宸插彇娑�") {
+ if (item.label === "宸插彇娑�") {
item.status = "active"
} else {
item.status = "todo"
}
})
- }).catch(() => {
+ }).catch(() => {
});
},
//鎵撳嵃
- async btnPrint(){
- await printReceipts(this.editCommonConfig.infomation.id).then((res) => {
- console.log(res)
+ async btnPrint() {
+ localStorage.removeItem('pdfParams');
+ try {
+ let res = await printReceipts(this.editCommonConfig.infomation.id);
+ 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.$router.push({
- name:"previewExcel",
- params:{
- url:res.data,
- baseOperationType:this.editConfig.infomation.baseOperationType||undefined,
- cutAfterWidth:this.editConfig.infomation.baseOperationType===2 ? 50.8 : 53.3
- }
- })
+ console.log(this.editConfig.infomation.baseOperationType,"绫诲瀷")
+ let pdfParams = {
+ url: res.data,
+ baseOperationType: this.editConfig.infomation.baseOperationType || undefined,
+ cutAfterWidth: this.editConfig.infomation.baseOperationType === 2 ? 50.8 : 53.3
+ };
+ localStorage.setItem('pdfParams', JSON.stringify(pdfParams));
}
- })
+ } catch (error) {
+ console.error(error);
+ } finally {
+ var { href } = this.$router.resolve({
+ name: 'previewExcel',
+ });
+ window.open(href, '_blank');
+ }
}
}
}
@@ -929,20 +826,25 @@
align-items: center;
font-size: 14px;
color: #333;
+
.header_btns {
margin-left: auto;
margin-right: 60px;
+
.btn {
cursor: pointer;
}
- .btn:nth-of-type(2){
+
+ .btn:nth-of-type(2) {
cursor: no-drop;
}
}
}
+
.content-status {
display: flex;
}
+
.basic-info {
height: calc(100% - 80px);
overflow: auto;
@@ -955,34 +857,42 @@
// margin-top: 20px;
// }
}
+
.purchase-view {
display: flex;
+
.left {
width: 50%;
}
+
.right {
width: 50%;
}
}
+
.second-label {
margin-left: 20px;
border-bottom: 1px solid #d9d9d9;
margin-bottom: 10px;
}
+
::v-deep {
.el-dialog__headerbtn {
position: absolute;
top: 15px;
}
+
.el-button {
&:hover {
border: 1px solid #dcdfe6;
color: #333;
}
}
- .el-tabs--card > .el-tabs__header {
+
+ .el-tabs--card>.el-tabs__header {
border-bottom: none;
}
+
// .el-tabs__item.is-active {
// color: #333;
// background: #f1f3f8;
@@ -993,20 +903,24 @@
font-size: 13px;
background: #f3f3f3;
}
+
.el-tabs__header {
margin: 0 0 1px;
}
- .bottom{
- .el-form{
+
+ .bottom {
+ .el-form {
// border-top: 1px solid #EBEEF5;
}
- .el-form-item{
+
+ .el-form-item {
height: 28px;
+
.el-input {
- input{
+ input {
height: 28px;
}
- }
+ }
}
}
}
diff --git a/src/views/overview/previewExcel.vue b/src/views/overview/previewExcel.vue
index 4590fe9..e135c30 100644
--- a/src/views/overview/previewExcel.vue
+++ b/src/views/overview/previewExcel.vue
@@ -25,19 +25,16 @@
},
data() {
return {
- excel: '',//excel鏂囨。鍦板潃
- cutAfterWidth:this.$route.params.cutAfterWidth,//瑁佸壀鍚庤鍑忓幓鐨勫
- // cutAfterWidth:0,
+ excel:'',
+ cutAfterWidth:0,
croppedImage: null, // 鍥剧墖
};
},
computed: {
},
created() {
- console.log(this.$route.params.baseOperationType,"鐪嬬湅")
- if(this.$route.params.baseOperationType!=undefined){
- this.excel=this.$route.params.url
- }
+ this.excel=JSON.parse(localStorage.getItem('pdfParams', '[]')).url
+ this.cutAfterWidth=JSON.parse(localStorage.getItem('pdfParams', '[]')).cutAfterWidth
},
mounted() {
},
@@ -46,8 +43,8 @@
methods: {
rendered(){
console.log("娓叉煋瀹屾垚")
- if(this.$route.params.baseOperationType!=undefined){
- this.excel=this.$route.params.url
+ if(JSON.parse(localStorage.getItem('pdfParams', '[]')).url){
+ this.excel=JSON.parse(localStorage.getItem('pdfParams', '[]')).url
this.cropAndDownload()
}
},
--
Gitblit v1.8.0