From 539d1ce6b955d5d56b21d97590a2a684c400f64a Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期三, 11 一月 2023 09:55:16 +0800
Subject: [PATCH] 细节调节
---
src/store/modules/user.js | 33 ++++++++
src/views/padSunmaryProcedure/word_mange/mangeGZ.vue | 12 ++-
src/views/padSunmaryProcedure/word_mange/mangeJD.vue | 12 +-
src/views/padSunmaryProcedure/padFrom.vue | 62 +++++++++------
src/views/padSunmaryProcedure/padWord.vue | 41 ++++++++-
src/views/padSunmaryProcedure/word_mange/mangeBL.vue | 52 +++++++++++-
6 files changed, 162 insertions(+), 50 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ab7a6bf..e0c2237 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -30,6 +30,15 @@
const user = {
state: {
+ isCanSubmit1: getStore({ //鐐瑰嚮淇濆瓨鎸夐挳鎵�璁板綍鐨勭姸鎬�(璋冩煡璇㈤棶绗斿綍)
+ name: 'isCanSubmit1',
+ }) || false,
+ isCanSubmit2: getStore({ //鐐瑰嚮淇濆瓨鎸夐挳鎵�璁板綍鐨勭姸鎬�(璐ｄ换闄愭湡鏀规閫氱煡涔�)
+ name: 'isCanSubmit2',
+ }) || false,
+ isCanSubmit3: getStore({ //鐐瑰嚮淇濆瓨鎸夐挳鎵�璁板綍鐨勭姸鎬�(澶勭綒鍐冲畾涔�)
+ name: 'isCanSubmit3',
+ }) || false,
id: getStore({
name: 'id'
}),
@@ -201,6 +210,30 @@
}
},
mutations: {
+ SET_IsCANSUBMIT1 :(state,isCanSubmit) => {
+ state.isCanSubmit1 = isCanSubmit
+ setStore({
+ name: 'isCanSubmit1',
+ content: state.isCanSubmit1,
+ type: 'session'
+ })
+ },
+ SET_IsCANSUBMIT2 :(state,isCanSubmit) => {
+ state.isCanSubmit2 = isCanSubmit
+ setStore({
+ name: 'isCanSubmit2',
+ content: state.isCanSubmit2,
+ type: 'session'
+ })
+ },
+ SET_IsCANSUBMIT3 :(state,isCanSubmit) => {
+ state.isCanSubmit3 = isCanSubmit
+ setStore({
+ name: 'isCanSubmit3',
+ content: state.isCanSubmit3,
+ type: 'session'
+ })
+ },
SET_ID: (state, id) => {
state.id = id
setStore({
diff --git a/src/views/padSunmaryProcedure/padFrom.vue b/src/views/padSunmaryProcedure/padFrom.vue
index e64501a..0f2e9b0 100644
--- a/src/views/padSunmaryProcedure/padFrom.vue
+++ b/src/views/padSunmaryProcedure/padFrom.vue
@@ -61,8 +61,8 @@
</el-form-item>
<el-form-item label="鍔炴浜哄憳"
- prop="hanlderIds">
- <el-select v-model="form.hanlderIds"
+ prop="hanlderName">
+ <el-select v-model="form.hanlderName"
clearable
filterable
multiple
@@ -120,7 +120,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary"
- @click="onSubmit">绔嬪嵆鍒涘缓</el-button>
+ @click="onSubmit('form')">绔嬪嵆鍒涘缓</el-button>
<el-button @click="backAll">鍙栨秷</el-button>
</el-form-item>
</el-form>
@@ -136,6 +136,7 @@
name: 'padFrom',
data() {
var validatePerson = (rule, value, callback) => {
+ console.log(value,'value===')
if (value.length != 2) {
callback(new Error('鍔炴浜哄憳蹇呴』閫夋嫨涓や綅'))
} else {
@@ -150,7 +151,8 @@
certNo: '',
phone: '',
address: '',
- hanlderIds: [],
+ hanlderIds: '',
+ hanlderName:[],
place: '',
category: '',
city: '',
@@ -190,9 +192,9 @@
{ required: true, message: '鎵嬫満鍙锋牸寮忎笉姝ｇ‘', trigger: 'blur' },
{ min: 11, message: '鎵嬫満鍙锋牸寮忎笉姝ｇ‘', trigger: 'blur' },
],
- hanlderIds: [
- { required: true, message: '鍔炴浜哄憳涓嶈兘涓虹┖', trigger: 'blur' },
- { validator: validatePerson, trigger: 'blue' },
+ hanlderName: [
+ { required: true, message: '鍔炴浜哄憳涓嶈兘涓虹┖', trigger: ['blur','change'] },
+ { validator: validatePerson, trigger: ['blur','change'] },
],
category: [
{
@@ -322,26 +324,36 @@
})
},
setPersonname(val) {
- let names = ''
- for (let i in this.organPersons) {
- if (val.indexOf(this.organPersons[i].userId) > -1) {
- names += this.organPersons[i].realName + ','
+ console.log(val,'val===')
+ // let names = ''
+ // for (let i in this.organPersons) {
+ // console.log(this.organPersons[i],'this.organPersons[i]')
+ // if (val.indexOf(this.organPersons[i].userId) > -1) {
+ // names += this.organPersons[i].realName + ','
+ // }
+ // }
+ // if (names != '') {
+ // this.form.hanlders = names.substring(0, names.length - 1)
+ // }
+ if(val.length) {
+ this.$set(this.form, 'hanlderIds', val.toString())
}
- }
- if (names != '') {
- this.form.hanlders = names.substring(0, names.length - 1)
- console.log(this.form.hanlders, 'this.form.hanlders')
- }
+
},
- onSubmit() {
- console.log(this.form.hanlderIds, 'this.form.hanlderIds')
- this.form.hanlderIds = this.form.hanlderIds.toString()
- if (this.form.hanlderIds.length < 1) {
- this.form.hanlders = ''
- }
- easycase(this.form).then((res) => {
- this.backAll()
- })
+ onSubmit(formName) {
+ console.log(this.form.hanlderIds,'this.form.hanlderIds====222')
+ this.$refs[formName].validate((valid) => {
+ if(valid) {
+ easycase(this.form).then((res) => {
+ if(res.data.code == 0) {
+ this.$message.success('娣诲姞鎴愬姛')
+ this.backAll()
+ }
+ })
+ }else {
+ return false
+ }
+ })
},
},
}
diff --git a/src/views/padSunmaryProcedure/padWord.vue b/src/views/padSunmaryProcedure/padWord.vue
index e76e486..876b22c 100644
--- a/src/views/padSunmaryProcedure/padWord.vue
+++ b/src/views/padSunmaryProcedure/padWord.vue
@@ -24,15 +24,15 @@
@tab-click="handleClick">
<el-tab-pane label="璋冩煡璇㈤棶绗斿綍"
name="first">
- <BiLu v-if="activeName == 'first'"></BiLu>
+ <BiLu v-if="activeName == 'first'" @isKeep1="isKeep1"></BiLu>
</el-tab-pane>
<el-tab-pane label="璐ｄ护闄愭湡鏀规閫氱煡涔�"
name="second">
- <GaiZheng v-if="activeName == 'second'">璐ｄ护闄愭湡鏀规閫氱煡涔�</GaiZheng>
+ <GaiZheng v-if="activeName == 'second'" @isKeep2="isKeep2">璐ｄ护闄愭湡鏀规閫氱煡涔�</GaiZheng>
</el-tab-pane>
<el-tab-pane label="澶勭綒鍐冲畾涔�"
name="third">
- <JueDingShu v-if="activeName == 'third'">澶勭綒鍐冲畾涔�</JueDingShu>
+ <JueDingShu v-if="activeName == 'third'" @isKeep3="isKeep3">澶勭綒鍐冲畾涔�</JueDingShu>
</el-tab-pane>
</el-tabs>
</div>
@@ -80,6 +80,16 @@
this.screenHeight = document.body.clientHeight
},
methods: {
+ isKeep1(val) {
+ //this.isSubmit = val
+ this.$store.commit('SET_IsCANSUBMIT1',val)
+ },
+ isKeep2(val) {
+ this.$store.commit('SET_IsCANSUBMIT2',val)
+ },
+ isKeep3(val) {
+ this.$store.commit('SET_IsCANSUBMIT3',val)
+ },
//杩斿洖妗堜欢鍒楄〃
goHome() {
this.$router.push({
@@ -93,9 +103,20 @@
},
//鎻愪氦锛堝幓瀹℃牳锛�
submit() {
- submitcase({ id: this.id }).then((res) => {
- this.goHome()
- })
+ if(this.$store.state.user.isCanSubmit1 && this.$store.state.user.isCanSubmit2 && this.$store.state.user.isCanSubmit3) {
+ submitcase({ id: this.id }).then((res) => {
+ return
+ console.log(res,'res-----')
+ if(res.data.code == 0) {
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.goHome()
+ }
+ })
+ }else {
+ this.$message.warning('璇峰厛淇濆瓨鍐嶆彁浜�')
+ return false
+ }
+
},
//鐐瑰嚮閫夐」鍗℃晥鏋�
handleClick(tab, event) {
@@ -106,8 +127,14 @@
</script>
<style lang="scss">
+ .el-message,.el-message--warning{
+ z-index: 99999!important;
+ }
+ .el-input.is-disabled .el-input__inner,.el-range-editor.is-disabled input{
+ color: #303133;
+ }
.tagsContainer {
- height: 95%;
+ height: 92%;
overflow: scroll;
.el-tabs {
.el-tabs__header {
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
index 49893c9..890863e 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
@@ -1,7 +1,9 @@
<template>
<!-- 璋冩煡璇㈤棶绗斿綍 -->
<el-main>
- <el-form ref="form"
+ <el-form
+ :disabled="form.registerState == '1'"
+ ref="form"
:model="form"
label-width="80px">
<el-form-item label="妗堢敱">
@@ -15,7 +17,9 @@
:value-format="`yyyy-MM-dd HH:mm:ss`"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ end-placeholder="缁撴潫鏃ユ湡"
+ :unlink-panels="false"
+ :picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item label="鍦板潃">
@@ -155,6 +159,13 @@
</el-form-item>
</div>
</el-form>
+ <div style="text-align: center;margin: 20px 0">
+ <el-button type="primary"
+ icon="el-icon-circle-plus"
+ @click="addEle">
+ <!-- <img src="../../../assets/lawImg/addIcon.png" alt="">-->
+ </el-button>
+ </div>
<div style="text-align: center">
<el-button v-if="form.approvalState==null||form.approvalState=='2'"
@click="dataFormSubmit('0')">淇濆瓨</el-button>
@@ -163,11 +174,6 @@
<el-button v-if="form.approvalState=='1'"
type="success"
@click="downloadWord(form.id)">涓嬭浇</el-button>
- <el-button type="primary"
- icon="el-icon-circle-plus"
- @click="addEle">
- <!-- <img src="../../../assets/lawImg/addIcon.png" alt="">-->
- </el-button>
</div>
</el-main>
</template>
@@ -179,6 +185,7 @@
export default {
name: 'mangeBL',
data() {
+ let that = this
return {
id: '',
value1: [],
@@ -210,6 +217,34 @@
],
fingerprint: '',
},
+ pickerOptions: {
+ shortcuts: [{
+ text: '7澶�',
+ onClick(picker) {
+ let startDate = new Date()
+ let endDate = new Date()
+ endDate.setDate(new Date().getDay() + 8)
+ picker.$emit('pick',[startDate,endDate])
+
+ }
+ },{
+ text: '涓�涓湀',
+ onClick(picker) {
+ let startDate = new Date()
+ let endDate = new Date()
+ endDate.setMonth(new Date().getMonth() + 1)
+ picker.$emit('pick', [startDate, endDate]);
+ }
+ },{
+ text: '涓変釜鏈�',
+ onClick(picker) {
+ let startDate = new Date()
+ let endDate = new Date()
+ endDate.setMonth(new Date().getMonth() + 3)
+ picker.$emit('pick', [startDate, endDate]);
+ }
+ }]
+ }
}
},
mounted() {
@@ -230,6 +265,7 @@
console.log('璋冩煡璇㈤棶绗斿綍璇锋眰鐨勬暟鎹�', data)
if (data.code == 0) {
this.form = res.data.data
+ console.log(this.form,'this.form----')
this.value1.push(res.data.data.startTime)
this.value1.push(res.data.data.endTime)
if (data.data.fingerprint == '' || data.data.fingerprint == null) {
@@ -268,8 +304,10 @@
inquiry(this.form).then((res) => {
if (res.data.code == 0) {
this.$message.success('淇濆瓨鎴愬姛')
+ this.$emit('isKeep1',true) //isKeep 鏄惁鐐瑰嚮浜嗕繚瀛�
}
})
+
},
//鐐瑰嚮棰勮
viewVord(data) {
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue b/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
index 392050c..3196069 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeGZ.vue
@@ -2,16 +2,19 @@
<!-- 璐ｄ护闄愭湡鏀规閫氱煡涔� -->
<el-main>
<el-form ref="form"
+ :disabled="form.registerState == '1'"
:model="form"
label-width="115px">
<el-row>
- <el-col :span="12">
+ <el-col :span="24">
<el-form-item label="鏂囧彿">
<el-input v-model="form.unitName"
placeholder="鈥斺�斺�斺�斺�斺�旂綒璐ｆ敼閫氬瓧銆� 銆曠鈥斺�斺�斺�斿彿"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ </el-row>
+ <el-row>
+ <el-col :span="24">
<el-form-item label="褰撲簨浜�">
<el-input v-model="form.litigant"
placeholder="璇峰～鍐欏綋浜嬩汉濮撳悕"></el-input>
@@ -28,7 +31,7 @@
</el-form-item>
<el-row>
<el-col :span="12">
- <el-form-item label="璐熻矗浜�">
+ <el-form-item label="娉曚汉">
<el-input v-model="form.legalPerson"
placeholder="璇峰～鍐欐硶瀹氫唬琛ㄤ汉锛堣礋璐ｄ汉/缁忚惀鑰咃級"></el-input>
</el-form-item>
@@ -56,7 +59,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="妫�鏌ヤ簨椤�">
+ <el-form-item label="妫�鏌ュ璞�">
<el-input v-model="form.items"
placeholder="璇峰～鍐欒仈绯荤數璇�"></el-input>
</el-form-item>
@@ -187,6 +190,7 @@
ordercorrec(this.form).then((res) => {
if (res.data.code == 0) {
this.$message.success('鎿嶄綔鎴愬姛')
+ this.$emit('isKeep2',true) //isKeep 鏄惁鐐瑰嚮浜嗕繚瀛�
}
})
},
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
index d7b4e45..30d6b28 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
@@ -2,6 +2,7 @@
<!-- 澶勫喅鍐冲畾涔� -->
<el-main>
<el-form ref="form"
+ :disabled="form.registerState == '1'"
:model="form"
label-width="120px">
<el-row>
@@ -43,7 +44,7 @@
</el-row>
<!-- 鍙欒堪娉曞緥鏉′护 -->
<el-row>
- <el-col :span="12">
+ <el-col :span="24">
<el-form-item label="杩濇硶鏃堕棿">
<el-date-picker v-model="form.illegalTime"
type="datetime"
@@ -53,12 +54,12 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!--<el-col :span="12">
<el-form-item label="褰撲簨浜�">
<el-input v-model="form.litigant"
placeholder="璇疯緭鍏ュ綋浜嬩汉濮撳悕"></el-input>
</el-form-item>
- </el-col>
+ </el-col>-->
</el-row>
<el-form-item label="宸℃煡鍦扮偣">
<el-input v-model="form.illegalLocation"
@@ -300,10 +301,6 @@
changenullTwo(val) {
console.log('缂寸撼鏂瑰紡', val)
if (this.form.fines == 1) {
- this.form.bank = ''
- this.form.account = ''
- this.form.accountName = ''
- this.form.place = ''
} else {
this.form.bank = '閭斂鍌ㄨ搫閾惰宄板嘲鏀锛堝嘲宄扮熆鍖烘粡闃宠矾43鍙凤級'
}
@@ -325,6 +322,7 @@
nowpenalty(this.form).then((res) => {
if (res.data.code == 0) {
this.$message.success('淇濆瓨鎴愬姛')
+ this.$emit('isKeep3',true) //isKeep 鏄惁鐐瑰嚮浜嗕繚瀛�
}
})
},
--
Gitblit v1.9.1