From 7298e6cff9ed3e0137398283a96156dadbeabf5b Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期三, 12 十月 2022 17:07:28 +0800
Subject: [PATCH] 修改bug
---
src/views/operate/management/myIndex/components/closure/index.vue | 4
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue | 50 +
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue | 120 ++++
src/utils/helper.js | 20
src/views/operate/disposal/casepool/pool/index.vue | 12
src/views/systemSetting/baseSetting/user/components/header/index.vue | 2
src/components/illdetail/index.vue | 33
src/views/operate/disposal/casepool/learn/index.vue | 37 +
src/views/operate/disposal/casepool/notDeal/index.vue | 33
src/components/process/index.vue | 6
src/views/systemSetting/baseSetting/user/components/main/index.vue | 4
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 390 ++++++++++----
src/views/systemSetting/baseSetting/user/components/password/index.vue | 1
src/views/operate/management/myIndex/components/examine/index.vue | 46 +
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue | 8
src/components/dispatch/index.vue | 12
src/views/systemSetting/baseSetting/role/updateUser/index.vue | 6
src/utils/validate.js | 10
src/views/operate/disposal/casepool/dispatch/index.vue | 108 ++-
src/utils/request.js | 44 -
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 187 ++++--
src/components/detail/index.vue | 20
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue | 8
src/views/systemSetting/baseSetting/role/viewRole/index.vue | 4
src/views/operate/management/myIndex/index.vue | 28
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue | 273 +++++++---
src/views/operate/disposal/casepool/pool/createUser/index.vue | 6
src/views/systemSetting/baseSetting/role/index.vue | 23
28 files changed, 979 insertions(+), 516 deletions(-)
diff --git a/src/components/detail/index.vue b/src/components/detail/index.vue
index 9394f71..9f8ba6e 100644
--- a/src/components/detail/index.vue
+++ b/src/components/detail/index.vue
@@ -12,7 +12,7 @@
<label class="data-title">
澶х被鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.category}}</span>
+ <span class="data-detail">{{baseCase.violations.categoryId}}</span>
</div>
</div>
<div class="data-item">
@@ -20,13 +20,13 @@
<label class="data-title">
灏忕被鍚嶇О:
</label>
- <!-- <span class="data-detail">{{baseCase.violations}}</span> -->
+ <span class="data-detail">{{baseCase.violations.typeId}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
浜嬩欢绛夌骇:
</label>
- <span class="data-detail">xxx</span>
+ <span class="data-detail">{{baseCase.violations.gradeId}}</span>
</div>
</div>
<div class="data-item">
@@ -34,7 +34,7 @@
<label class="data-title">
妗堢敱:
</label>
- <span class="data-detail">xxx</span>
+ <span class="data-detail">{{baseCase.violations.actionCause}}</span>
</div>
</div>
<div class="data-item">
@@ -48,7 +48,7 @@
<label class="data-title">
鎵�灞炵ぞ鍖�:
</label>
- <span class="data-detail">xxx</span>
+ <span class="data-detail">{{baseCase.communityId}}</span>
</div>
</div>
<div class="data-item">
@@ -72,7 +72,7 @@
<label class="data-title">
鍏宠仈鍟嗛摵鍚嶇О:
</label>
- <span class="data-detail">xxx</span>
+ <span class="data-detail">{{baseCase.violations.shopName}}</span>
</div>
</div>
<div class="data-item">
@@ -80,7 +80,7 @@
<label class="data-title">
闂鎻忚堪:
</label>
- <span class="data-detail">xxx</span>
+ <span class="data-detail">{{baseCase.violations.description}}</span>
</div>
</div>
<div class="data-user">
@@ -89,13 +89,13 @@
<label class="data-title">
鍙嶆槧浜�:
</label>
- <span class="data-detail">{{baseCase.createUser}}</span>
+ <span class="data-detail">{{baseCase.violations.informant}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
鑱旂郴鏂瑰紡:
</label>
- <span class="data-detail">12345678901</span>
+ <span class="data-detail">{{baseCase.violations.informantPhoneCode}}</span>
</div>
</div>
<div class="data-item">
@@ -103,7 +103,7 @@
<label class="data-title">
韬唤璇佸彿:
</label>
- <span class="data-detail">123456789987654321</span>
+ <span class="data-detail">{{baseCase.violations.informantIdCard}}</span>
</div>
</div>
</div>
diff --git a/src/components/dispatch/index.vue b/src/components/dispatch/index.vue
index c5aebf1..1dc2083 100644
--- a/src/components/dispatch/index.vue
+++ b/src/components/dispatch/index.vue
@@ -118,14 +118,14 @@
if (value) {
callback();
} else {
- callback(new Error('鎵ф硶浜哄憳涓嶈兘涓虹┖'))
+ callback()
}
}
const checkNumber = (rule, value, callback) => {
if (value) {
callback();
} else {
- callback(new Error('鎵ф硶浜哄憳缂栧彿涓嶈兘涓虹┖'))
+ callback()
}
}
return {
@@ -143,7 +143,7 @@
rules: {
contactWay: [
{
- required: true, trigger: 'blur', validator: checkPhone
+ required: false, trigger: 'blur', validator: checkPhone
}
],
dispatchOpinion: [
@@ -159,7 +159,7 @@
{ required: true, trigger: 'change', validator: checkPerson }
],
lawEnforcerName: [
- { required: true, trigger: 'change', validator: checkNumber }
+ { required: false, trigger: 'change', validator: checkNumber }
],
},
carOptions: [
@@ -291,7 +291,9 @@
this.dispatch.lawEnforcer = '';
this.dispatch.enforcementTeam = '';
await this.getTeamList(id);
- await this.getDepartUserList(id);
+ if(this.squadronOptions.length===0){
+ await this.getDepartUserList(id);
+ }
},
// 涓槦鏇存敼
async handleMidChange(id) {
diff --git a/src/components/illdetail/index.vue b/src/components/illdetail/index.vue
index 7ada2f5..2f8e6b8 100644
--- a/src/components/illdetail/index.vue
+++ b/src/components/illdetail/index.vue
@@ -7,38 +7,38 @@
<span class="data-detail">杩濆缓</span>
</el-form-item>
<el-form-item label="杩濆缓绫诲埆:">
- <span class="data-detail">xxxxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.categoryId}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="褰撲簨浜哄鍚�:">
- <span class="data-detail">xxxxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.partyName}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="褰撲簨浜鸿韩浠借瘉鍙�:">
- <span class="data-detail">xxxxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.partyIdCard}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="褰撲簨浜鸿仈绯荤數璇�:">
- <span class="data-detail">xxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.partyPhone}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="杩濆缓鍦扮偣:">
- <span class="data-detail">xxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.site}}</span>
</el-form-item>
<el-form-item label="鎵�灞炵ぞ鍖�:">
- <span class="data-detail">xxxxx</span>
+ <span class="data-detail">{{baseCase.communityId}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="韬唤璇佹鍙嶉潰鐓х墖:">
- <img src="" alt="">
+ <img :src="baseCase.illegalBuilding.positive" alt="">
</el-form-item>
- <el-form-item>
- <img src="" alt="">
+ <el-form-item label-width="0px">
+ <img :src="baseCase.illegalBuilding.negative" alt="">
</el-form-item>
</div>
<div class="data-item">
@@ -47,22 +47,22 @@
</div>
<div class="data-item">
<el-form-item label="杩濆缓鍏蜂綋浣嶇疆:">
- <span class="data-detail">xxxxxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.position}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="杩濇硶寤鸿闀裤�佸銆侀珮:">
- <span class="data-detail">xxxxxxx xxxxx xxxxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.buildingLength+'m'+" "+baseCase.illegalBuilding.buildingWidth+'m'+" "+baseCase.illegalBuilding.buildingHigh+'m' }}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="杩濇硶寤鸿闈㈢Н:">
- <span class="data-detail">xxxxxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.buildingArea}}銕�</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="杩濇硶寤虹瓚鏉愭枡:">
- <span class="data-detail">xxxxxxx</span>
+ <span class="data-detail">{{baseCase.illegalBuilding.materials}}</span>
</el-form-item>
</div>
</el-form>
@@ -154,11 +154,14 @@
color: #4b9bb7;
flex: 4;
padding: 0 30px 0 20px;
-
+ img{
+ width: 100px;
+ height: 100px;
+ }
.data-item {
display: flex;
justify-content: space-between;
- line-height: 40px;
+ line-height: 20px;
}
border: 1px solid #17324c;
diff --git a/src/components/process/index.vue b/src/components/process/index.vue
index e66ea59..09afaa4 100644
--- a/src/components/process/index.vue
+++ b/src/components/process/index.vue
@@ -52,9 +52,7 @@
// console.log(this.handlePassVo.workflowConfigSteps[0].name);
// console.log(mylist);
console.log(mystate);
- if(mystate===0){
- this.active = -1;
- }else if(mystate ===6){
+ if(mystate ===6){
this.active = 1;
}else if(mystate===7){
this.active = 2;
@@ -62,6 +60,8 @@
this.active = 3;
}else if(mystate ===9){
this.active = 4;
+ }else{
+ this.active = -1;
}
this.list = mylist;
},
diff --git a/src/utils/helper.js b/src/utils/helper.js
index 622cae1..e8e2d20 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -1,7 +1,6 @@
-import { hash } from "immutable";
-
+import myrequest from './request'
// 娣辨嫹璐�
-function deepClone(obj) {
+export function deepClone(obj) {
let objClone = Array.isArray(obj) ? [] : {};
if (obj && typeof obj === 'object' && obj != null) {
for (let key in obj) {
@@ -17,10 +16,22 @@
return objClone;
}
// 璁＄畻闄愬埗鏃堕棿
-function computeTime(time2) {
+export function computeTime(time2) {
const t1 = new Date();
const t2 = new Date(time2);
return filterTime(t2.getTime() - t1.getTime());
+}
+// 鑾峰彇瀛楀吀琛�
+export async function getTypeList(level,code){
+ let arr;
+ await myrequest({
+ method:'get',
+ url:`sccg/dict/query_type?level=${level}&typeCode=${code}`
+ })
+ .then(res=>{
+ arr = res.data;
+ })
+ return arr;
}
function filterTime(time) {
if (time < 0) {
@@ -58,4 +69,3 @@
}
return str + '鍒嗛挓'
}
-export { deepClone, computeTime };
diff --git a/src/utils/request.js b/src/utils/request.js
index 402a567..1ae8fbf 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,15 +21,25 @@
)
// 鍝嶅簲
api.interceptors.response.use(
- function (response) {
- if (response.data.code === 401) {
+ function handleResponseSuccess(response) {
+ const result = response.data;
+ if (response.status === 200 && result.code === 200) {
+ return result;
+ } else if (result.code=== 401) {
+ console.log(result);
tip.Message({
type: 'warning',
message: '鐧诲綍韬唤宸茶繃鏈�',
})
router.push('/login');
+ return;
+ }else if(result.code === 500){
+ tip.Message({
+ type: 'error',
+ message: '缃戠粶璇锋眰鍑洪敊',
+ })
+ return;
}
- return response.data;
},
function (error) {
console.log(error);
@@ -41,32 +51,6 @@
})
return;
}
- const {code,status} = error.response.data;
- if (error.code === 'ERR_NETWORK') {
- console.log(1);
- tip.Message({
- type: 'error',
- message: '鏈嶅姟鍣ㄦ晠闅�'
- })
- return;
- }
- if (code === 401) {
- console.log(2);
- tip.Message({
- type: 'warning',
- message: '鐧诲綍韬唤宸茶繃鏈�',
- })
- router.push('/login');
- return;
- }
- if (status === 500) {
- console.log(3);
- tip.Message({
- type: 'error',
- message: '缃戠粶璇锋眰鍑洪敊'
- })
- return;
- }
}
-);
+)
export default api;
\ No newline at end of file
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 42e530d..03acd66 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -29,4 +29,14 @@
const regExp = /(^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9鎸傚璀︽腐婢砞{1}$)/;
return regExp.test(str);
}
+// 鏍￠獙鏁板瓧
+export function validateNum(str){
+ const rep = /^[0-9]+(.[0-9]{1,3})?$/;
+ return rep.test(str);
+}
+// 楠岃瘉韬唤璇佸彿
+export function validateCardId(str){
+ const rep=/^\d{15}|\d{}18$/
+ return rep.test(str);
+}
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index ac946a7..f7ef9da 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -30,39 +30,52 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
<el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<template slot-scope="scope">
<span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
</template>
</el-table-column>
- <el-table-column prop="category" label="澶х被鍚嶇О" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'category' :'category'"
+ :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'">
</el-table-column>
- <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'"
+ min-width="10">
</el-table-column>
- <el-table-column prop="actionCause" label="妗堢敱" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'"
+ :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
</el-table-column>
- <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
+ :min-width="mystatus===1?'10' :'20' ">
+ <template slot-scope="scope">
+ <div v-if="mystatus ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+
+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div>
+ <div v-else>{{scope.row.site}}</div>
+ </template>
</el-table-column>
- <el-table-column prop="streetId" label="鎵�灞炲尯鍩�" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'"
+ :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
</el-table-column>
- <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15">
+ <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
<template slot-scope="scope">
<span>{{filterTime(scope.row.alarmTime)}}</span>
</template>
</el-table-column>
- <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'"
+ :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
- <div class="btn">
- <span>璋冨害</span>
- <span class="line">|</span>
- <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
+ <div class="operation">
+ <div class="btn">
+ <span>璋冨害</span>
+ <span class="line">|</span>
+ <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
+ </div>
</div>
</template>
</el-table-column>
@@ -70,11 +83,12 @@
<!-- 璇︽儏椤靛睍绀� -->
<el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleClose">
- <MyDetail :info=info></MyDetail>
+ <MyDetail :info=info v-if="mystatus==1 ? true:false"></MyDetail>
+ <MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
- <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉"
- v-if="dialogUpload" :before-close="handleClose">
+ <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
+ :before-close="handleClose">
<uploadVio v-if="mystatus === 1" :caseId="caseId" @closeDialog="closeDialog"></uploadVio>
<uploadIll v-else :caseId="caseId" @closeDialog="closeDialog"></uploadIll>
</el-dialog>
@@ -110,19 +124,20 @@
import uploadVio from './updateUser/uploadResult/vio'
import uploadIll from "./updateUser/uploadResult/ill"
import MyDetail from '@/components/detail'
+import MyIllDetail from '@/components/illdetail'
import helper from '@/utils/mydate'
export default {
components: {
// updateUser,
- uploadVio,uploadIll,MyDetail
+ uploadVio, uploadIll, MyDetail,MyIllDetail
},
data() {
return {
tableData: [],
context: "",
- dialogUpload:false,
+ dialogUpload: false,
// dialogUpdate: false,
- dialogView:false,
+ dialogView: false,
info: {},
totalNum: null,
pageSize: 10,
@@ -130,7 +145,7 @@
all: false,
unsame: false,
myIdx: 0,
- preMyIdx:0,
+ preMyIdx: 0,
options: [
{
value: 0,
@@ -163,9 +178,9 @@
checked: false,
},
],
- statusArr:[],
- mystatus:1,
- caseId:'',
+ statusArr: [],
+ mystatus: 1,
+ caseId: '',
}
},
created() {
@@ -186,16 +201,16 @@
this.getUserList();
},
// 鎵归噺鍒犻櫎
- mulDelete(idArr){
+ mulDelete(idArr) {
console.log(idArr);
this.$axios({
- method:'delete',
- url:'sccg/violations/batch_delete?ids='+idArr,
- }).then(res=>{
+ method: 'delete',
+ url: 'sccg/violations/batch_delete?ids=' + idArr,
+ }).then(res => {
this.getUserList();
this.$message({
- message:res.message,
- type:res.code === 200 ? 'success' : 'warning'
+ message: res.message,
+ type: res.code === 200 ? 'success' : 'warning'
})
})
},
@@ -319,32 +334,32 @@
})
.catch(_ => { });
},
- async JumpView(data){
+ async JumpView(data) {
await this.getEventInfo(data.code);
},
// 鑾峰彇妗堜欢淇℃伅
- getEventInfo(code){
- this.$axios({
- method:'get',
- url:`sccg/base_case/baseCaseDetail/${code}`
+ async getEventInfo(code) {
+ await this.$axios({
+ method: 'get',
+ url: `sccg/base_case/baseCaseDetail/${code}`
})
- .then(res=>{
- this.info = res.data;
- this.dialogView = true;
- })
+ .then(res => {
+ this.info = res.data;
+ this.dialogView = true;
+ })
},
- opernDialog(data){
+ opernDialog(data) {
this.dialogUpload = true;
this.caseId = data.id;
// console.log(data);
},
// 鍏抽棴涓婁紶鐣岄潰
- closeDialog({flag}){
+ closeDialog({ flag }) {
this.dialogUpload = flag;
this.getUserList();
},
// 澶勭悊鏃堕棿
- filterTime(time){
+ filterTime(time) {
return helper(time);
}
}
@@ -355,6 +370,7 @@
text-align: left;
margin: 10px 20px;
color: #4b9bb7;
+
header {
background-color: #09152f;
border: 1pox solid #fff;
@@ -407,18 +423,22 @@
}
}
}
+
&::v-deep .el-input__inner {
background-color: #09152f;
border: 1px solid #17324c;
}
+
main {
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
border: 1pox solid #fff;
- .btn span:hover{
+
+ .btn span:hover {
cursor: pointer;
}
+
.type-nav {
display: flex;
line-height: 40px;
@@ -576,9 +596,11 @@
width: 50px !important;
}
}
- .line{
+
+ .line {
padding: 0 5px;
}
+
&::v-deep .el-dialog__header,
&::v-deep .el-dialog__body {
background-color: #06122c;
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
index 39ef1b8..61e13cf 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -25,13 +25,16 @@
<!-- 鐜板満鎯呭喌鐓х墖 -->
<el-form-item label="鐜板満鎯呭喌鐓х墖:" prop="situationPic">
<div class="upImg">
- <div class="img-list">
- <img :src="item" alt="" v-for="(item,index) in arrive.situationPic" :key="index">
+ <div class="img-list" v-if="arrive.situationPic.length!==0">
+ <div class="img" v-for="(item,index) in arrive.situationPic" :key="index">
+ <img :src="item" alt="">
+ <i class="el-icon-close myicon" @click="handleRemove(index)"></i>
+ </div>
</div>
<div class="upload" v-if="arrive.situationPic.length<4">
<el-upload :file-list="fileList" class="upload-demo"
action="http://42.193.1.25:8082/sccg/file/medias" multiple :show-file-list="false"
- :limit="4" :on-success="handleSuccess" :headers="getToken()">
+ :limit="50" :on-success="handleSuccess" list-type="picture" :headers="getToken()">
<i class="el-icon-plus"></i>
</el-upload>
</div>
@@ -74,10 +77,10 @@
}
}
const checkSitPic = (rule, value, callback) => {
- if (value) {
+ if (value.length !== 0) {
callback()
} else {
- callback();
+ callback(new Error('璇蜂笂浼犵幇鍦烘儏鍐电収鐗�'));
}
}
return {
@@ -98,7 +101,7 @@
{ trigger: 'blur', validator: checkReplay }
],
situationPic: [
- { trigger: 'change', validator: checkSitPic }
+ { trigger: 'blur', validator: checkSitPic }
],
},
fileList: [],
@@ -108,6 +111,7 @@
handleSuccess(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
console.log(res);
+ console.log(this.fileList);
if (this.arrive.situationPic.length < 4) {
this.arrive.situationPic.push(baseUrl + res.data.url1)
}
@@ -120,15 +124,29 @@
}
},
// 鑾峰彇arrive瀵硅薄
- backData(){
+ backData() {
const { arrive } = this;
- this.$emit('getArrive',{arrive});
+ this.$emit('getArrive', { arrive });
+ },
+ // 鍒犻櫎鍥剧墖
+ handleRemove(index) {
+ this.arrive.situationPic.splice(index,1);
+ }
+ },
+ watch: {
+ 'arrive.situationPic.length': {
+ handler(newLen, oldLen) {
+ if (newLen !== 0) {
+ this.$refs.arriveForm.validateField('situationPic');
+ }
+ },
+ deep: true,
}
}
}
</script>
<style lang="scss" scoped>
-.arrive-title{
+.arrive-title {
line-height: 60px;
font-weight: 650;
font-size: 20px;
@@ -148,13 +166,23 @@
}
.img-list {
- height: 80px;
+ height: 60px;
position: relative;
-
+ display: flex;
img {
width: 60px;
height: 60px;
}
+ .img{
+ height: 60px;
+ position: relative;
+ }
+ .myicon {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ color: #4b9bb7;
+ }
}
}
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
index d5943f9..ea68e71 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
@@ -51,8 +51,11 @@
<!-- 鏂囦功鐓х墖涓婁紶 -->
<el-form-item label="鏂囦功鐓х墖涓婁紶:" prop="writPic">
<div class="upImg">
- <div class="img-list">
- <img :src="item" alt="" v-for="(item,index) in book.writPic" :key="index">
+ <div class="img-list" v-if="book.writPic.length!==0">
+ <div class="img" v-for="(item,index) in book.writPic" :key="index">
+ <img :src="item" alt="">
+ <i class="el-icon-close myicon" @click="handleRemove(index,1)"></i>
+ </div>
</div>
<div class="upload" v-if="book.writPic.length<4">
<el-upload :file-list="fileList" class="upload-demo"
@@ -67,8 +70,11 @@
<!-- 鏁存敼鍓嶇収鐗� -->
<el-form-item label="鏁存敼鍓嶇収鐗�:" prop="originalPic">
<div class="upImg">
- <div class="img-list">
- <img :src="item" alt="" v-for="(item,index) in book.originalPic" :key="index">
+ <div class="img-list" v-if="book.originalPic.length!==0">
+ <div class="img" v-for="(item,index) in book.originalPic" :key="index">
+ <img :src="item" alt="">
+ <i class="el-icon-close myicon" @click="handleRemove(index,2)"></i>
+ </div>
</div>
<div class="upload" v-if="book.originalPic.length<4">
<el-upload :file-list="fileList" class="upload-demo"
@@ -83,8 +89,11 @@
<!-- 鏁存敼鍚庣収鐗� -->
<el-form-item label="鏁存敼鍚庣収鐗�:" prop="rectifiedPic">
<div class="upImg">
- <div class="img-list">
- <img :src="item" alt="" v-for="(item,index) in book.rectifiedPic" :key="index">
+ <div class="img-list" v-if="book.rectifiedPic.length!==0">
+ <div class="img" v-for="(item,index) in book.rectifiedPic" :key="index">
+ <img :src="item" alt="">
+ <i class="el-icon-close myicon" @click="handleRemove(index,3)"></i>
+ </div>
</div>
<div class="upload" v-if="book.rectifiedPic.length<4">
<el-upload :file-list="fileList" class="upload-demo"
@@ -99,8 +108,11 @@
<!-- 鍏朵粬鐓х墖 -->
<el-form-item label="鍏朵粬:" prop="otherPic">
<div class="upImg">
- <div class="img-list">
- <img :src="item" alt="" v-for="(item,index) in book.otherPic" :key="index">
+ <div class="img-list" v-if="book.otherPic.length!==0">
+ <div class="img" v-for="(item,index) in book.otherPic" :key="index">
+ <img :src="item" alt="">
+ <i class="el-icon-close myicon" @click="handleRemove(index,4)"></i>
+ </div>
</div>
<div class="upload" v-if="book.otherPic.length<4">
<el-upload :file-list="fileList" class="upload-demo"
@@ -182,6 +194,27 @@
callback(new Error('鍙戞斁鍐呭涓嶈兘涓虹┖'));
}
}
+ const checkRectPic = (rule, value, callback) => {
+ if (value.length!==0) {
+ callback();
+ } else {
+ callback(new Error('鏁存敼鍚庣収鐗囦笉鑳戒负绌�'));
+ }
+ }
+ const checkWritPic = (rule, value, callback) => {
+ if (value.length!==0) {
+ callback();
+ } else {
+ callback(new Error('鏂囦功鐓х墖涓嶈兘涓虹┖'));
+ }
+ }
+ const checkOrgPic = (rule, value, callback) => {
+ if (value.length !==0) {
+ callback();
+ } else {
+ callback(new Error('鏁存敼鍓嶇収鐗囦笉鑳戒负绌�'));
+ }
+ }
return {
book: {
writPic: [],
@@ -192,10 +225,10 @@
bookRules: {
writType: [
{
- trigger: 'blur', validator: checkKind
+ trigger: 'change', validator: checkKind
}
],
- idwritCode: [
+ writCode: [
{
trigger: 'blur', validator: checkId
}
@@ -233,6 +266,19 @@
noremark: [
{
trigger: 'blur', validator: checkNote
+ }
+ ],
+ writPic: [{
+ trigger: 'blur', validator: checkWritPic
+ }],
+ rectifiedPic: [
+ {
+ trigger: 'blur', validator: checkRectPic
+ }
+ ],
+ originalPic: [
+ {
+ trigger: 'blur', validator: checkOrgPic
}
],
},
@@ -291,6 +337,45 @@
return { Authorization: tokenHead + token }
}
},
+ // 鍒犻櫎鍥剧墖
+ handleRemove(index, flag) {
+ if (flag === 1) {
+ this.book.writPic.splice(index, 1);
+ } else if (flag === 2) {
+ this.book.originalPic.splice(index, 1);
+ } else if (flag === 3) {
+ this.book.rectifiedPic.splice(index, 1);
+ } else {
+ this.book.otherPic.splice(index, 1);
+ }
+
+ }
+ },
+ watch: {
+ 'book.writPic.length': {
+ handler(newLen, oldLen) {
+ if (newLen !== 0) {
+ this.$refs.bookForm.validateField('writPic');
+ }
+ },
+ deep: true,
+ },
+ 'book.rectifiedPic.length': {
+ handler(newLen, oldLen) {
+ if (newLen !== 0) {
+ this.$refs.bookForm.validateField('rectifiedPic');
+ }
+ },
+ deep: true,
+ },
+ 'book.originalPic.length': {
+ handler(newLen, oldLen) {
+ if (newLen !== 0) {
+ this.$refs.bookForm.validateField('originalPic');
+ }
+ },
+ deep: true,
+ }
}
}
</script>
@@ -331,13 +416,26 @@
}
.img-list {
- height: 80px;
+ height: 60px;
position: relative;
+ display: flex;
img {
width: 60px;
height: 60px;
}
+
+ .img {
+ height: 60px;
+ position: relative;
+ }
+
+ .myicon {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ color: #4b9bb7;
+ }
}
}
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
index 6f02459..511566a 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
@@ -3,14 +3,16 @@
<div class="evidence-title">璋冩煡鍙栬瘉</div>
<div class="evidence-form">
<el-form ref="evidenceForm" label-width="160px" :model="evidence" :rules="evidenceRules" autoComplete="on">
- <!-- 鎵垮姙闃熷憳 -->
- <el-form-item label="鎵垮姙闃熷憳:" prop="undertaker">
- <el-input v-model="evidence.undertaker" placeholder="璇疯緭鍏ュ鍚�"></el-input>
- </el-form-item>
- <!-- 鍗忓姙闃熷憳 -->
- <el-form-item label="鍗忓姙闃熷憳:" prop="assistant">
- <el-input v-model="evidence.assistant" placeholder="璇疯緭鍏ュ鍚�"></el-input>
- </el-form-item>
+ <div class="evidence-item">
+ <!-- 鎵垮姙闃熷憳 -->
+ <el-form-item label="鎵垮姙闃熷憳:" prop="undertaker">
+ <el-input v-model="evidence.undertaker" placeholder="璇疯緭鍏ュ鍚�"></el-input>
+ </el-form-item>
+ <!-- 鍗忓姙闃熷憳 -->
+ <el-form-item label="鍗忓姙闃熷憳:" label-width="100px" prop="assistant">
+ <el-input v-model="evidence.assistant" placeholder="璇疯緭鍏ュ鍚�"></el-input>
+ </el-form-item>
+ </div>
<!-- 鏃堕棿 -->
<el-form-item label="鏃堕棿:" prop="investigationTime">
<el-date-picker v-model="evidence.investigationTime" type="datetime" placeholder="閫夋嫨鏃堕棿">
@@ -26,7 +28,7 @@
</el-form-item>
<!-- 褰撲簨浜轰俊鎭� -->
<el-form-item label="褰撲簨浜轰俊鎭�:" prop="userInfo">
- <el-input suffix-icon="el-icon-s-order" @focus="openDialog"></el-input>
+ <el-input suffix-icon="el-icon-s-order" v-model="evidence.userInfo" @focus="openDialog"></el-input>
</el-form-item>
<!-- 鎯呭喌鎻忚堪 -->
<el-form-item label="鎯呭喌鎻忚堪:" prop="description">
@@ -34,10 +36,13 @@
v-model="evidence.description" placeholder="璇疯緭鍏ユ儏鍐垫弿杩�,闄愬埗200瀛椾互鍐�"></el-input>
</el-form-item>
<!-- 鐓х墖闄勪欢 -->
- <el-form-item label="鐓х墖闄勪欢:" prop="photo">
+ <el-form-item label="鐓х墖闄勪欢:" prop="pic">
<div class="upImg">
- <div class="img-list">
- <img :src="item" alt="" v-for="(item,index) in evidence.pic" :key="index">
+ <div class="img-list" v-if="evidence.pic.length!==0">
+ <div class="img" v-for="(item,index) in evidence.pic" :key="index">
+ <img :src="item" alt="">
+ <i class="el-icon-close myicon" @click="handleRemove(index)"></i>
+ </div>
</div>
<div class="upload" v-if="evidence.pic.length<4">
<el-upload :file-list="fileList" class="upload-demo"
@@ -81,8 +86,8 @@
<div class="user-item">
<el-form-item label="璇佷欢绫诲瀷:" prop="certificateType">
<el-select v-model="user.certificateType" placeholder="璇烽�夋嫨">
- <el-option v-for="item in cardOptions" :key="item.value" :label="item.label"
- :value="item.value">
+ <el-option v-for="item in cardOptions" :key="item.id" :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -95,8 +100,8 @@
<!-- 鏂囧寲绋嬪害 -->
<el-form-item label="鏂囧寲绋嬪害:" prop="educationDegree">
<el-select v-model="user.educationDegree" placeholder="璇烽�夋嫨">
- <el-option v-for="item in degreeOptions" :key="item.value" :label="item.label"
- :value="item.value">
+ <el-option v-for="item in degreeOptions" :key="item.id" :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -113,7 +118,13 @@
<div class="user-item">
<!-- 姘戞棌 -->
<el-form-item label="姘戞棌:" prop="nation">
- <el-input v-model="user.nation"></el-input>
+ <!-- <el-select v-model="user.nation" placeholder="璇烽�夋嫨姘戞棌"> -->
+ <el-select v-model="user.nation" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in nationOptions" :key="item.id" :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ <!-- <el-input v-model="user.nation"></el-input> -->
</el-form-item>
<!-- 绫嶈疮 -->
<el-form-item label="绫嶈疮:" prop="nativePlace">
@@ -138,6 +149,8 @@
</div>
</template>
<script>
+import { getTypeList } from '@/utils/helper'
+import {validateName,validatePhone,validateCardId} from '@/utils/validate'
export default {
data() {
const checkName = (rule, value, callback) => {
@@ -183,10 +196,10 @@
}
}
const checkPic = (rule, value, callback) => {
- if (value) {
+ if (value.length !== 0) {
callback()
} else {
- callback();
+ callback(new Error('璇蜂笂浼犵収鐗囬檮浠�'));
}
}
const checkIll = (rule, value, callback) => {
@@ -198,14 +211,14 @@
}
const checkName3 = (rule, value, callback) => {
if (value) {
- callback()
+ validateName(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑濮撳悕'))
} else {
callback(new Error('褰撲簨浜哄鍚嶄笉鑳戒负绌�'));
}
}
const checkPhone = (rule, value, callback) => {
if (value) {
- callback()
+ validatePhone(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙风爜'))
} else {
callback(new Error('鎵嬫満鍙风爜涓嶈兘涓虹┖'));
}
@@ -219,7 +232,7 @@
}
const checkCode = (rule, value, callback) => {
if (value) {
- callback()
+ validateCardId(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑璇佷欢鍙风爜'))
} else {
callback(new Error('璇佷欢鍙风爜涓嶈兘涓虹┖'));
}
@@ -231,20 +244,20 @@
callback(new Error('鏂囧寲绋嬪害涓嶈兘涓虹┖'));
}
}
- const checkCareer = (rule, value, callback) => {
- if (value) {
- callback()
- } else {
- callback(new Error('鑱屼笟涓嶈兘涓虹┖'));
- }
- }
- const checkWork = (rule, value, callback) => {
- if (value) {
- callback()
- } else {
- callback(new Error('宸ヤ綔鍗曚綅鍙婅亴鍔′笉鑳戒负绌�'));
- }
- }
+ // const checkCareer = (rule, value, callback) => {
+ // if (value) {
+ // callback()
+ // } else {
+ // callback();
+ // }
+ // }
+ // const checkWork = (rule, value, callback) => {
+ // if (value) {
+ // callback()
+ // } else {
+ // callback(new Error('宸ヤ綔鍗曚綅鍙婅亴鍔′笉鑳戒负绌�'));
+ // }
+ // }
const checkNation = (rule, value, callback) => {
if (value) {
callback()
@@ -252,13 +265,13 @@
callback(new Error('姘戞棌涓嶈兘涓虹┖'));
}
}
- const checkNaP = (rule, value, callback) => {
- if (value) {
- callback()
- } else {
- callback(new Error('绫嶈疮涓嶈兘涓虹┖'));
- }
- }
+ // const checkNaP = (rule, value, callback) => {
+ // if (value) {
+ // callback()
+ // } else {
+ // callback(new Error('绫嶈疮涓嶈兘涓虹┖'));
+ // }
+ // }
const checkLiveAdd = (rule, value, callback) => {
if (value) {
callback()
@@ -266,13 +279,13 @@
callback(new Error('鐜颁綇鍧�涓嶈兘涓虹┖'));
}
}
- const checkRegAdd = (rule, value, callback) => {
- if (value) {
- callback()
- } else {
- callback(new Error('鎴风睄鎵�鍦ㄥ湴涓嶈兘涓虹┖'));
- }
- }
+ // const checkRegAdd = (rule, value, callback) => {
+ // if (value) {
+ // callback()
+ // } else {
+ // callback(new Error('鎴风睄鎵�鍦ㄥ湴涓嶈兘涓虹┖'));
+ // }
+ // }
const checkFlag = (rule, value, callback) => {
if (value) {
callback();
@@ -283,7 +296,7 @@
return {
evidence: {
pic: [],
- userInfo: false,
+ userInfo: '',
},
evidenceRules: {
userInfo: [
@@ -330,7 +343,7 @@
illegalType: '',
name: '',
phoneCode: '',
- certificateType: '',
+ certificateType: 703,
certificateCode: '',
educationDegree: '',
career: '',
@@ -348,12 +361,12 @@
],
name: [
{
- trigger: 'blur', validator: checkName3
+ required:true,trigger: 'blur', validator: checkName3
}
],
phoneCode: [
{
- trigger: 'blur', validator: checkPhone
+ required:true,trigger: 'blur', validator: checkPhone
}
],
certificateType: [
@@ -363,7 +376,7 @@
],
certificateCode: [
{
- trigger: 'blur', validator: checkCode
+ required:true,trigger: 'blur', validator: checkCode
}
],
educationDegree: [
@@ -371,36 +384,36 @@
trigger: 'change', validator: checkWh
}
],
- career: [
- {
- trigger: 'blur', validator: checkCareer
- }
- ],
- work: [
- {
- trigger: 'blur', validator: checkWork
- }
- ],
+ // career: [
+ // {
+ // trigger: 'blur', validator: checkCareer
+ // }
+ // ],
+ // work: [
+ // {
+ // trigger: 'blur', validator: checkWork
+ // }
+ // ],
nation: [
{
- trigger: 'blur', validator: checkNation
+ trigger: 'change', validator: checkNation
}
],
- nativePlace: [
- {
- trigger: 'blur', validator: checkNaP
- }
- ],
+ // nativePlace: [
+ // {
+ // trigger: 'blur', validator: checkNaP
+ // }
+ // ],
liveAddress: [
{
- trigger: 'blur', validator: checkLiveAdd
+ required:true,trigger: 'blur', validator: checkLiveAdd
}
],
- registerAddress: [
- {
- trigger: 'blur', validator: checkRegAdd
- }
- ],
+ // registerAddress: [
+ // {
+ // trigger: 'blur', validator: checkRegAdd
+ // }
+ // ],
},
userFlag: false,
typeOptions: [
@@ -413,6 +426,7 @@
value: 2
}
],
+ nationOptions: [],
cardOptions: [
{
label: '韬唤璇�',
@@ -423,25 +437,32 @@
value: 2
}
],
- degreeOptions:[
+ degreeOptions: [
{
- label:'灏忓',
- value:1
+ label: '灏忓',
+ value: 1
},
{
- label:'鍒濅腑',
- value:2
+ label: '鍒濅腑',
+ value: 2
},
{
- label:'楂樹腑',
- value:3
+ label: '楂樹腑',
+ value: 3
},
{
- label:'澶у鍙婁互涓�',
- value:4
+ label: '澶у鍙婁互涓�',
+ value: 4
},
]
}
+ },
+ created() {
+ this.getCardTypeList();
+ this.getSchoolList();
+ this.getNationList();
+ console.log(this.mytype);
+ this.user.illegalType = JSON.parse(JSON.stringify(this.mytype));
},
methods: {
handleSuccess2(res, file, filelist) {
@@ -469,7 +490,7 @@
this.$refs.userForm.validate((valid) => {
console.log(valid);
if (valid) {
- this.evidence.userInfo = true;
+ this.evidence.userInfo = this.user.name;
this.userFlag = false;
} else {
this.evidence.userInfo = false;
@@ -478,21 +499,55 @@
})
},
// 鍏抽棴褰撲簨浜轰俊鎭晫闈�
- closeUserForm(){
+ closeUserForm() {
this.userFlag = false;
},
// 杩斿洖褰撳墠evidence鍜寀ser瀵硅薄
- backData(){
- const {user,evidence} = this;
- this.$emit('getEvidence',{user,evidence});
+ backData() {
+ const { user, evidence } = this;
+ this.$emit('getEvidence', { user, evidence });
+ },
+ // 鍒犻櫎鍥剧墖
+ handleRemove(index) {
+ this.evidence.pic.splice(index, 1);
+ },
+ // 鑾峰彇璇佷欢绫诲瀷
+ async getCardTypeList() {
+ this.cardOptions = await getTypeList(1, '03');
+ },
+ // 鑾峰彇瀛﹀巻
+ async getSchoolList() {
+ this.degreeOptions = await getTypeList(1, '04');
+ },
+ // 鑾峰彇姘戞棌鍒楄〃
+ async getNationList() {
+ this.nationOptions = await getTypeList(1, '05');
}
- }
+ },
+ watch: {
+ 'evidence.pic.length': {
+ handler(newLen, oldLen) {
+ if (newLen !== 0) {
+ this.$refs.evidenceForm.validate((valid) => {
+ if (valid) {
+
+ } else { return false }
+ })
+ }
+ },
+ deep: true,
+ }
+ },
+ props:['mytype']
}
</script>
<style lang="scss" scoped>
.evidence {
line-height: 60px;
position: relative;
+ .evidence-item{
+ display: flex;
+ }
.evidence-title {
line-height: 60px;
font-weight: 650;
@@ -514,12 +569,25 @@
}
.img-list {
- height: 80px;
+ height: 60px;
position: relative;
+ display: flex;
img {
width: 60px;
height: 60px;
+ }
+
+ .img {
+ height: 60px;
+ position: relative;
+ }
+
+ .myicon {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ color: #4b9bb7;
}
}
}
@@ -534,12 +602,14 @@
background-color: #fbfdff;
border-radius: 4px;
}
-.user-form{
+
+.user-form {
position: absolute;
top: 0;
z-index: 3000;
background-color: #06122c;
- .user-form-header{
+
+ .user-form-header {
background-color: #fff;
color: #4b9bb7;
display: flex;
@@ -547,17 +617,28 @@
align-items: center;
padding: 0 20px;
}
+
padding-bottom: 60px;
}
+
.user-form-content {
- padding-top:20px;
+ padding-top: 20px;
.user-item {
display: flex;
+ justify-content: flex-start;
.el-input {
flex: 1;
}
+
+ .el-select {
+ flex: 1;
+
+ :deep(.el-input__inner){
+ padding: 0px 15px;
+ }
+ }
}
::v-deep .el-textarea__inner {
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
index 73bb31f..25e713a 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
@@ -3,7 +3,7 @@
<!-- 鍒拌揪鐜板満鎯呭喌 -->
<MyArrive ref="arrive"></MyArrive>
<!-- 璋冩煡鍙栬瘉 -->
- <MyEvidence ref="evidence"></MyEvidence>
+ <MyEvidence ref="evidence" :mytype="2"></MyEvidence>
<!-- 鏂囩涔︾被 -->
<MyBook ref="book"></MyBook>
<!-- <div class="result">
@@ -70,9 +70,9 @@
illegalType: evidence.user.illegalType,
name: evidence.user.name,
phoneCode: evidence.user.phoneCode,
- certificateType: `${evidence.user.certificateType}`,
+ certificateType: evidence.user.certificateType,
certificateCode: evidence.user.certificateCode,
- educationDegree: `${evidence.user.educationDegree}`,
+ educationDegree: evidence.user.educationDegree,
career: evidence.user.career,
work: evidence.user.work,
nation: evidence.user.nation,
@@ -161,7 +161,7 @@
</script>
<style lang="scss" scoped>
.ill {
- padding: 20px 200px;
+ padding: 20px 200px 100px;
}
.footer {
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
index 5b084e3..8e9cf49 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
@@ -3,7 +3,7 @@
<!-- 鍒拌揪鐜板満鎯呭喌 -->
<MyArrive ref="arrive"></MyArrive>
<!-- 璋冩煡鍙栬瘉 -->
- <MyEvidence ref="evidence"></MyEvidence>
+ <MyEvidence ref="evidence" :mytype="1"></MyEvidence>
<!-- 搴曢儴鎸夐挳 -->
<div class="footer">
<el-button @click="handleSubmit" type="primary">纭畾</el-button>
@@ -60,9 +60,9 @@
illegalType: evidence.user.illegalType,
name: evidence.user.name,
phoneCode: evidence.user.phoneCode,
- certificateType: `${evidence.user.certificateType}`,
+ certificateType: evidence.user.certificateType,
certificateCode: evidence.user.certificateCode,
- educationDegree: `${evidence.user.educationDegree}`,
+ educationDegree: evidence.user.educationDegree,
career: evidence.user.career,
work: evidence.user.work,
nation: evidence.user.nation,
@@ -108,7 +108,7 @@
</script>
<style lang="scss" scoped>
.vio {
- padding: 20px 200px;
+ padding: 20px 200px 100px;
}
.footer {
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index 1d2757c..8384c56 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/index.vue
@@ -30,29 +30,36 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
<el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<template slot-scope="scope">
<span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
</template>
</el-table-column>
- <el-table-column prop="category" label="澶х被鍚嶇О" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'category' :'category'" :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'">
</el-table-column>
- <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
</el-table-column>
- <el-table-column prop="actionCause" label="妗堢敱" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'" :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
</el-table-column>
- <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="mystatus===1?'10' :'20' ">
+ <template slot-scope="scope">
+ <div v-if="mystatus ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div>
+ <div v-else>{{scope.row.site}}</div>
+ </template>
</el-table-column>
- <el-table-column prop="streetId" label="鎵�灞炲尯鍩�" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'" :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
</el-table-column>
- <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="10">
+ <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
+ <template slot-scope="scope">
+ <span>{{filterTime(scope.row.alarmTime)}}</span>
+ </template>
</el-table-column>
- <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'" :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
@@ -65,7 +72,8 @@
<!-- 璇︽儏椤靛睍绀� -->
<el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleClose">
- <MyDetail :info=info></MyDetail>
+ <MyDetail :info=info v-if="mystatus==1 ? true:false"></MyDetail>
+ <MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
<el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉"
@@ -106,10 +114,12 @@
import uploadVio from './updateUser/uploadResult/vio'
import uploadIll from "./updateUser/uploadResult/ill"
import MyDetail from '@/components/detail'
+import MyIllDetail from '@/components/illdetail'
+import helper from '@/utils/mydate'
export default {
components: {
// updateUser,
- uploadVio,uploadIll,MyDetail
+ uploadVio,uploadIll,MyDetail,MyIllDetail
},
data() {
return {
@@ -158,7 +168,7 @@
},
],
statusArr:[],
- mystatus:0,
+ mystatus:1,
caseId:'',
}
},
@@ -357,6 +367,9 @@
// 鍏抽棴涓婁紶鐣岄潰
closeDialog({flag}){
this.dialogUpload = flag;
+ },
+ filterTime(time){
+ return helper(time);
}
}
}
diff --git a/src/views/operate/disposal/casepool/notDeal/index.vue b/src/views/operate/disposal/casepool/notDeal/index.vue
index a46df8e..db44288 100644
--- a/src/views/operate/disposal/casepool/notDeal/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/index.vue
@@ -30,32 +30,36 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
<el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<template slot-scope="scope">
<span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
</template>
</el-table-column>
- <el-table-column prop="category" label="澶х被鍚嶇О" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'category' :'category'" :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'">
</el-table-column>
- <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
</el-table-column>
- <el-table-column prop="actionCause" label="妗堢敱" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'" :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
</el-table-column>
- <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="mystatus===1?'10' :'20' ">
+ <template slot-scope="scope">
+ <div v-if="mystatus ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div>
+ <div v-else>{{scope.row.site}}</div>
+ </template>
</el-table-column>
- <el-table-column prop="streetId" label="鎵�灞炲尯鍩�" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'" :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
</el-table-column>
- <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15">
+ <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
<template slot-scope="scope">
<span>{{filterTime(scope.row.alarmTime)}}</span>
</template>
</el-table-column>
- <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'" :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
@@ -68,7 +72,8 @@
<!-- 璇︽儏椤靛睍绀� -->
<el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleClose">
- <MyDetail :info=info></MyDetail>
+ <MyDetail :info=info v-if="mystatus==1 ? true:false"></MyDetail>
+ <MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
<el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉"
@@ -105,16 +110,14 @@
</div>
</template>
<script>
-// import updateUser from "./updateUser"
import uploadVio from './updateUser/uploadResult/vio'
import uploadIll from "./updateUser/uploadResult/ill"
import MyDetail from '@/components/detail'
import helper from '@/utils/mydate'
-import filterTime from '@/utils/mydate'
+import MyIllDetail from '@/components/illdetail'
export default {
components: {
- // updateUser,
- uploadVio,uploadIll,MyDetail
+ uploadVio,uploadIll,MyDetail,MyIllDetail
},
data() {
return {
@@ -164,7 +167,7 @@
},
],
statusArr:[],
- mystatus:0,
+ mystatus:1,
caseId:'',
}
},
diff --git a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
index 0d4cc25..01e246f 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -8,45 +8,50 @@
<div class="input-form">
<el-form ref="user" label-width="160px" autoComplete="on" :model="ill" :rules="createillRules"
label-position="right">
- <!-- 闂绫诲瀷
- <el-form-item class="optionItem" label="闂绫诲瀷:" prop="category">
- <el-select v-model="ill.type" placeholder="杩濆缓">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item> -->
- <!-- 杩濆缓绫诲埆 -->
- <el-form-item class="optionItems" label="杩濆缓绫诲埆:" prop="categoryId">
- <el-select v-model="ill.categoryId" placeholder="璇烽�夋嫨杩濆缓绫诲埆" size="small">
- <el-option v-for="item in bigKindList" :key="item.id" :label="item.name" :value="item.id"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item>
+ <div class="user-item">
+ <!-- 闂绫诲瀷 -->
+ <el-form-item class="optionItem" label="闂绫诲瀷:" prop="category">
+ <el-select v-model="ill.type" placeholder="杩濆缓" disabled>
+ <el-option v-for="item in typeList" :key="item.name" :label="item.name"
+ :value="item.value" :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 杩濆缓绫诲埆 -->
+ <el-form-item class="optionItems" label="杩濆缓绫诲埆:" prop="categoryId">
+ <el-select v-model="ill.categoryId" placeholder="璇烽�夋嫨杩濆缓绫诲埆" size="small">
+ <el-option v-for="item in bigKindList" :key="item.id" :label="item.name"
+ :value="item.id" :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
<!-- 褰撲簨浜哄鍚� -->
<el-form-item class="optionItems" label="褰撲簨浜哄鍚�:" prop="partyName">
<el-input placeholder="璇峰～鍐欏綋浜嬩汉濮撳悕" v-model="ill.partyName"></el-input>
</el-form-item>
<!-- 褰撲簨浜鸿韩浠借瘉鍙� -->
<el-form-item class="optionItems" label="褰撲簨浜鸿韩浠借瘉鍙�:" prop="partyIdCard">
- <el-input placeholder="璇峰～鍐欏綋浜嬩汉韬唤璇佸彿" v-model="ill.partyIdCard"></el-input>
+ <el-input placeholder="璇峰～鍐欏綋浜嬩汉韬唤璇佸彿" maxlength="18" v-model="ill.partyIdCard"></el-input>
</el-form-item>
<!-- 褰撲簨浜鸿仈绯荤數璇� -->
<el-form-item class="optionItem" label="褰撲簨浜鸿仈绯荤數璇�:" prop="partyPhone">
- <el-input v-model="ill.partyPhone" placeholder="璇峰～鍐欏綋浜嬩汉鑱旂郴鐢佃瘽"></el-input>
+ <el-input v-model="ill.partyPhone" maxlength="11" placeholder="璇峰～鍐欏綋浜嬩汉鑱旂郴鐢佃瘽"></el-input>
</el-form-item>
- <!-- 杩濆缓鍦扮偣 -->
- <el-form-item class="optionItems" label="杩濆缓鍦扮偣:" prop="site">
- <el-input placeholder="璇峰～鍐欒繚寤哄湴鐐�" v-model="ill.site"></el-input>
- </el-form-item>
- <!-- 鎵�灞炵ぞ鍖� -->
- <el-form-item class="optionItems" label="鎵�灞炵ぞ鍖�:" prop="communityId">
- <el-select v-model="ill.communityId" placeholder="璇烽�夋嫨鎵�灞炵ぞ鍖�">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+ <div class="user-item">
+ <!-- 杩濆缓鍦扮偣 -->
+ <el-form-item class="optionItems" label="杩濆缓鍦扮偣:" prop="site">
+ <el-input placeholder="璇峰～鍐欒繚寤哄湴鐐�" v-model="ill.site"></el-input>
+ </el-form-item>
+ <!-- 鎵�灞炵ぞ鍖� -->
+ <el-form-item class="optionItems" label="鎵�灞炵ぞ鍖�:" prop="communityId">
+ <el-select v-model="ill.communityId" placeholder="璇烽�夋嫨鎵�灞炵ぞ鍖�">
+ <el-option v-for="item in typeList" :key="item.name" :label="item.name"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
<!-- 韬唤璇佹鍙嶉潰鐓х墖 -->
<el-form-item class="optionItems" label="韬唤璇佹鍙嶉潰鐓х墖:" prop="positive">
<template>
@@ -88,13 +93,17 @@
<el-form-item class="optionItems" label="杩濆缓鍏蜂綋浣嶇疆:" prop="position">
<el-input placeholder="璇峰～鍐欒繚寤哄叿浣撲綅缃�" v-model="ill.position"></el-input>
</el-form-item>
- <el-form-item class="optionItems" label="杩濇硶寤鸿闀裤�佸銆侀珮:" prop="buildingLength">
- <div class="area">
+ <div class="area">
+ <el-form-item class="optionItems" label="杩濇硶寤鸿闀裤�佸銆侀珮:" prop="buildingLength">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingLength"></el-input>
+ </el-form-item>
+ <el-form-item class="optionItems" label-width='0px' prop="buildingWidth">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingWidth"></el-input>
+ </el-form-item>
+ <el-form-item class="optionItems" label-width='0px' prop="buildingHigh">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingHigh"></el-input>
- </div>
- </el-form-item>
+ </el-form-item>
+ </div>
<el-form-item class="optionItems" label="杩濇硶寤鸿闈㈢Н:" prop="buildingArea">
<el-input placeholder="璇峰～鍐欒繚娉曞缓璁鹃潰绉�" v-model="ill.buildingArea"></el-input>
</el-form-item>
@@ -105,7 +114,7 @@
</div>
<div class="input-footer">
<el-button type="primary" class="confirm" @click="handleUser">纭畾</el-button>
- <el-button class="back">杩斿洖</el-button>
+ <el-button class="back" @click="handleBack">杩斿洖</el-button>
</div>
</div>
<div class="map-area">
@@ -115,6 +124,7 @@
</template>
<script>
import MyMap from '@/components/map'
+import { validateName, validatePhone, validateCardId, validateNum } from '@/utils/validate'
export default {
components: {
MyMap
@@ -122,14 +132,14 @@
data() {
const checkArea = (rule, value, callback) => {
if (value) {
- callback();
+ validateNum(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑杩濇硶寤鸿闈㈢Н'))
} else {
callback(new Error('杩濇硶寤鸿闈㈢Н涓嶈兘涓虹┖'))
}
}
const checkHigh = (rule, value, callback) => {
if (value) {
- callback();
+ validateNum(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑杩濇硶寤鸿楂樺害'))
} else {
callback(new Error('杩濇硶寤鸿楂樺害涓嶈兘涓虹┖'));
@@ -137,7 +147,7 @@
}
const checkWidth = (rule, value, callback) => {
if (value) {
- callback();
+ validateNum(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑杩濇硶寤鸿瀹藉害'))
} else {
callback(new Error('杩濇硶寤鸿瀹藉害涓嶈兘涓虹┖'));
@@ -145,7 +155,7 @@
}
const checkLength = (rule, value, callback) => {
if (value) {
- callback();
+ validateNum(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑杩濇硶寤鸿闀垮害'))
} else {
callback(new Error('杩濇硶寤鸿闀垮害涓嶈兘涓虹┖'));
@@ -174,21 +184,21 @@
}
const checkIdCard = (rule, value, callback) => {
if (value) {
- callback();
+ validateCardId(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑韬唤璇佸彿鐮�'))
} else {
callback(new Error('褰撲簨浜鸿韩浠借瘉鍙风爜涓嶈兘涓虹┖'));
}
}
const checkName = (rule, value, callback) => {
if (value) {
- callback();
+ validateName(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑褰撲簨浜轰俊鎭�'))
} else {
callback(new Error('褰撲簨浜哄鍚嶄笉鑳戒负绌�'));
}
}
const checkPhone = (rule, value, callback) => {
if (value) {
- callback();
+ validatePhone(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙风爜'))
} else {
callback(new Error('褰撲簨浜鸿仈绯荤數璇濅笉鑳戒负绌�'));
}
@@ -228,27 +238,27 @@
}
return {
ill: {
- buildingArea: 2.0,
- buildingHigh: 2.0,
- buildingLength: 2.0,
- buildingWidth: 1.0,
+ buildingArea: '',
+ buildingHigh: '',
+ buildingLength: '',
+ buildingWidth: '',
// category: '',
categoryId: '',
communityId: '',
- materials: "閽㈢瓔",
- partyIdCard: "511025184612310213",
- partyName: "鍗曟暟澶�",
- partyPhone: "17844631885",
- position: "鏂板湴鏂规柊浣庣偣",
+ materials: "",
+ partyIdCard: "",
+ partyName: "",
+ partyPhone: "",
+ position: "",
positive: "",
negative: "",
- site: "鏂板湴鏂�",
+ site: "",
alarmTime: '',
},
createillRules: {
buildingArea: [
{
- required: true, trigger: 'change', validator: checkArea
+ required: true, trigger: 'blur', validator: checkArea
}
],
buildingHigh: [
@@ -331,9 +341,10 @@
}
},
created() {
- const { getBigKind } = this;
+ const { getBigKind, getCommityList } = this;
// this.ill.category = this.mytype + 1;
getBigKind();
+ getCommityList();
},
methods: {
handleUser() {
@@ -380,9 +391,6 @@
}
})
},
- handleStop() {
- this.refresh();
- },
// 鑾峰彇澶х被鍒楄〃
getBigKind() {
this.$axios({
@@ -393,7 +401,6 @@
// console.log(res);
})
},
- // 鑾峰彇琛屾斂鍖哄煙
// 鑾峰彇token
getToken() {
const token = sessionStorage.getItem('token');
@@ -412,9 +419,40 @@
const baseUrl = 'http://140.143.152.226:8410/';
console.log(res);
this.ill.negative = baseUrl + res.data.url1;
+ },
+ // 鏌ヨ绀惧尯
+ getCommityList() {
+ this.$axios({
+ method: 'get',
+ url: 'sccg/dict/query_type?level=1&typeCode=' + '10'
+ })
+ .then(res => {
+ console.log(res);
+ })
+ },
+ handleBack(){
+ this.$emit('changeDialog', { flag: false });
}
},
- props: ['mytype', 'changeDialog','refresh']
+ watch: {
+ 'ill.buildingLength': {
+ handler(newVal, oldVal) {
+ if (newVal) {
+ this.ill.buildingWidth !== '' && validateNum(newVal) && validateNum(this.ill.buildingWidth) ? this.ill.buildingArea = newVal * this.ill.buildingWidth : '';
+ }
+ },
+ deep: true,
+ },
+ 'ill.buildingWidth': {
+ handler(newVal, oldVal) {
+ if (newVal) {
+ this.ill.buildingLength !== '' && validateNum(newVal) && validateNum(this.ill.buildingLength) ? this.ill.buildingArea = newVal * this.ill.buildingLength : '';
+ }
+ },
+ deep: true,
+ }
+ },
+ props: ['mytype', 'changeDialog', 'refresh']
}
</script>
<style lang="scss" scoped>
@@ -422,8 +460,12 @@
display: flex;
padding: 20px 50px;
+ .user-item {
+ display: flex;
+ }
+
.input-area {
- flex: 1;
+ flex: 3;
padding: 10px 20px;
.input-header {
@@ -439,19 +481,24 @@
line-height: 40px;
}
}
+ .el-form {
+ &::v-deep .el-form-item__label {
+ color: #4b9bb7;
+ }
+ &::v-deep .el-input__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+
+ &::v-deep .el-textarea__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+ }
.input-form {
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
+
.upload-demo {
position: relative;
@@ -488,7 +535,7 @@
}
.map-area {
- flex: 1;
+ flex: 2;
}
}
</style>
\ No newline at end of file
diff --git a/src/views/operate/disposal/casepool/pool/createUser/index.vue b/src/views/operate/disposal/casepool/pool/createUser/index.vue
index 5fbe248..a718f75 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/index.vue
@@ -17,11 +17,7 @@
},
methods: {
toShow(idx, lab) {
- this.$confirm('鎮ㄧ‘瀹氳鍘讳笂鎶�' + lab + '浜嬩欢')
- .then(_ => {
- this.$emit('getPageProp',{flag:false,type:idx});
- })
- .catch(_ => { console.log('err') });
+ this.$emit('getPageProp',{flag:false,type:idx});
}
},
props:['getPageProp']
diff --git a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
index c58bc5a..7c84c25 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -6,42 +6,52 @@
<div class="input-header__tip">濉啓浜嬩欢鍩虹淇℃伅</div>
</div>
<div class="input-form">
- <el-form ref="user" label-width="100px" autoComplete="on" :model="vio" :rules="createRoleRules"
+ <el-form ref="user" label-width="120px" autoComplete="on" :model="vio" :rules="createRoleRules"
label-position="right">
- <!-- 闂绫诲瀷 -->
- <el-form-item class="optionItem" label="闂绫诲瀷:" prop="category">
- <el-select v-model="vio.category" placeholder="杩濊" disabled>
- <el-option v-for="item in typeList" :key="item.label" :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 澶х被鍚嶇О -->
- <el-form-item class="optionItems" label="澶х被鍚嶇О:" prop="categoryId">
- <el-select v-model="vio.categoryId" placeholder="璇烽�夋嫨澶х被鍚嶇О">
- <el-option v-for="item in bigKindList" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 灏忕被鍚嶇О -->
- <el-form-item class="optionItems" label="灏忕被鍚嶇О:" prop="typeId">
- <el-select v-model="vio.typeId" placeholder="璇烽�夋嫨灏忕被鍚嶇О">
- <el-option v-for="item in smallKindList" :key="item.id" :label="item.name" :value="item.id"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 浜嬩欢绛夌骇 -->
- <el-form-item class="optionItems" label="浜嬩欢绛夌骇:" prop="gradeId">
- <el-select v-model="vio.gradeId" placeholder="璇烽�夋嫨妗堜欢绛夌骇">
- <el-option v-for="item in eventLevelList" :key="item.id" :label="item.name" :value="item.id"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item>
+ <div class="user-item">
+ <!-- 闂绫诲瀷 -->
+ <el-form-item class="optionItem" label="闂绫诲瀷:" prop="category">
+ <el-select v-model="vio.category" placeholder="杩濊" disabled>
+ <el-option v-for="item in typeList" :key="item.label" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 澶х被鍚嶇О -->
+ <el-form-item class="optionItems" label="澶х被鍚嶇О:" prop="categoryId">
+ <el-select v-model="vio.categoryId" placeholder="璇烽�夋嫨澶х被鍚嶇О" @change="handleBigKindChange">
+ <el-option v-for="item in bigKindList" :key="item.id" :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div class="user-item">
+ <!-- 灏忕被鍚嶇О -->
+ <el-form-item class="optionItems" label="灏忕被鍚嶇О:" prop="typeId" >
+ <el-select v-model="vio.typeId" placeholder="璇烽�夋嫨灏忕被鍚嶇О" @change="handleSmallKindChange">
+ <el-option v-for="item in smallKindList" :key="item.id" :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 浜嬩欢绛夌骇 -->
+ <el-form-item class="optionItems" label="浜嬩欢绛夌骇:" prop="gradeId">
+ <el-select v-model="vio.gradeId" placeholder="璇烽�夋嫨妗堜欢绛夌骇">
+ <el-option v-for="item in eventLevelList" :key="item.id" :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
<!-- 妗堢敱 -->
<el-form-item class="optionItem" label="妗堢敱:" prop="actionCause">
- <el-input v-model="vio.actionCause" placeholder="璇疯緭鍏ユ鐢�"></el-input>
+ <el-select v-model="vio.actionCause" placeholder="璇疯緭鍏ユ鐢�">
+ <el-option v-for="item in anYouList" :key="item.id" :label="item.name"
+ :value="item.id" >
+ </el-option>
+ </el-select>
+ <!-- <el-input v-model="vio.actionCause" placeholder="璇疯緭鍏ユ鐢�"></el-input> -->
</el-form-item>
<!-- 鎵�灞炲尯鍘� -->
<!-- <el-form-item class="optionItems" label="鎵�灞炲尯鍘�:" prop="status">
@@ -51,69 +61,73 @@
</el-option>
</el-select>
</el-form-item> -->
- <!-- 鎵�灞炶閬� -->
- <el-form-item class="optionItems" label="鎵�灞炶閬�:" prop="streetId">
- <el-select v-model="vio.streetId" placeholder="璇烽�夋嫨鎵�灞炶閬�" @change="handleStreet">
- <el-option v-for="item in streetList" :key="item.id" :label="item.name" :value="item.id"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 鎵�灞炵ぞ鍖� -->
- <el-form-item class="optionItems" label="鎵�灞炵ぞ鍖�:" prop="communityId">
- <el-select v-model="vio.communityId" placeholder="璇烽�夋嫨鎵�灞炵ぞ鍖�">
- <el-option v-for="item in communityList" :key="item.id" :label="item.name" :value="item.id"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item>
+ <div class="user-item">
+ <!-- 鎵�灞炶閬� -->
+ <el-form-item class="optionItems" label="鎵�灞炶閬�:" prop="streetId">
+ <el-select v-model="vio.streetId" placeholder="璇烽�夋嫨鎵�灞炶閬�" @change="handleStreet">
+ <el-option v-for="item in streetList" :key="item.id" :label="item.name" :value="item.id"
+ :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鎵�灞炵ぞ鍖� -->
+ <el-form-item class="optionItems" label="鎵�灞炵ぞ鍖�:" prop="communityId">
+ <el-select v-model="vio.communityId" placeholder="璇烽�夋嫨鎵�灞炵ぞ鍖�">
+ <el-option v-for="item in communityList" :key="item.id" :label="item.name"
+ :value="item.id" :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
<!-- 浜嬪彂鍦扮偣 -->
<el-form-item class="optionItems" label="浜嬪彂鍦扮偣:" prop="site">
<el-input placeholder="璇疯緭鍏ヤ簨鍙戝湴璇︾粏浣嶇疆" v-model="vio.site"></el-input>
</el-form-item>
- <!-- 鏄惁鍏宠仈鍟嗛摵 -->
- <el-form-item class="optionItems" label="鏄惁鍏宠仈鍟嗛摵:" prop="linkShop">
- <el-radio-group v-model="vio.linkShop">
- <el-radio :label="1">鏄�</el-radio>
- <el-radio :label="0">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- <!-- 鍏宠仈鍟嗛摵鍚嶇О -->
- <el-form-item class="optionItems" label="鍏宠仈鍟嗛摵鍚嶇О:" prop="shopName">
- <el-input placeholder="璇峰～鍐欏叧鑱斿晢閾哄悕绉�" v-model="vio.shopName"
- :disabled="vio.linkShop === 1 ?false : true"></el-input>
- </el-form-item>
+ <div class="user-item">
+ <!-- 鏄惁鍏宠仈鍟嗛摵 -->
+ <el-form-item class="optionItems" label="鏄惁鍏宠仈鍟嗛摵:" prop="linkShop">
+ <el-radio-group v-model="vio.linkShop" @change="handleLinkShop">
+ <el-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <!-- 鍏宠仈鍟嗛摵鍚嶇О -->
+ <el-form-item class="optionItems" label="鍏宠仈鍟嗛摵鍚嶇О:" prop="shopName">
+ <el-input placeholder="璇峰～鍐欏叧鑱斿晢閾哄悕绉�" v-model="vio.shopName"
+ :disabled="vio.linkShop === 1 ?false : true"></el-input>
+ </el-form-item>
+ </div>
<!-- 濉啓杞︾墝鍙� -->
<el-form-item class="optionItems" label="濉啓杞︾墝鍙�:" prop="carNumber">
<el-input placeholder="璇峰～鍐欒溅鐗屽彿" v-model="vio.carNumber"></el-input>
</el-form-item>
<!-- 闂鎻忚堪 -->
<el-form-item class="optionItems" label="闂鎻忚堪:" prop="description">
- <el-input type="textarea" maxlength="200" placeholder="璇疯緭鍏ュ唴瀹�200瀛椾互鍐�" v-model="vio.description"></el-input>
+ <el-input type="textarea" :rows="5" maxlength="200" placeholder="璇疯緭鍏ュ唴瀹�200瀛椾互鍐�"
+ v-model="vio.description">
+ </el-input>
</el-form-item>
<!-- 鎶ヨ鏃堕棿 -->
<el-form-item class="optionItems" label="鎶ヨ鏃堕棿:" prop="alarmTime">
<el-date-picker v-model="vio.alarmTime" type="datetime" placeholder="閫夋嫨鎶ヨ鏃堕棿">
</el-date-picker>
</el-form-item>
+ <!-- 濉啓鍙嶆槧浜轰俊鎭� -->
+ <el-form-item class="optionItems" label="濉啓鍙嶆槧浜轰俊鎭�">
+ </el-form-item>
+ <!-- 鍙嶆槧浜烘儏鍐� -->
+ <div class="user-item">
+ <el-form-item class="optionItems" label="鍙嶆槧浜�:" prop="informant">
+ <el-input v-model="vio.informant"></el-input>
+ </el-form-item>
+ <el-form-item class="optionItems" label="鑱旂郴鏂瑰紡:" prop="informantPhoneCode">
+ <el-input v-model="vio.informantPhoneCode"></el-input>
+ </el-form-item>
+ </div>
+ <el-form-item class="optionItems" label="韬唤璇佸彿:" prop="informantIdCard">
+ <el-input v-model="vio.informantIdCard"></el-input>
+ </el-form-item>
</el-form>
- </div>
- <div class="not-need">
- <div class="not-need__header">
- 濉啓鍙嶆槧浜轰俊鎭�
- </div>
- <div class="not-need-item">
- <label>鍙嶆槧浜�:</label>
- <el-input v-model="vio.informant"></el-input>
- </div>
- <div class="not-need-item">
- <label>鑱旂郴鏂瑰紡:</label>
- <el-input v-model="vio.informantPhoneCode"></el-input>
- </div>
- <div class="not-need-item">
- <label>韬唤璇佸彿:</label>
- <el-input v-model="vio.informantIdCard"></el-input>
- </div>
</div>
<div class="input-footer">
<el-button type="primary" class="confirm" @click="handleSubmit">纭畾</el-button>
@@ -127,6 +141,7 @@
</template>
<script>
import MyMap from '@/components/map'
+import { validateName, validatePhone, validateCarNum } from '@/utils/validate'
export default {
components: {
MyMap
@@ -195,6 +210,49 @@
callback(new Error('鎶ヨ鏃堕棿涓嶈兘涓虹┖'))
}
}
+ const checkCarNumber = (rule, value, callback) => {
+ if (value) {
+ if (validateCarNum(value)) {
+ callback();
+ } else {
+ callback(new Error('璇疯緭鍏ユ纭殑杞︾墝鍙�'));
+ }
+ } else {
+ callback(new Error("杞︾墝鍙蜂笉鑳戒负绌�"))
+ }
+ }
+ const checkName = (rule, value, callback) => {
+ if (value) {
+ validateName(value) ? callback():callback(new Error('璇疯緭鍏ユ纭殑濮撳悕'))
+ } else {
+ callback()
+ }
+ }
+ const checkCardId = (rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ callback()
+ }
+ }
+ const checkPhone = (rule, value, callback) => {
+ if (value) {
+ validatePhone(value) ? callback():callback(new Error('璇疯緭鍏ユ纭殑鎵嬫満鍙�'));
+ } else {
+ callback()
+ }
+ }
+ const checkLink = (rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ if(this.vio.linkShop===1){
+ callback(new Error('鍏宠仈鍟嗛摵鍚嶅瓧涓嶈兘涓虹┖'));
+ }else{
+ callback();
+ }
+ }
+ }
return {
vio: {
actionCause: "",//妗堢敱
@@ -224,7 +282,7 @@
//杞︾墝鍙�
carNumber: [
{
- required: false,
+ required: true, trigger: 'blur', validator: checkCarNumber
}
],
//澶х被
@@ -245,11 +303,27 @@
required: true, trigger: 'blur', validator: checkDesc
}
],
- // informant:"澶ц嫃鎵�",//鍙嶆槧浜�
- // informantIdCard:"51102519910082831",//韬唤璇佸彿鐮�
- // informantPhoneCode:"17844631885",//鍙嶆槧浜鸿仈绯绘柟寮�
+ informant:[
+ {
+ required: false, trigger: 'blur', validator: checkName
+ }
+ ],
+ informantIdCard:[
+ {
+ required: false, trigger: 'blur', validator: checkCardId
+ }
+ ],
+ informantPhoneCode:[
+ {
+ required: false, trigger: 'blur', validator: checkPhone
+ }
+ ],
// linkShop:0,//鏄惁鍏宠仈鍟嗛摵(0鍚�1鏄�)
- // shopName:"",//鍏宠仈鍟嗛摵鍚嶇О
+ shopName:[
+ {
+ required: false, trigger: 'blur', validator: checkLink
+ }
+ ],
//浜嬪彂鍦扮偣
site: [
{
@@ -294,42 +368,69 @@
value: 2.
}
],
- streetList:[],
- communityList:[],
+ streetList: [],
+ communityList: [],
+ anYouList:[],
}
},
created() {
- const { getBigKind, getEventLevel, getSmallKind,getStreetList } = this;
+ const { setBigKindList,getStreetList,getEventLevel } = this;
console.log(this.mytype);
this.vio.category = this.mytype + 1;
- getBigKind();
- getSmallKind();
- getEventLevel();
+ setBigKindList();
getStreetList();
+ getEventLevel();
},
methods: {
handleStop() {
this.refresh();
},
- // 鑾峰彇澶х被鍒楄〃
- getBigKind() {
- this.$axios({
- method: 'get',
- url: 'sccg/violations/query/type_first'
- }).then(res => {
- this.bigKindList = res.data;
- // console.log(res);
+ // 璁剧疆澶х被
+ async setBigKindList(){
+ this.bigKindList = await this.getBigKind();
+ },
+ // 璁剧疆灏忕被
+ async setSmallKindList(id){
+ let arr = await this.getSmallKind();
+ this.smallKindList = arr.filter(item=>{
+ if(item.parentId===id){
+ return item;
+ }
})
},
- // 鑾峰彇灏忕被鍒楄〃
- getSmallKind() {
- this.$axios({
+ // 璁剧疆妗堢敱
+ async setAnYouList(id){
+ let arr = await this.getAnYouList();
+ this.anYouList = arr.filter(item=>{
+ if(item.parentId===id){
+ return item;
+ }
+ })
+ console.log(this.anYouList);
+ },
+ // 鏌ヨ澶х被鍒楄〃
+ async getBigKind() {
+ let arr = [];
+ await this.$axios({
method: 'get',
- url: 'sccg/violations/query/type_second'
+ url: "sccg/violations/query/type_second",
})
.then(res => {
- this.smallKindList = res.data;
+ arr = res.data;
})
+ return arr
+ },
+ // 鑾峰彇灏忕被鍒楄〃
+ async getSmallKind() {
+ let arr = [];
+ await this.$axios({
+ method: 'get',
+ url: "sccg/violations/query/type_third",
+ })
+ .then(res => {
+ arr = res.data;
+ })
+ return arr
},
// 鑾峰彇妗堜欢绛夌骇鍒楄〃
getEventLevel() {
@@ -340,6 +441,19 @@
.then(res => {
this.eventLevelList = res.data;
})
+ },
+ // 鏌ヨ鎵�灞炴鐢�
+ async getAnYouList() {
+ let arr = [];
+ await this.$axios({
+ method: 'get',
+ url: 'sccg/violations/query/type_four'
+ })
+ .then(res => {
+ arr = res.data;
+ console.log(res);
+ })
+ return arr;
},
// 鎻愪氦娉ㄥ唽淇℃伅
handleSubmit() {
@@ -373,32 +487,48 @@
})
},
// 杩斿洖
- handleBack(){
- this.$emit('changeDialog',{flag:false})
+ handleBack() {
+ this.$emit('changeDialog', { flag: false })
},
// 鑾峰彇琛楅亾淇℃伅
- getStreetList(){
+ getStreetList() {
this.$axios({
- method:'get',
- url:'sccg/dict/query_Street_type'
+ method: 'get',
+ url: 'sccg/dict/query_Street_type'
})
- .then(res=>{
- this.streetList = res.data;
- })
+ .then(res => {
+ this.streetList = res.data;
+ })
},
// 琛楅亾鏇存敼
- handleStreet(id){
+ handleStreet(id) {
console.log(id);
+ this.vio.communityId = '';
this.$axios({
- method:'get',
- url:'sccg/dict/query_social_type?id='+id
+ method: 'get',
+ url: 'sccg/dict/query_social_type?id=' + id
})
- .then(res=>{
- this.communityList = res.data;
- })
- }
+ .then(res => {
+ this.communityList = res.data;
+ })
+ },
+ // 鍏宠仈鍟嗛摵
+ handleLinkShop(value) {
+ value === 0 ? this.vio.shopName = '' : '';
+ },
+ // 澶х被閫変腑
+ handleBigKindChange(id){
+ this.vio.actionCause = '';
+ this.vio.typeId = '';
+ this.setSmallKindList(id);
+ },
+ // 灏忕被閫変腑
+ handleSmallKindChange(id){
+ this.vio.actionCause = '';
+ this.setAnYouList(id);
+ }
},
- props: ['mytype', 'changeDialog','refresh']
+ props: ['mytype', 'changeDialog', 'refresh']
}
</script>
<style lang="scss" scoped>
@@ -422,6 +552,11 @@
.input-header__tip {
line-height: 40px;
}
+ }
+
+ .user-item {
+ display: flex;
+ justify-content: space-between;
}
.input-form {
@@ -459,6 +594,19 @@
line-height: 40px;
}
+ .my-sp-item {
+ display: flex;
+
+ .not-item-left,
+ .not-item-right {
+ display: flex;
+
+ .el-input {
+ flex: 1;
+ }
+ }
+ }
+
.not-need-item {
line-height: 40px;
margin-bottom: 22px;
@@ -470,6 +618,10 @@
text-align: right;
}
+ .el-input {
+ flex: 1;
+ }
+
.not-need__inner {
flex: 1;
line-height: 40px;
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index 6ca0536..85326c7 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -24,7 +24,7 @@
</el-dialog>
<!-- 浜嬩欢鐧昏 -->
<el-dialog :before-close="handleClose" :visible.sync="dialogNewAdd"
- :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏' " width="60%" v-if="dialogNewAdd">
+ :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏' " width="80%" v-if="dialogNewAdd">
<!-- 杩濆缓鐧昏 -->
<MyIll v-if="newAddType === 1" :refresh="getUserList" :mytype=newAddType
@changeDialog=changeDialog />
@@ -52,29 +52,29 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
<el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<template slot-scope="scope">
<span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
</template>
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'category' :'category'" :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'category' :'category'" :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'">
</el-table-column>
<el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
</el-table-column>
<el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'" :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="mystatus===1?'10' :'20' ">
<template slot-scope="scope">
<div v-if="mystatus ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div>
<div v-else>{{scope.row.site}}</div>
</template>
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'streetId' :'buildingArea'" :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'" :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
</el-table-column>
<el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
<template slot-scope="scope">
diff --git a/src/views/operate/management/myIndex/components/closure/index.vue b/src/views/operate/management/myIndex/components/closure/index.vue
index 3336c6f..bddc83d 100644
--- a/src/views/operate/management/myIndex/components/closure/index.vue
+++ b/src/views/operate/management/myIndex/components/closure/index.vue
@@ -125,7 +125,7 @@
if (value) {
callback();
} else {
- callback(new Error('瀹℃牳鎰忚涓嶈兘涓虹┖'))
+ callback()
}
}
const checkFinal = (rule, value, callback) => {
@@ -196,7 +196,7 @@
// 鎻愪氦瀹℃牳鎰忚
handleSubmit() {
const { baseCase } = this;
- this.$refs.viewForm.validate((valid) => {
+ this.$refs.opinionForm.validate((valid) => {
if (valid) {
this.$axios({
method: 'put',
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index b6c7593..62b985a 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -162,28 +162,34 @@
handleSubmit(mystatus) {
// this.getUserLoginInfo();
const { baseCase } = this;
- this.$axios({
- method: 'post',
- url: 'sccg/check_handle/check',
- data: {
- baseCaseId: baseCase.id,
- checkOpinion: baseCase.auditOpinion,
- currentUser: baseCase.createUser,
- status: mystatus,
+ this.$refs.viewForm.validate((valid) => {
+ if (valid) {
+ this.$axios({
+ method: 'post',
+ url: 'sccg/check_handle/check',
+ data: {
+ baseCaseId: baseCase.id,
+ checkOpinion: baseCase.auditOpinion,
+ currentUser: baseCase.createUser,
+ status: mystatus,
+ }
+ })
+ .then(res => {
+ console.log(res);
+ if (res.code === 200) {
+ this.$message({
+ type: 'success',
+ message: mystatus === 0 ? '椹冲洖鎴愬姛' : '瀹℃牳閫氳繃'
+ })
+ this.$emit('closeDialog', { flag: false });
+ }
+
+ })
+ .catch(err => { console.log(err) });
+ }else{
+ return false;
}
})
- .then(res => {
- console.log(res);
- if (res.code === 200) {
- this.$message({
- type: 'success',
- message: mystatus === 0 ? '椹冲洖鎴愬姛' : '瀹℃牳閫氳繃'
- })
- this.$emit('closeDialog', { flag: false });
- }
-
- })
- .catch(err => { console.log(err) });
},
// 鑾峰彇褰撳墠鐢ㄦ埛鐧诲綍淇℃伅
getUserLoginInfo() {
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index 29122f9..ede3dd1 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -26,34 +26,42 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
<el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
+ <template slot-scope="scope">
+ <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
+ </template>
</el-table-column>
- <el-table-column prop="category" label="澶х被鍚嶇О" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'category' :'category'" :label="myproblem===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="myproblem===1?'10':'20'">
</el-table-column>
- <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'type' :'site'" :label="myproblem===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
</el-table-column>
- <el-table-column prop="actionCause" label="妗堢敱" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'actionCause' :'communityId'" :label="myproblem===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
</el-table-column>
- <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'site' :''" :label="myproblem===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="myproblem===1?'10' :'20' ">
+ <template slot-scope="scope">
+ <div v-if="myproblem ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div>
+ <div v-else>{{scope.row.site}}</div>
+ </template>
</el-table-column>
- <el-table-column prop="streetId" label="鎵�灞炲尯鍩�" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'street' :'buildingArea'" :label="myproblem===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
</el-table-column>
- <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15">
+ <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="myproblem===1">
<template slot-scope="scope">
<span>{{filterTime(scope.row.alarmTime)}}</span>
</template>
</el-table-column>
- <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'continueTime' :'materials'" :label="myproblem===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
<div class="btn">
- <span @click="handleExamine(scope.row)" v-if="instatus===7 ? true : false">瀹℃牳</span>
+ <!-- v-if="instatus===7 ? true : false" -->
+ <span @click="handleExamine(scope.row)" v-if="instatus===7">瀹℃牳</span>
<!-- <span class="line" v-if="instatus===7 ? true : false">|</span> -->
<span @click="handleClosure(scope.row)" v-if="instatus===8">缁撴</span>
</div>
diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue
index 9edcb79..247400f 100644
--- a/src/views/systemSetting/baseSetting/role/index.vue
+++ b/src/views/systemSetting/baseSetting/role/index.vue
@@ -40,8 +40,9 @@
</el-table-column>
<el-table-column prop="status" label="鍚敤" min-width="5">
<template slot-scope="scope">
- <el-switch class="switchStyle" v-model="scope.row.status" active-text="寮�" inactive-text="鍏�"
- active-color="#3fef9a" inactive-color="#000212" @change="handleChangeStatus(scope.row)">
+ <!-- active-text="寮�" inactive-text="鍏�" -->
+ <el-switch class="switchStyle" v-model="scope.row.status"
+ active-color="#3fef9a" inactive-color="#000212" disabled>
</el-switch>
</template>
</el-table-column>
@@ -55,7 +56,7 @@
<!-- <span>鍒犻櫎</span> -->
<span @click="handleUpdate(scope.row)">鏉冮檺璁剧疆</span>
<span class="line">|</span>
- <span @click="handleStop(scope.row)">鍋滅敤</span>
+ <span @click="handleChangeStatus(scope.row)">{{scope.row.status === true ?'鍋滅敤':'鍚敤' }}</span>
<span class="line">|</span>
<span @click="handleDelete([scope.row.id])">鍒犻櫎</span>
</div>
@@ -252,19 +253,12 @@
// 淇敼鐢ㄦ埛鐘舵��
handleChangeStatus(obj) {
let { id, status } = obj;
- status == true ? status = 1 : status = 0;
- console.log(id, status);
+ status == true ? status = 0 : status = 1;
this.$axios.post(`/sccg/role/updateStatus/` + id + '?status=' + status).then(res => {
- console.log(res);
+ if(res.code ===200){
+ this.search();
+ }
})
- },
- handleStop(obj) {
- // let { id, status } = obj;
- // status == true ? status = 1 : status = 0;
- // console.log(id, status);
- // this.$axios.post(`/sccg/role/updateStatus/` + id + '?status=' + status).then(res => {
- // this.getUserList();
- // })
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
@@ -354,6 +348,7 @@
.then(_ => {
this.dialogUpdate = false;
this.dialogCreate = false;
+ this.updateFlag = false;
done();
})
.catch(_ => { });
diff --git a/src/views/systemSetting/baseSetting/role/updateUser/index.vue b/src/views/systemSetting/baseSetting/role/updateUser/index.vue
index 295bcbe..c7940b3 100644
--- a/src/views/systemSetting/baseSetting/role/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/role/updateUser/index.vue
@@ -8,8 +8,8 @@
:default-checked-keys="checkedIds" default-expand-all node-key="id">
</el-tree>
</div>
- <div class="my-tree__bottom"></div>
- <div class="my-tree__right"></div>
+ <!-- <div class="my-tree__bottom"></div> -->
+ <!-- <div class="my-tree__right"></div> -->
</div>
<div class="selection">
<el-button class="cancel" @click="resetRole">鍙栨秷</el-button>
@@ -129,7 +129,7 @@
border-radius: 4px;
.my-tree__wrap {
- overflow: scroll;
+ overflow-y: scroll;
height: 200px;
}
diff --git a/src/views/systemSetting/baseSetting/role/viewRole/index.vue b/src/views/systemSetting/baseSetting/role/viewRole/index.vue
index 1d029ac..9577cb9 100644
--- a/src/views/systemSetting/baseSetting/role/viewRole/index.vue
+++ b/src/views/systemSetting/baseSetting/role/viewRole/index.vue
@@ -8,6 +8,10 @@
<el-form-item class="optionItem" label="瑙掕壊鍚嶇О:" prop="name">
<el-input v-model="role.name" placeholder="璇峰～鍐欒鑹插悕绉�" disabled></el-input>
</el-form-item>
+ <!-- 瑙掕壊绫诲瀷 -->
+ <el-form-item class="optionItem" label="瑙掕壊绫诲瀷:" prop="roleType">
+ <el-input v-model="role.roleType" placeholder="璇烽�夋嫨瑙掕壊绫诲瀷" disabled></el-input>
+ </el-form-item>
<!-- 瑙掕壊鎻忚堪 -->
<el-form-item class="optionItem" label="瑙掕壊鎻忚堪:" prop="description">
<el-input type="textarea" v-model="role.description" placeholder="璇疯緭鍏ユ弿杩板唴瀹�200瀛椾互鍐�" disabled></el-input>
diff --git a/src/views/systemSetting/baseSetting/user/components/header/index.vue b/src/views/systemSetting/baseSetting/user/components/header/index.vue
index eeb8562..48daecc 100644
--- a/src/views/systemSetting/baseSetting/user/components/header/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/header/index.vue
@@ -3,7 +3,7 @@
<div class="headerContent">
<div class="search">
<span>绛涢�夋潯浠�:</span>
- <el-input placeholder="璇疯緭鍏ユ墜鏈哄彿杩涜鏌ヨ" v-model="search"></el-input>
+ <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="search"></el-input>
<div class="findBtn">
<el-button type="primary" @click="setSearch">鏌ヨ</el-button>
</div>
diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue
index bd93221..c6a8e69 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -388,11 +388,11 @@
border: 1pox solid #fff;
.mainTitle {
- line-height: 60px;
+ line-height:60px;
}
.tools {
- display: flex;
+ display : flex;
justify-content: space-between;
align-items: center;
padding: 0 20px;
diff --git a/src/views/systemSetting/baseSetting/user/components/password/index.vue b/src/views/systemSetting/baseSetting/user/components/password/index.vue
index 95d0c19..90e5ed3 100644
--- a/src/views/systemSetting/baseSetting/user/components/password/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/password/index.vue
@@ -123,6 +123,7 @@
// 娓呯┖琛ㄥ崟
resetForm() {
this.$refs.pwd.resetFields();
+ this.$emit('closeDialog',{flag:false});
}
}
}
--
Gitblit v1.8.0