From 1f6ae254a4e41a70290f842ab0d5d3bc792c7af8 Mon Sep 17 00:00:00 2001
From: yang <1441163367@qq.com>
Date: 星期三, 02 十一月 2022 21:38:08 +0800
Subject: [PATCH] 修改问题11.2
---
src/api/News/pad.js | 11 ---
src/views/padSunmaryProcedure/word_mange/mangeGZ.vue | 20 +++---
src/views/padSunmaryProcedure/word_mange/mangeJD.vue | 56 +++++++++---------
src/views/padSunmaryProcedure/padFrom.vue | 3
src/views/padSunmaryProcedure/word_mange/mangeBL.vue | 11 ++-
src/api/News/word.js | 25 ++++++++
6 files changed, 74 insertions(+), 52 deletions(-)
diff --git a/src/api/News/pad.js b/src/api/News/pad.js
index 8475372..2bc371e 100644
--- a/src/api/News/pad.js
+++ b/src/api/News/pad.js
@@ -82,9 +82,8 @@
// 鏌ヨ甯傚満涓讳綋
export function getMarketList(query) {
return request({
- url: `/market/marketsubject/marketList`,
+ url: `/market/marketsubject/market/${query}`,
method: 'get',
- params:query
})
}
//鑾峰彇褰撳墠绗竴涓墽娉曚汉
@@ -95,10 +94,4 @@
params:query
})
}
-//鐢熸垚word鏂囦欢
-export function createword(id) {
- return request({
- url: `/process/inquiryquestion/createWord/${id}`,
- method: 'get',
- })
-}
+
diff --git a/src/api/News/word.js b/src/api/News/word.js
new file mode 100644
index 0000000..b830995
--- /dev/null
+++ b/src/api/News/word.js
@@ -0,0 +1,25 @@
+
+
+import request from '@/router/axios'
+
+//鐢熸垚绗斿綍word鏂囦欢
+export function blwo(id) {
+ return request({
+ url: `/process/inquiryquestion/createWord/${id}`,
+ method: 'get',
+ })
+}
+//鐢熸垚鏀规word鏂囦欢
+export function gzwo(id) {
+ return request({
+ url: `/process/ordercorrection/createWord/${id}`,
+ method: 'get',
+ })
+}
+//鐢熸垚鐜板満word鏂囦欢
+export function xcwo(id) {
+ return request({
+ url: `/process/nowpenaltydecision/createWord/${id}`,
+ method: 'get',
+ })
+}
diff --git a/src/views/padSunmaryProcedure/padFrom.vue b/src/views/padSunmaryProcedure/padFrom.vue
index 5bab3da..4c86cbc 100644
--- a/src/views/padSunmaryProcedure/padFrom.vue
+++ b/src/views/padSunmaryProcedure/padFrom.vue
@@ -173,7 +173,7 @@
}
},
created() {
- this.latlng = window.android.getAddress();
+ // this.latlng = window.android.getAddress();
this.init()
},
methods: {
@@ -283,6 +283,7 @@
}
if (names != "") {
this.form.hanlders = names.substring(0, names.length - 1);
+ console.log(this.form.hanlders,'this.form.hanlders')
}
},
onSubmit() {
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
index 1b0d3ce..836b98f 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
@@ -128,15 +128,16 @@
</el-form-item>
</el-form>
<div style="text-align: center">
- <el-button v-if="form.registerState=='0'||form.registerState==null" @click="dataFormSubmit('0')">淇濆瓨</el-button>
+ <el-button v-if="form.approvalState==null||form.approvalState=='2'" @click="dataFormSubmit('0')">淇濆瓨</el-button>
<el-button type="primary" @click="viewVord(form.id)">棰勮</el-button>
- <el-button v-if="form.registerState=='1'" type="success" @click="downloadWord(form.id)">涓嬭浇</el-button>
+ <el-button v-if="form.approvalState=='1'" type="success" @click="downloadWord(form.id)">涓嬭浇</el-button>
</div>
</el-main>
</template>
<script>
-import {createword, inquiry, inquiryquestion} from '../../../api/News/pad'
+import { inquiry, inquiryquestion} from '../../../api/News/pad'
+import {blwo} from "../../../api/News/word";
export default {
name: "mangeBL",
@@ -227,7 +228,7 @@
},
//鐐瑰嚮棰勮
viewVord(data) {
- createword(data).then(res => {
+ blwo(data).then(res => {
console.log(res.data.data, 'res.data.data')
// this.form.questionsAnswers[0].wen =res.data.data
this.arrays = res.data.data.split(',')[1]
@@ -236,7 +237,7 @@
},
//鐐瑰嚮涓嬭浇
downloadWord(data) {
- createword(data).then(res => {
+ blwo(data).then(res => {
// console.log(this.form.id)
this.arrays = res.data.data.split(',')[0]
window.android.toDownLoadWord(this.arrays)
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue b/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
index 81957d1..0cffe14 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
@@ -99,9 +99,9 @@
<el-form-item label="鏀规鏃堕棿">
<el-date-picker
v-model="form.correctTime"
- type="date"
+ type="datetime"
style="width: 100%!important;"
- :value-format="`yyyy-MM-dd`"
+ :value-format="`yyyy-MM-dd HH:mm:ss`"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
@@ -120,16 +120,17 @@
</el-row>
</el-form>
<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 v-if="form.approvalState==null||form.approvalState=='2'" @click="dataFormSubmit('0')">淇濆瓨</el-button>
+ <el-button type="primary" @click="viewVord(form.id)">棰勮</el-button>
+ <el-button v-if="form.approvalState=='1'" type="success" @click="downloadWord(form.id)">涓嬭浇</el-button>
</div>
</el-main>
</template>
<script>
-import {createword, ordercorrec, ordercorrection} from '../../../api/News/pad'
+import { ordercorrec, ordercorrection} from '../../../api/News/pad'
import {getLaw, getLawTiao, lawInfo} from '@/api/lawList/lawList';
+import {gzwo} from "../../../api/News/word";
export default {
@@ -180,8 +181,9 @@
//鐐瑰嚮棰勮
viewVord(data) {
// let wordData = this.transforData(data);
- createword(data).then(res => {
- console.log(res.data.data, 'res.data.data')
+ gzwo(data).then(res => {
+
+ // console.log(res.data.data, 'res.data.data')
// this.form.questionsAnswers[0].wen =res.data.data
this.arrays = res.data.data.split(',')[1]
window.android.toPreviewWord(this.arrays)
@@ -189,7 +191,7 @@
},
//鐐瑰嚮涓嬭浇
downloadWord(data){
- createword(data).then(res => {
+ gzwo(data).then(res => {
// console.log(this.form.id)
this.arrays = res.data.data.split(',')[0]
window.android.toDownLoadWord(this.arrays)
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
index 713490d..96b891e 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
@@ -116,21 +116,10 @@
</el-checkbox>
</el-checkbox-group>
</el-form-item>
-
- <el-form-item label="缂寸撼鏂瑰紡锛�">
- <el-checkbox-group v-model="form.fines">
- <el-checkbox label="1" name="fines">褰撳満鏀剁即;</el-checkbox>
- <el-checkbox label="2" name="fines" id="fakuan">
- <!-- <el-form-item label="缂寸撼閾惰鍚嶇О">
- <el-input v-model="form.bank" placeholder="璇疯緭鍏ョ即绾抽摱琛岀殑鍚嶇О" style="width: 100%!important;"></el-input>
- </el-form-item>
- <el-form-item label="璐﹀彿锛�">
- <el-input v-model="form.account" placeholder="璇疯緭鍏ヨ处鍙�" style="width: 100%!important;"></el-input>
- </el-form-item>
- <el-form-item label="璐﹀彿锛�">
- <el-input v-model="form.account" placeholder="璇疯緭鍏ヨ处鍙�" style="width: 100%!important;"></el-input>
- </el-form-item>-->
- <!-- <el-form-item label="鎴峰悕锛�">-->
+ <div @change="changenullTwo">
+ <el-form-item label="缂寸撼鏂瑰紡锛�">
+ <el-radio label="1" v-model="form.fines">褰撳満鏀剁即;</el-radio>
+ <el-radio label="2" v-model="form.fines">
<p style="margin-left: -100px!important;">
缂寸撼閾惰鍚嶇О锛�
<el-input v-model="form.bank" placeholder="璇疯緭鍏ョ即绾抽摱琛岀殑鍚嶇О" style="width: 80%!important;"></el-input>
@@ -149,10 +138,9 @@
鍦板潃锛�
<el-input v-model="form.place" placeholder="璇疯緭鍏ョ即绾冲湴鍧�" style="width: 100%!important;"></el-input>
</p>
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-
+ </el-radio>
+ </el-form-item>
+ </div>
<!-- <div class="box" style="margin-left: 85px;font-size: 18px;">
<span>濡備綘锛堝崟浣嶏級涓嶆湇鏈鏀垮缃氬喅瀹氾紝鍙互鑷敹鍒版湰鍐冲畾涔︿箣鏃ヨ捣60鏃ュ唴鍚�</span>
<el-input v-model="form.governmentName" placeholder="" style="width:260px!important;"></el-input>
@@ -179,16 +167,17 @@
</el-form>
<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 v-if="form.approvalState==null||form.approvalState=='2'" @click="dataFormSubmit('0')">淇濆瓨</el-button>
+ <el-button type="primary" @click="viewVord(form.id)">棰勮</el-button>
+ <el-button v-if="form.approvalState=='1'" type="success" @click="downloadWord(form.id)">涓嬭浇</el-button>
</div>
</el-main>
</template>
<script>
-import {createword, inquiry, nowpenaltydecision} from "../../../api/News/pad";
+import {nowpenalty, nowpenaltydecision} from "../../../api/News/pad";
import {getLaw, getLawTiao, lawInfo} from '@/api/lawList/lawList';
+import {xcwo} from "../../../api/News/word";
export default {
@@ -209,7 +198,7 @@
legalPerson: "",
legalPersonPhone: "",
punishments: [],
- fines: [],
+ fines: 1,
courtName: "",
governmentName: "",
accountName: "",
@@ -238,12 +227,23 @@
})
})
},
+ changenullTwo(val) {
+ if (this.form.fines == 1){
+ this.form.bank = "";
+ this.form.account = "";
+ this.form.accountName = "";
+ this.form.place = "";
+ }else {
+ this.form.bank = "閭斂鍌ㄨ搫閾惰宄板嘲鏀锛堝嘲宄扮熆鍖烘粡闃宠矾43鍙凤級"
+ }
+
+ },
//鐐瑰嚮淇濆瓨鏁版嵁
dataFormSubmit() {
/*this.form.startTime = this.value1[0]
this.form.endTime = this.value1[1]*/
- //this.form.registerId = this.id
- inquiry(this.form).then(res => {
+ this.form.registerId = this.id
+ nowpenalty(this.form).then(res => {
if (res.data.code == 0) {
this.$message.success("淇濆瓨鎴愬姛");
}
@@ -252,7 +252,7 @@
//鐐瑰嚮棰勮
viewVord(data) {
// let wordData = this.transforData(data);
- createword(data).then(res => {
+ xcwo(data).then(res => {
console.log(res.data.data, 'res.data.data')
// this.form.questionsAnswers[0].wen =res.data.data
this.arrays = res.data.data.split(',')[1]
@@ -261,7 +261,7 @@
},
//鐐瑰嚮涓嬭浇
downloadWord(data) {
- createword(data).then(res => {
+ xcwo(data).then(res => {
// console.log(this.form.id)
this.arrays = res.data.data.split(',')[0]
window.android.toDownLoadWord(this.arrays)
--
Gitblit v1.9.1