From d8896d6d303d466e613aee1c53d9603edacf0aeb Mon Sep 17 00:00:00 2001
From: yang <1441163367@qq.com>
Date: 星期三, 26 十月 2022 11:29:10 +0800
Subject: [PATCH] 解决
---
src/views/padSunmaryProcedure/word_mange/mangeGZ.vue | 6 ++-
src/views/padSunmaryProcedure/word_mange/mangeJD.vue | 9 +++-
src/views/padSunmaryProcedure/padWord.vue | 13 +++---
src/views/padSunmaryProcedure/word_mange/mangeBL.vue | 22 +++++-----
src/views/padSunmaryProcedure/word-view.vue | 7 ++-
src/views/padSunmaryProcedure/index.vue | 4 +-
6 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/src/views/padSunmaryProcedure/index.vue b/src/views/padSunmaryProcedure/index.vue
index 4a8b574..f6b6b0a 100644
--- a/src/views/padSunmaryProcedure/index.vue
+++ b/src/views/padSunmaryProcedure/index.vue
@@ -109,8 +109,8 @@
},
//鐐瑰嚮鐐硅烦杞煡鐪�
rowget(row,column) {
- console.log(row,'row===')
- console.log(column,'column===')
+ /*console.log(row,'row===')
+ console.log(column,'column===')*/
// this.$router.push({name: 'process_manage', params: {name: id}})
this.$router.push({
path: '/padWord',
diff --git a/src/views/padSunmaryProcedure/padWord.vue b/src/views/padSunmaryProcedure/padWord.vue
index 86e0ca4..39ad152 100644
--- a/src/views/padSunmaryProcedure/padWord.vue
+++ b/src/views/padSunmaryProcedure/padWord.vue
@@ -3,19 +3,18 @@
<div id="navs">
<el-button icon="el-icon-arrow-left" @click="goHome">杩斿洖</el-button>
<div>{{ name1 }}</div>
- <p>{{id}}</p>
<el-button icon="el-icon-upload el-icon--right" @click="submit">鎻愪氦</el-button>
</div>
<el-tabs type="border-card" style="margin-top: 10px!important;" v-model="activeName" @tab-click="handleClick"
:stretch="true">
<el-tab-pane label="璋冩煡璇㈤棶绗斿綍" name="first">
- <BiLu v-if="activeName == 'first'" :id="id"></BiLu>
+ <BiLu v-if="id" :id="id"></BiLu>
</el-tab-pane>
<el-tab-pane label="璐ｄ护闄愭湡鏀规閫氱煡涔�" name="second">
- <GaiZheng v-if="activeName == 'second'" :id="id"></GaiZheng>
+ <GaiZheng v-if="id" :id="id"></GaiZheng>
</el-tab-pane>
<el-tab-pane label="澶勭綒鍐冲畾涔�" name="third">
- <JueDingShu v-if="activeName == 'third'" :id="id"></JueDingShu>
+ <JueDingShu v-if="id" :id="id"></JueDingShu>
</el-tab-pane>
</el-tabs>
</div>
@@ -41,7 +40,7 @@
id:''
},
name1: "",
- activeName: 'second'
+ activeName: 'first'
}
},
created() {
@@ -60,9 +59,9 @@
})
},
submit() {
- /*submitcase(this.id).then(res => {
+ submitcase(this.id).then(res => {
this.goHome()
- })*/
+ })
},
/*goToBL() {
this.$router.push({
diff --git a/src/views/padSunmaryProcedure/word-view.vue b/src/views/padSunmaryProcedure/word-view.vue
index 7fd52d1..27018b9 100644
--- a/src/views/padSunmaryProcedure/word-view.vue
+++ b/src/views/padSunmaryProcedure/word-view.vue
@@ -17,7 +17,7 @@
};
},
created() {
- console.log(this.$route,'this.$route======')
+ console.log(this.$route.query,'this.$route======')
if (this.$route.query) {
if(this.$route.query.wordData){
// this.dataForm = this.$route.query.wordData
@@ -27,7 +27,10 @@
}else {
// this.dataForm = this.$route.query.dawordData
this.$nextTick(() => {
- exportDoc(this.$route.query.wordData, this.$route.query.src,this.$refs.word)
+ exportDoc(this.$route.query.wordData, this.$route.query.src,this.$route.query.name);
+ this.$router.push({
+ path: '/pad',
+ })
})
}
}
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
index ebf2780..ed37e75 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
@@ -1,7 +1,6 @@
<template>
<el-main style="width: 100%;font-size: 18px;">
<el-form ref="form" :model="form" label-width="85px" size="24">
- <h1>{{id}}</h1>
<el-form-item label="妗堢敱">
<el-input v-model="form.causePoint" placeholder="璇峰～鍐欐鐢�"></el-input>
</el-form-item>
@@ -10,7 +9,7 @@
style="width: 100%"
v-model="value1"
type="datetimerange"
- value-format="`yyyy-MM-dd HH:mm:ss`"
+ :value-format="`yyyy-MM-dd HH:mm:ss`"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -132,7 +131,7 @@
<div style="text-align: center">
<el-button v-if="form.registerState=='0'||form.registerState==null" @click="dataFormSubmit('0')">淇濆瓨</el-button>
<el-button type="primary" @click="viewVord(form)">棰勮</el-button>
- <el-button v-if="form.registerState=='1'" type="success" @click="downloadWord(form)">涓嬭浇</el-button>
+ <el-button type="success" @click="downloadWord(form)">涓嬭浇</el-button>
</div>
</el-main>
</template>
@@ -180,18 +179,17 @@
window.getFingerUrl =this.getFingerUrl;
// this.getSignUrl();
},
- mounted() {
+ /*mounted() {
console.log(this.id,'id=================')
- },
+ },*/
methods: {
getDataList() {
-
this.$nextTick(()=>{
- console.log(this.id,'this.id')
+ // console.log(this.id,'this.id')
inquiryquestion(this.id).then(res => {
this.form = res.data.data
- /*this.value1.push(res.data.data.startTime)
- this.value1.push(res.data.data.endTime)*/
+ this.value1.push(res.data.data.startTime)
+ this.value1.push(res.data.data.endTime)
})
})
@@ -234,7 +232,8 @@
path: '/WordYulan',
query: {
wordData: data,
- src:'/wordes/inquiryCause.docx'
+ src:'/wordes/inquiryCause.docx',
+ name:'璋冩煡璇㈤棶绗斿綍',
}
})
},
@@ -244,7 +243,8 @@
path: '/WordYulan',
query: {
downWordData: data,
- src:'/wordes/inquiryCause.docx'
+ src:'/wordes/inquiryCause.docx',
+ name:'璋冩煡璇㈤棶绗斿綍',
}
})
// WordView.methods.exportDoc(wordData, "/wordes/inquiryCause.docx", "璋冩煡璇㈤棶绗斿綍.docx")
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue b/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
index 0bb2916..0d5fb8f 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
@@ -162,7 +162,8 @@
path: '/WordYulan',
query: {
wordData: data,
- src:'/wordes/correctionNotice.docx'
+ src:'/wordes/correctionNotice.docx',
+ name:'璐ｄ护闄愭湡鏀规閫氱煡涔�',
}
})
},
@@ -172,7 +173,8 @@
path: '/WordYulan',
query: {
downWordData: data,
- src:'/wordes/correctionNotice.docx'
+ src:'/wordes/correctionNotice.docx',
+ name:'璐ｄ护闄愭湡鏀规閫氱煡涔�',
}
})
// WordView.methods.exportDoc(wordData, "/wordes/inquiryCause.docx", "璋冩煡璇㈤棶绗斿綍.docx")
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
index 6e26e11..25b8d79 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
@@ -165,17 +165,20 @@
path: '/WordYulan',
query: {
wordData: data,
- src:'/wordes/penaltyDecision.docx'
+ src: '/wordes/penaltyDecision.docx',
+ name: '澶勭綒鍐冲畾涔�',
}
})
},
//鐐瑰嚮涓嬭浇
- downloadWord(data){
+ downloadWord(data) {
this.$router.push({
path: '/WordYulan',
query: {
+ id:this.id,
downWordData: data,
- src:'/wordes/penaltyDecision.docx'
+ src: '/wordes/penaltyDecision.docx',
+ name: '澶勭綒鍐冲畾涔�',
}
})
// WordView.methods.exportDoc(wordData, "/wordes/inquiryCause.docx", "璋冩煡璇㈤棶绗斿綍.docx")
--
Gitblit v1.9.1