From ddad19338c649987dbbf24a4c04fffd74f3eaef3 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 04 七月 2023 15:26:32 +0800
Subject: [PATCH] 修改前端页面
---
src/components/page/ticket/index.vue | 15 ++--
src/components/page/street/index.vue | 2
src/components/page/ticket/ticket-form2.vue | 29 +++------
public/words/administratorReturn.docx | 0
src/components/page/ticket/ticket-form.vue | 105 ++++++++++++++++++++---------------
public/words/administrativeDecisionLetter.docx | 0
6 files changed, 79 insertions(+), 72 deletions(-)
diff --git a/public/words/administrativeDecisionLetter.docx b/public/words/administrativeDecisionLetter.docx
index c13cdd7..5cb1782 100644
--- a/public/words/administrativeDecisionLetter.docx
+++ b/public/words/administrativeDecisionLetter.docx
Binary files differ
diff --git a/public/words/administratorReturn.docx b/public/words/administratorReturn.docx
index 1ef5fb2..44ee883 100644
--- a/public/words/administratorReturn.docx
+++ b/public/words/administratorReturn.docx
Binary files differ
diff --git a/src/components/page/street/index.vue b/src/components/page/street/index.vue
index b32f60a..4f2c648 100644
--- a/src/components/page/street/index.vue
+++ b/src/components/page/street/index.vue
@@ -152,7 +152,7 @@
},
loadSelect(){
this.$byutil.getData(this, this.$systemconfig.basePath + '/ffzf/street/findList', {}, res => {
- this.select3 = res.data.list2
+ this.select3 = res.data
})
},
streetEdit(id){
diff --git a/src/components/page/ticket/index.vue b/src/components/page/ticket/index.vue
index 6e54bd2..283cc32 100644
--- a/src/components/page/ticket/index.vue
+++ b/src/components/page/ticket/index.vue
@@ -60,18 +60,17 @@
</template>
</el-table-column>
<el-table-column
+ prop="createTime"
+ header-align="center"
+ align="center"
+ label="澶勭綒鏃堕棿">
+ </el-table-column>
+ <el-table-column
prop="carType"
width="90px"
header-align="center"
align="center"
label="杞﹁締绫诲瀷">
- </el-table-column>
- <el-table-column
- prop="color"
- width="90px"
- header-align="center"
- align="center"
- label="杞﹁締棰滆壊">
</el-table-column>
<el-table-column
prop="address"
@@ -86,7 +85,6 @@
align="center"
label="搴旂即閲戦">
</el-table-column>
-
<el-table-column
prop="payStatus"
width="100px"
@@ -242,6 +240,7 @@
this.$nextTick(() => {
this.$refs.addOrUpdate2.init(row.id)
})
+
}else {
this.$message.error("澶勫喅涔﹁繕鏈～鍐欙紒")
}
diff --git a/src/components/page/ticket/ticket-form.vue b/src/components/page/ticket/ticket-form.vue
index aa53e5c..888807d 100644
--- a/src/components/page/ticket/ticket-form.vue
+++ b/src/components/page/ticket/ticket-form.vue
@@ -9,24 +9,24 @@
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
label-width="140px">
<el-row>
- <el-col :span="12">
- <el-form-item label="骞翠唤">
- <el-date-picker
- style="width: 100%"
- v-model="dataForm.year"
- value-format="yyyy"
- type="year"
- placeholder="閫夋嫨骞�">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏂囦功鍙�">
- <el-input v-model="dataForm.number"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="骞翠唤">-->
+<!-- <el-date-picker-->
+<!-- style="width: 100%"-->
+<!-- v-model="dataForm.year"-->
+<!-- value-format="yyyy"-->
+<!-- type="year"-->
+<!-- placeholder="閫夋嫨骞�">-->
+<!-- </el-date-picker>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鏂囦功鍙�">-->
+<!-- <el-input v-model="dataForm.number"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row>-->
<!--<el-col :span="12">
<el-form-item label="鍐冲畾涔﹀彿">
<el-input
@@ -60,34 +60,34 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="鎵ф硶浜哄憳" prop="zfName1">
- <el-input v-model="dataForm.zfName1" placeholder="璇疯緭鍏ヨ处鍙�"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎵ф硶璇佸彿" prop="zfNum1">
- <el-input v-model="dataForm.zfNum1" placeholder="璇疯緭鍏ユ埛鍚�"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="鎵ф硶浜哄憳" prop="zfName2">
- <el-input v-model="dataForm.zfName2" placeholder="璇疯緭鍏ヨ处鍙�"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎵ф硶璇佸彿" prop="zfNum2">
- <el-input v-model="dataForm.zfNum2" placeholder="璇疯緭鍏ユ埛鍚�"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
+<!-- <el-row>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鎵ф硶浜哄憳" prop="zfName1">-->
+<!-- <el-input v-model="dataForm.zfName1" placeholder="璇疯緭鍏ヨ处鍙�"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鎵ф硶璇佸彿" prop="zfNum1">-->
+<!-- <el-input v-model="dataForm.zfNum1" placeholder="璇疯緭鍏ユ埛鍚�"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鎵ф硶浜哄憳" prop="zfName2">-->
+<!-- <el-input v-model="dataForm.zfName2" placeholder="璇疯緭鍏ヨ处鍙�"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鎵ф硶璇佸彿" prop="zfNum2">-->
+<!-- <el-input v-model="dataForm.zfNum2" placeholder="璇疯緭鍏ユ埛鍚�"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="dataFormSubmit()" :loading="loadingSubmit">纭畾</el-button>
+ <el-button type="primary" @click="dataFormSubmit()" :loading="loadingSubmit">淇濆瓨</el-button>
<el-button type="primary" @click="viewVord(dataForm)">棰勮</el-button>
<el-button type="success" @click="downloadWord(dataForm)">涓嬭浇</el-button>
</span>
@@ -159,14 +159,21 @@
})
},
viewVord(data) { //word棰勮
+ if(this.dataForm.number === '' || this.dataForm.number === null){
+ this.$message.error("璇峰厛淇濆瓨鍐嶉瑙�")
+ }else {
this.WordViewShow = true
this.$nextTick(() => {
- this.$refs.WordView.initWord(data,'/words/administrativeDecisionLetter.docx')
+ this.$refs.WordView.initWord(data,'/words/administrativeDecisionLetter.docx')
})
+ }
},
downloadWord(data) { //word涓嬭浇
-
+ if(this.dataForm.number === '' || this.dataForm.number === null){
+ this.$message.error("璇峰厛淇濆瓨鍐嶄笅杞�")
+ }else {
exportDoc(data,'/words/administrativeDecisionLetter.docx','褰撳満琛屾斂澶勭綒鍐冲畾涔�')
+ }
},
// 琛ㄥ崟鎻愪氦
dataFormSubmit() {
@@ -206,6 +213,14 @@
}
</style>
<style lang="scss" scoped>
+::v-deep{
+
+ .el-dialog{
+ max-height: 90%;
+ overflow-y: auto;
+ margin-top: 6vh!important;
+ }
+}
.flexDate{
display: flex;
span{
diff --git a/src/components/page/ticket/ticket-form2.vue b/src/components/page/ticket/ticket-form2.vue
index 3529fb2..ced0579 100644
--- a/src/components/page/ticket/ticket-form2.vue
+++ b/src/components/page/ticket/ticket-form2.vue
@@ -1,40 +1,34 @@
<template>
<div>
<el-dialog
- :title="!dataForm.id ? '鏂板' : '瀹屽杽淇℃伅'"
+ :title="!dataForm.id ? '鏂板' : '鏌ョ湅淇℃伅'"
append-to-body
:close-on-click-modal="false"
:visible.sync="visible"
v-dialogDrag>
- <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+ <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
label-width="140px">
<el-row>
<el-col :span="12">
- <el-form-item label="骞翠唤">
- <el-date-picker
- style="width: 100%"
- v-model="dataForm.year"
- value-format="yyyy"
- type="year"
- placeholder="閫夋嫨骞�">
- </el-date-picker>
+ <el-form-item label="褰撲簨浜�" prop="personName">
+ <el-input disabled v-model="dataForm.personName" placeholder="璇疯緭鍏ュ綋浜嬩汉"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏂囦功鍙�">
- <el-input v-model="dataForm.number"></el-input>
+ <el-form-item label="韬唤璇佸彿鐮�" prop="idCard">
+ <el-input disabled v-model="dataForm.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙风爜"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="褰撲簨浜�" prop="personName">
- <el-input v-model="dataForm.personName" placeholder="璇疯緭鍏ュ綋浜嬩汉"></el-input>
+ <el-form-item label="閫佽揪鏃堕棿" prop="wordDate">
+ <el-input disabled v-model="dataForm.wordDate" placeholder="閫佽揪鏃堕棿"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="韬唤璇佸彿鐮�" prop="idCard">
- <el-input v-model="dataForm.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙风爜"></el-input>
+ <el-form-item label="閫佽揪鍦扮偣" prop="personAddress">
+ <el-input disabled v-model="dataForm.personAddress" placeholder="閫佽揪鍦扮偣"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -67,8 +61,7 @@
number:'',
personName:'',
idCard: '',
- chufaCheckList:[],
- fakuanCheckList:[],
+ wordDate:'',
personAddress:'',
zfName1:'',
zfName2:'',
--
Gitblit v1.9.1