From ccedc2e714c01d51f8eb986c6549ea701811f4bb Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期六, 08 十月 2022 18:07:44 +0800
Subject: [PATCH] 新增运营管理中基础设置的违规违建类型添加,添加一些取消按钮的实现
---
src/views/operate/baseSetting/violation/updateUser/index.vue | 5
src/views/operate/fivepack/shop/components/main/index.vue | 36 +--
src/views/operate/baseSetting/illegalBuild/index.vue | 12
src/views/operate/management/myIndex/components/closure/index.vue | 7
src/views/operate/baseSetting/illegalBuild/updateUser/index.vue | 2
src/views/systemSetting/baseSetting/user/components/password/index.vue | 2
src/views/operate/baseSetting/violation/index.vue | 17
src/views/operate/management/myIndex/components/examine/index.vue | 50 ++--
src/views/systemSetting/baseSetting/role/updateUser/index.vue | 5
src/views/operate/disposal/casepool/dispatch/index.vue | 4
src/views/operate/disposal/casepool/pool/index.vue | 24 +
src/views/operate/baseSetting/illegalBuild/createUser/index.vue | 150 +++++++-----
src/views/operate/disposal/casepool/learn/index.vue | 6
src/views/operate/baseSetting/violation/createUser/index.vue | 167 +++++++++-----
src/views/operate/disposal/casepool/notDeal/index.vue | 6
src/views/systemSetting/baseSetting/role/viewRole/index.vue | 116 ++++++++++
src/views/operate/management/myIndex/index.vue | 24 +
src/views/systemSetting/baseSetting/role/index.vue | 20 +
18 files changed, 429 insertions(+), 224 deletions(-)
diff --git a/src/views/operate/baseSetting/illegalBuild/createUser/index.vue b/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
index 1f6c235..5c0ddeb 100644
--- a/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
@@ -2,35 +2,24 @@
<div class="createUser">
<main>
<div class="mainContent">
- <el-form ref="user" :rules="createIll" label-width="140px" autoComplete="on" :model="things" label-position="right">
- <!-- 杩濊浜嬮」缂栧彿 -->
- <!-- <el-form-item class="optionItem" label="杩濊浜嬮」缂栧彿:" prop="number">
- <el-input v-model="things.number" placeholder="璇峰～鍐欒繚瑙勪簨椤圭紪鍙�"></el-input>
- </el-form-item> -->
+ <el-form ref="user" :rules="createIll" label-width="140px" autoComplete="on" :model="things"
+ label-position="right">
+ <!-- 鏂板鐨勭被鍨嬫垨澶х被鎴栧皬绫� -->
<el-form-item class="optionItem" label="鏂板鍚嶇О:" prop="name">
<el-input v-model="things.name" placeholder="璇疯緭鍏ユ柊澧炲悕绉�"></el-input>
</el-form-item>
- <!-- 鎵�灞炵被鍨� -->
- <el-form-item class="optionItems" label="鎵�灞炵被鍨�:" prop="typeThird">
- <el-select v-model="things.typeThird" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" >
- <el-option v-for="item in typeThirdList" :key="item.id" :label="item.name"
- :value="item.id">
+ <!-- 璇烽�夋嫨绾у埆 -->
+ <el-form-item class="optionItem" label="绾у埆:" prop="level">
+ <el-select v-model="things.level" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" @change="resetParentList">
+ <el-option v-for="item in levelList" :key="item.value" :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</el-form-item>
- <!-- 鎵�灞炲ぇ绫� -->
- <el-form-item class="optionItem" label="鎵�灞炲ぇ绫�:" prop="typeSecond">
- <el-select v-model="things.typeSecond" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" >
- <el-option v-for="item in typeSecondList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 璇疯緭鍏ユ柊澧炵瓑绾� -->
- <el-form-item class="optionItem" label="妗堜欢绛夌骇:" prop="level">
- <el-select v-model="things.level" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" >
- <el-option v-for="item in eventLevelList" :key="item.id" :label="item.name"
- :value="item.id">
+ <!-- 鐖剁骇id -->
+ <el-form-item class="optionItem" label="鐖剁骇:" prop="parentId">
+ <el-select v-model="things.parentId" placeholder="璇烽�夋嫨鎵�灞炵埗绾�">
+ <el-option v-for="item in parentList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -40,8 +29,7 @@
</el-form-item>
<el-form-item>
<div class="optionBtn">
- <!-- @click.native.prevent="handleSubmit" -->
- <el-button type="primary" class="btn submit" >纭
+ <el-button type="primary" class="btn submit" @click.native.prevent="handleSubmit">纭
</el-button>
</div>
</el-form-item>
@@ -54,51 +42,50 @@
<script>
export default {
data() {
- const checkName = (rule,value,callback)=>{
- if(value){
+ const checkName = (rule, value, callback) => {
+ if (value) {
callback();
- }else{
+ } else {
callback(new Error('鏂板杩濆缓绫诲悕涓嶈兘涓虹┖'));
}
}
- const checkLevel = (rule,value,callback)=>{
- if(value){
+ const checkLevel = (rule, value, callback) => {
+ if (value) {
callback();
- }else{
+ } else {
callback(new Error('鏂板杩濆缓绛夌骇涓嶈兘涓虹┖'));
}
}
return {
things: {
- number: 0,
- type: '',
name:'',
- typeFirst: '',
- typeSecond: '',
- typeThird: '',
+ parentId:'',
level:'',
},
- roleList: [],
- typeThirdList:[],
- typeSecondList:[],
- eventLevelList:[],
- createIll:{
- name:[
- { required:true,trigger:'blur',validator:checkName }
+ parentList: [],
+ createIll: {
+ name: [
+ { required: true, trigger: 'blur', validator: checkName }
],
- level:[
+ level: [
{
- required:true,trigger:'change',validator:checkLevel
+ required: true, trigger: 'change', validator: checkLevel
}
]
- }
+ },
+ levelList: [
+ {
+ label: "杩濆缓涓被鍨�",
+ value: 1,
+ },
+ {
+ label: "绫诲埆",
+ value: 2,
+ },
+ ],
}
},
created() {
- // 鑾峰彇鎵�灞炵被鍨嬪垪琛�
- this.getTypeThird();
- this.getTypeSecond();
- this.getEventLevel();
},
methods: {
// 鏌ヨ鎵�灞炵被鍨�
@@ -108,32 +95,69 @@
url: "sccg/illegal_building/query/type_first",
})
.then(res => {
- this.typeThirdList = res.data;
+ this.parentList = res.data;
})
},
// 鏌ヨ鎵�灞炲ぇ绫�
- getTypeSecond(){
+ getTypeSecond() {
this.$axios({
method: 'get',
url: "sccg/illegal_building/query/type_second",
})
.then(res => {
- this.typeSecondList = res.data;
+ this.parentList = res.data;
})
},
- // 鑾峰彇妗堜欢绛夌骇鍒楄〃
- getEventLevel() {
- this.$axios({
- method: 'get',
- url: 'sccg/violations/query/event_type'
+ // 鎻愪氦鏂板杩濊绫诲瀷
+ handleSubmit() {
+ console.log(this.things);
+ this.$refs.user.validate((valid) => {
+ console.log(valid);
+ if (valid) {
+ const { things } = this;
+ this.$axios({
+ method: 'post',
+ url: 'sccg/illegal_building/addition/type',
+ data: {
+ code: '1111',
+ level: things.parentId === '' ? things.level : things.level + 1,
+ name: things.name,
+ parentId: things.parentId === '' ? 0 : things.parentId,
+ typeCode: '06',
+ typeName: '杩濆缓绫诲瀷',
+ remark: things.type,
+ }
+ })
+ .then(res => {
+ console.log(res);
+ if (res.code === 200) {
+ this.$message({
+ type: 'success',
+ message: '娣诲姞鎴愬姛'
+ })
+ this.$emit('changeDialog', { flag: false });
+ } else {
+ this.$message({
+ type: 'error',
+ message: "娣诲姞澶辫触"
+ })
+ }
+ })
+ } else {
+ return false;
+ }
})
- .then(res => {
- console.log(res);
- this.eventLevelList = res.data;
- })
},
+ // 妗堜欢绾у埆鍙樺寲
+ resetParentList(index) {
+ if (index === 1) {
+ this.getTypeThird();
+ }else {
+ this.getTypeSecond();
+ }
+ }
},
- props: ['getUserList']
+ props: ['changeDialog']
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/baseSetting/illegalBuild/index.vue b/src/views/operate/baseSetting/illegalBuild/index.vue
index 11b5b3a..91fd871 100644
--- a/src/views/operate/baseSetting/illegalBuild/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/index.vue
@@ -16,7 +16,7 @@
<el-button class="addBtn" type="primary" @click="dialogCreate = true">鏂板杩濆缓</el-button>
<el-dialog :visible.sync="dialogCreate" title="鏂板杩濆缓" width="45%" v-if="dialogCreate"
:before-close="handleClose">
- <createUser :refresh="getUserList" />
+ <createUser @changeDialog="changeDialog" />
</el-dialog>
</div>
</div>
@@ -49,8 +49,7 @@
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '淇敼杩濆缓淇℃伅' :'鏌ョ湅杩濆缓淇℃伅'"
v-if="dialogUpdate" :before-close="handleClose">
- <updateUser :updateFlag="updateFlag" :userInfo=userInfo
- :getUserList=" context ? getUserList : getUserList" @changeDialog="changeDialog" />
+ <updateUser :updateFlag="updateFlag" :userInfo=userInfo @changeDialog="changeDialog" />
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -242,9 +241,10 @@
this.currentPage = page;
this.getUserList();
},
- changeDialog(val) {
- this.dialogUpdate = val.dialogUpdate;
- console.log(val);
+ changeDialog({flag}) {
+ this.dialogCreate = flag;
+ this.dialogUpdate = flag;
+ this.getUserList();
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
diff --git a/src/views/operate/baseSetting/illegalBuild/updateUser/index.vue b/src/views/operate/baseSetting/illegalBuild/updateUser/index.vue
index 296caea..46efb62 100644
--- a/src/views/operate/baseSetting/illegalBuild/updateUser/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/updateUser/index.vue
@@ -61,7 +61,7 @@
})
}
},
- props: ['userInfo', 'updateFlag', 'getUserList', 'changeDialog']
+ props: ['userInfo', 'updateFlag', 'changeDialog']
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/baseSetting/violation/createUser/index.vue b/src/views/operate/baseSetting/violation/createUser/index.vue
index 614d479..fa9d67c 100644
--- a/src/views/operate/baseSetting/violation/createUser/index.vue
+++ b/src/views/operate/baseSetting/violation/createUser/index.vue
@@ -11,38 +11,22 @@
<el-form-item class="optionItem" label="鏂板鍚嶇О:" prop="name">
<el-input v-model="things.name" placeholder="璇疯緭鍏ユ柊澧炲悕绉�"></el-input>
</el-form-item>
- <!-- 鎵�灞炵被鍨� -->
- <el-form-item class="optionItems" label="鎵�灞炵被鍨�:" prop="typeThird">
- <el-select v-model="things.typeThird" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" >
- <el-option v-for="item in typeThirdList" :key="item.id" :label="item.name"
+ <!-- 璇烽�夋嫨绾у埆 -->
+ <el-form-item class="optionItem" label="绾у埆:" prop="level">
+ <el-select v-model="things.level" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" @change="resetParentList">
+ <el-option v-for="item in levelList" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鐖剁骇id -->
+ <el-form-item class="optionItem" label="鐖剁骇:" prop="parentId">
+ <el-select v-model="things.parentId" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" >
+ <el-option v-for="item in parentList" :key="item.id" :label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
- <!-- 鎵�灞炲ぇ绫� -->
- <el-form-item class="optionItem" label="鎵�灞炲ぇ绫�:" prop="typeSecond">
- <el-select v-model="things.typeSecond" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" >
- <el-option v-for="item in typeSecondList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 璇疯緭鍏ユ柊澧炵瓑绾� -->
- <el-form-item class="optionItem" label="妗堜欢绛夌骇:" prop="level">
- <el-select v-model="things.level" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" >
- <el-option v-for="item in eventLevelList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 鎵�灞炲皬绫� -->
- <!-- <el-form-item class="optionItem" label="鎵�灞炲皬绫�:" prop="typeFirst">
- <el-select v-model="things.typeFirst" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" disabled>
- <el-option v-for="item in typeFirstList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item> -->
<!-- 妗堢敱 -->
<el-form-item class="optionItem" label="妗堢敱:" prop="type">
<el-input type="textarea" autosize v-model="things.type" placeholder="璇疯緭鍏ユ鐢辨弿杩板唴瀹�"></el-input>
@@ -75,14 +59,17 @@
callback(new Error('鏂板杩濊绛夌骇涓嶈兘涓虹┖'));
}
}
+ // const checkId = (rule,value,callback)=>{
+ // if(value){
+ // callback();
+ // }else{
+ // callback(new Error('鏂板杩濊绛夌骇涓嶈兘涓虹┖'));
+ // }
+ // }
return {
things: {
- // number: 0,
- // type: '',
name:'',
- typeFirst: '',
- typeSecond: '',
- typeThird: '',
+ parentId:'',
level:'',
},
createThings:{
@@ -95,21 +82,35 @@
{
required:true,trigger:'change',validator:checkLevel
}
- ]
+ ],
+ // parentId:[
+ // {
+ // required:true,trigger:'change',validator:checkId
+ // }
+ // ]
},
- roleList: [],
- typeThirdList:[],
- typeSecondList:[],
- // typeFirstList:[],
- eventLevelList:[]
+ levelList:[
+ {
+ label:"杩濊涓被鍨�",
+ value:1,
+ },
+ {
+ label:"澶х被",
+ value:2,
+ },
+ {
+ label:"灏忕被",
+ value:3,
+ },
+ {
+ label:"妗堢敱",
+ value:4,
+ },
+ ],
+ parentList:[],
}
},
created() {
- // 鑾峰彇鎵�灞炵被鍨嬪垪琛�
- this.getTypeThird();
- this.getTypeSecond();
- // this.getTypeFirst();
- this.getEventLevel();
},
methods: {
// 鏌ヨ鎵�灞炵被鍨�
@@ -119,7 +120,7 @@
url: "sccg/violations/query/type_first",
})
.then(res => {
- this.typeThirdList = res.data;
+ this.parentList = res.data;
})
},
// 鏌ヨ鎵�灞炲ぇ绫�
@@ -129,36 +130,84 @@
url: "sccg/violations/query/type_second",
})
.then(res => {
- this.typeSecondList = res.data;
+ this.parentList = res.data;
})
},
// 鏌ヨ鎵�灞炲皬绫�
- // getTypeFirst(){
- // this.$axios({
- // method: 'get',
- // url: "sccg/violations/query/type_third",
- // })
- // .then(res => {
- // this.typeFirstList = res.data;
- // })
- // },
- // 鑾峰彇妗堜欢绛夌骇鍒楄〃
+ getTypeFirst(){
+ this.$axios({
+ method: 'get',
+ url: "sccg/violations/query/type_third",
+ })
+ .then(res => {
+ this.parentList = res.data;
+ })
+ },
+ // 鏌ヨ鎵�灞炴鐢�
getEventLevel() {
this.$axios({
method: 'get',
- url: 'sccg/violations/query/event_type'
+ url: 'sccg/violations/query/type_four'
})
.then(res => {
console.log(res);
- this.eventLevelList = res.data;
+ this.parentList = res.data;
})
},
// 鎻愪氦鏂板杩濊绫诲瀷
handleSubmit(){
console.log(this.things);
+ this.$refs.user.validate((valid)=>{
+ console.log(valid);
+ if(valid){
+ const {things} = this;
+ this.$axios({
+ method:'post',
+ url:'sccg/violations/addition/type',
+ data:{
+ code:'1111',
+ level:things.parentId === '' ? things.level : things.level+1,
+ name:things.name,
+ parentId:things.parentId=== '' ? 0 : things.parentId,
+ typeCode:'01',
+ typeName:'闂绫诲瀷',
+ remark:things.type,
+ }
+ })
+ .then(res=>{
+ console.log(res);
+ if(res.code === 200){
+ this.$message({
+ type:'success',
+ message:'娣诲姞鎴愬姛'
+ })
+ this.$emit('changeDialog',{flag:false});
+ }else{
+ this.$message({
+ type:'error',
+ message:"娣诲姞澶辫触"
+ })
+ }
+ })
+ }else{
+ return false;
+ }
+ })
+ },
+ // 妗堜欢绾у埆鍙樺寲
+ resetParentList(index){
+ if(index === 1){
+ this.getTypeThird();
+ }else if(index === 2){
+ this.getTypeSecond();
+ }else if(index === 3){
+ this.getTypeFirst();
+ }else{
+ this.getEventLevel();
+ }
}
},
- props: ['getUserList']
+ props: ['changeDialog']
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index 535869b..cc28303 100644
--- a/src/views/operate/baseSetting/violation/index.vue
+++ b/src/views/operate/baseSetting/violation/index.vue
@@ -16,7 +16,7 @@
<el-button class="addBtn" type="primary" @click="dialogCreate = true">鏂板杩濊绫诲瀷</el-button>
<el-dialog :visible.sync="dialogCreate" title="鏂板杩濊绫诲瀷" width="45%" v-if="dialogCreate"
:before-close="handleClose">
- <createUser :refresh="getUserList" />
+ <createUser @changeDialog=changeDialog />
</el-dialog>
</div>
</div>
@@ -32,13 +32,13 @@
</el-table-column>
<el-table-column prop="number" label="杩濊浜嬮」缂栧彿" min-width="10">
</el-table-column>
- <el-table-column prop="typeThird" label="鎵�灞炵被鍨�" min-width="10">
+ <el-table-column prop="type" label="鎵�灞炵被鍨�" min-width="10">
</el-table-column>
- <el-table-column prop="typeSecond" label="鎵�灞炲ぇ绫�" min-width="10">
+ <el-table-column prop="typeFirst" label="鎵�灞炲ぇ绫�" min-width="10">
</el-table-column>
- <el-table-column prop="typeFirst" label="鎵�灞炲皬绫�" min-width="10">
+ <el-table-column prop="typeSecond" label="鎵�灞炲皬绫�" min-width="10">
</el-table-column>
- <el-table-column prop="type" label="妗堢敱" min-width="45">
+ <el-table-column prop="typeThird" label="妗堢敱" min-width="45">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="10">
<template slot-scope="scope">
@@ -277,9 +277,10 @@
this.currentPage = page;
this.getUserList();
},
- changeDialog(val) {
- this.dialogUpdate = val.dialogUpdate;
- console.log(val);
+ changeDialog({flag}) {
+ this.dialogCreate = flag;
+ this.dialogUpdate = flag;
+ this.getUserList();
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
diff --git a/src/views/operate/baseSetting/violation/updateUser/index.vue b/src/views/operate/baseSetting/violation/updateUser/index.vue
index 5b0cf9a..87c85db 100644
--- a/src/views/operate/baseSetting/violation/updateUser/index.vue
+++ b/src/views/operate/baseSetting/violation/updateUser/index.vue
@@ -86,8 +86,7 @@
// name: role.name,
// sort: 0
// }).then(res => {
- // this.$emit('changeDialog', { dialogUpdate: false });
- // this.getUserList();
+ // this.$emit('changeDialog', { flag: false });
// })
// } else {
// return false;
@@ -125,7 +124,7 @@
})
}
},
- props: ['userInfo', 'updateFlag', 'getUserList', 'changeDialog']
+ props: ['userInfo', 'updateFlag', 'changeDialog']
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 49be893..98930b9 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -30,9 +30,9 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="id" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
<template slot-scope="scope">
- <el-link @click="JumpView(scope.row)">{{scope.row.id}}</el-link>
+ <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index 23784f8..1dbedbb 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/index.vue
@@ -30,9 +30,9 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="id" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
<template slot-scope="scope">
- <el-link @click="JumpView(scope.row)">{{scope.row.id}}</el-link>
+ <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
@@ -338,7 +338,7 @@
console.log(id);
this.$axios({
method:'put',
- url:'sccg/base_case/reset?caseId='+id
+ url:'sccg/base_case/case_status_update?caseId='+id+'&state=0'
})
.then(res=>{
console.log(res);
diff --git a/src/views/operate/disposal/casepool/notDeal/index.vue b/src/views/operate/disposal/casepool/notDeal/index.vue
index 80744b1..41d872f 100644
--- a/src/views/operate/disposal/casepool/notDeal/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/index.vue
@@ -30,9 +30,9 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="id" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
<template slot-scope="scope">
- <el-link @click="JumpView(scope.row)">{{scope.row.id}}</el-link>
+ <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
@@ -339,7 +339,7 @@
console.log(id);
this.$axios({
method:'put',
- url:'sccg/base_case/reset?caseId='+id
+ url:'sccg/base_case/case_status_update?caseId='+id+'&state=0'
})
.then(res=>{
console.log(res);
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index b8937fd..f85ea4e 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -51,9 +51,9 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="id" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
<template slot-scope="scope">
- <el-link @click="JumpView(scope.row)">{{scope.row.id}}</el-link>
+ <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
@@ -440,10 +440,16 @@
.then(res=>{
console.log(res);
if(res.code === 200){
- this.$message({
+ this.$notify({
+ title:'娓╅Θ鎻愮ず',
+ message:'姝や簨浠跺凡蹇界暐,杩斿洖绯荤粺鍦ㄥ涔�',
type:'success',
- message:'鎿嶄綔鎴愬姛',
+ position: 'bottom-right'
})
+ // this.$message({
+ // type:'success',
+ // message:'鎿嶄綔鎴愬姛',
+ // })
this.getUserList();
}else{
this.$message({
@@ -463,10 +469,16 @@
.then(res=>{
console.log(res);
if(res.code === 200){
- this.$message({
+ this.$notify({
+ title:'娓╅Θ鎻愮ず',
+ message:'姝や簨浠舵殏涓嶅鐞�,璇峰墠寰�鏆備笉澶勭悊鐣岄潰鏌ョ湅璇︽儏',
type:'success',
- message:'鎿嶄綔鎴愬姛',
+ position: 'bottom-right'
})
+ // this.$message({
+ // type:'success',
+ // message:'鎿嶄綔鎴愬姛',
+ // })
this.getUserList();
}else{
this.$message({
diff --git a/src/views/operate/fivepack/shop/components/main/index.vue b/src/views/operate/fivepack/shop/components/main/index.vue
index 24d85b0..a1a6dbf 100644
--- a/src/views/operate/fivepack/shop/components/main/index.vue
+++ b/src/views/operate/fivepack/shop/components/main/index.vue
@@ -100,30 +100,18 @@
const that = this;
const { currentPage, pageSize, search } = this;
console.log(typeof search);
- // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
- // this.$axios.get(`sccg/store/storeinfo/list?keyword=${search}&pageNum=${currentPage}&pageSize=${pageSize}`).then(res => {
- // if (res.code === 200) {
- // res.data.records.forEach(item => {
- // item.createTime = helper(item.createTime);
- // item.status == 1 ? item.status = true : item.status = false;
- // })
- // that.totalNum = res.data.pages * pageSize;
- // that.tableData = res.data.records;
- // this.renderFlag = true;
- // }
- // })
- // this.$axios({
- // method: 'get',
- // url:`sccg/store/storeinfo/list?keyword=${search}&pageNum=${currentPage}&pageSize=${pageSize}`,
- // // data:{
- // // keyword:'',
- // // pageNum:currentPage,
- // // pageSize,
- // // }
- // })
- // .then(res => {
- // console.log(res);
- // })
+ this.$axios.get(`sccg/store/storeinfo/list?keyword=${search}&pageNum=${currentPage}&pageSize=${pageSize}`)
+ .then(res => {
+ if (res.code === 200) {
+ res.data.list.forEach(item => {
+ item.createTime = helper(item.createTime);
+ item.status == 1 ? item.status = true : item.status = false;
+ })
+ that.totalNum = res.data.total;
+ that.tableData = res.data.list;
+ this.renderFlag = true;
+ }
+ })
},
// 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
handleFind(rowData) {
diff --git a/src/views/operate/management/myIndex/components/closure/index.vue b/src/views/operate/management/myIndex/components/closure/index.vue
index 155d530..d51a562 100644
--- a/src/views/operate/management/myIndex/components/closure/index.vue
+++ b/src/views/operate/management/myIndex/components/closure/index.vue
@@ -207,9 +207,14 @@
if (res.code === 200) {
this.$message({
type: 'success',
- message: mystatus === 0 ? '椹冲洖鎴愬姛' : '瀹℃牳閫氳繃'
+ message: '缁撴鎴愬姛'
})
this.$emit('closeDialog', { flag: false });
+ }else{
+ this.$message({
+ type:'error',
+ message:'缁撴澶辫触',
+ })
}
})
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index ae20c85..b6c7593 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -161,35 +161,29 @@
// 鎻愪氦瀹℃牳鎰忚
handleSubmit(mystatus) {
// this.getUserLoginInfo();
- const {baseCase} = this;
- 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;
+ const { baseCase } = this;
+ 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) });
},
// 鑾峰彇褰撳墠鐢ㄦ埛鐧诲綍淇℃伅
getUserLoginInfo() {
@@ -207,7 +201,7 @@
})
}
},
- props: ['info','closeDialog']
+ props: ['info', 'closeDialog']
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index aa2ba22..c1b5985 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -3,14 +3,14 @@
<header>
<div class="problem">
<div class="problem-title">闂绫诲瀷</div>
- <el-radio-group v-model="myproblem">
+ <el-radio-group v-model="myproblem" @change="changeMyProblem">
<el-radio :label="1">杩濊</el-radio>
<el-radio :label="2">杩濆缓</el-radio>
</el-radio-group>
</div>
<div class="status">
<div class="status-title">瀹℃牳鐘舵��</div>
- <el-radio-group v-model="instatus">
+ <el-radio-group v-model="instatus" @change="changeInStatus">
<el-radio :label="7">寰呭鏍�</el-radio>
<el-radio :label="8">宸插鏍�</el-radio>
<el-radio :label="9">宸茬粨妗�</el-radio>
@@ -30,9 +30,9 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="id" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
<template slot-scope="scope">
- <el-link @click="JumpView(scope.row)">{{scope.row.id}}</el-link>
+ <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
@@ -54,8 +54,8 @@
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
<div class="btn">
- <span @click="handleExamine(scope.row)">瀹℃牳</span>
- <span class="line">|</span>
+ <span @click="handleExamine(scope.row)" v-if="instatus===7 ? true : false">瀹℃牳</span>
+ <span class="line" v-if="instatus===7 ? true : false">|</span>
<span @click="handleClosure(scope.row)">缁撴</span>
</div>
</template>
@@ -253,7 +253,8 @@
} else {
item.checked = false;
}
- })
+ });
+ this.myproblem = idx+1;
this.getUserList();
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
@@ -328,6 +329,15 @@
closeDialog({flag}){
this.dialogExamine = flag;
this.dialogClosure = flag;
+ this.getUserList();
+ },
+ // 闂绫诲瀷
+ changeMyProblem(val){
+ this.getUserList();
+ },
+ // 瀹℃牳鐘舵��
+ changeInStatus(val){
+ this.getUserList();
}
}
}
diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue
index 5b8931f..ea851d2 100644
--- a/src/views/systemSetting/baseSetting/role/index.vue
+++ b/src/views/systemSetting/baseSetting/role/index.vue
@@ -62,11 +62,16 @@
</template>
</el-table-column>
</el-table>
- <!-- 鏌ョ湅淇敼椤甸潰 -->
+ <!-- 淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '鏉冮檺璁剧疆' :'鏌ョ湅瑙掕壊淇℃伅'"
v-if="dialogUpdate" :before-close="handleClose">
<updateUser :updateFlag="updateFlag" :userInfo=userInfo
:getUserList=" context ? getUserList : getUserList" @changeDialog="changeDialog" />
+ </el-dialog>
+ <!-- 鏌ョ湅椤甸潰 -->
+ <el-dialog :visible.sync="dialogView" width="45%" title="鏌ョ湅瑙掕壊淇℃伅"
+ v-if="dialogView" :before-close="handleClose">
+ <MyView :userInfo=userInfo @changeDialog="changeDialog" />
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -100,9 +105,10 @@
import createUser from "./createUser"
import updateUser from "./updateUser"
import helper from "@/utils/mydate.js"
+import MyView from './viewRole'
export default {
components: {
- createUser, updateUser
+ createUser, updateUser,MyView
},
data() {
return {
@@ -110,6 +116,7 @@
context: "",
dialogCreate: false,
dialogUpdate: false,
+ dialogView:false,
updateFlag: false,
userInfo: '',
totalNum: null,
@@ -312,8 +319,7 @@
},
// 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
handleFind(rowData) {
- this.dialogUpdate = true;
- this.updateFlag = false;
+ this.dialogView = true;
this.userInfo = rowData;
},
// 淇敼鐢ㄦ埛閮ㄩ棬淇℃伅
@@ -337,8 +343,10 @@
this.currentPage = page;
this.search();
},
- changeDialog(val) {
- this.dialogUpdate = val.dialogUpdate;
+ changeDialog({flag}) {
+ this.dialogUpdate = flag;
+ this.dialogCreate = flag;
+ this.dialogView = flag;
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
diff --git a/src/views/systemSetting/baseSetting/role/updateUser/index.vue b/src/views/systemSetting/baseSetting/role/updateUser/index.vue
index 5905a11..b697ddf 100644
--- a/src/views/systemSetting/baseSetting/role/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/role/updateUser/index.vue
@@ -4,7 +4,6 @@
<div class="mainContent">
<div class="my-tree">
<div class="my-tree__wrap">
- <!-- @node-click="handleNodeClick" -->
<el-tree ref="tree" :data="roleList" :props="defaultProps" show-checkbox
@check="handleCheck" :default-checked-keys="checkedIds" default-expand-all node-key="id">
</el-tree>
@@ -160,7 +159,7 @@
position: absolute;
left: 0px;
bottom: 0px;
- background-color: #17324c;
+ background-color: #09152f;
width: 100%;
height: 20px;
border-bottom-left-radius: 4px;
@@ -169,7 +168,7 @@
position: absolute;
right: 0px;
top: 0px;
- background-color: #17324c;
+ background-color: #09152f;
width: 20px;
height: 100%;
}
diff --git a/src/views/systemSetting/baseSetting/role/viewRole/index.vue b/src/views/systemSetting/baseSetting/role/viewRole/index.vue
new file mode 100644
index 0000000..0b85c5b
--- /dev/null
+++ b/src/views/systemSetting/baseSetting/role/viewRole/index.vue
@@ -0,0 +1,116 @@
+<template>
+ <div class="createUser">
+ <main>
+ <div class="mainContent">
+ <el-form ref="user" label-width="140px" autoComplete="on" :model="role" :rules="createRoleRules"
+ label-position="right">
+ <!-- 瑙掕壊鍚嶇О -->
+ <el-form-item class="optionItem" label="瑙掕壊鍚嶇О:" prop="name">
+ <el-input v-model="role.name" placeholder="璇峰～鍐欒鑹插悕绉�"></el-input>
+ </el-form-item>
+ <!-- 瑙掕壊绫诲瀷 -->
+ <el-form-item class="optionItems" label="瑙掕壊绫诲瀷:" prop="status">
+ <el-input v-model="role.type" placeholder="璇烽�夋嫨瑙掕壊绫诲瀷"></el-input>
+ <!-- <el-select v-model="role.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="optionItem" label="瑙掕壊鎻忚堪:" prop="description">
+ <el-input type="textarea" v-model="role.description" placeholder="璇疯緭鍏ユ弿杩板唴瀹�200瀛椾互鍐�"></el-input>
+ </el-form-item>
+ </el-form>
+
+ </div>
+ </main>
+ </div>
+</template>
+<script>
+export default {
+ data() {
+ return {
+ role: {
+ name: '',
+ type: '',
+ description: '',
+ },
+ createRoleRules: {
+ }
+ }
+ },
+ created() {
+ this.role = this.userInfo;
+ console.log(this.userInfo);
+ },
+ methods: {
+
+ },
+ props: ['userInfo', 'changeDialog']
+}
+</script>
+<style lang="scss" scoped>
+.createUser {
+ border-radius: 1px;
+ background-color: #09152f;
+
+ main {
+ text-align: left;
+ padding: 0 55px;
+ background-color: #09152f;
+ padding-bottom: 50px;
+
+ .mainContent {
+ display: flex;
+ justify-content: center;
+ padding-top: 50px;
+
+ &::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;
+ }
+
+ .el-form-item__content {
+ width: 400px;
+
+ .el-select {
+ width: 100%;
+ }
+ }
+
+ .optionHandleSp {
+ display: flex;
+
+ .areaNumber,
+ .moreNumber {
+ flex: 1;
+ }
+
+ .telNumber {
+ flex: 2;
+ }
+ }
+
+ .optionBtn {
+ display: flex;
+ margin-top: 20px;
+
+ .btn {
+ padding: 12px 50px;
+ }
+ }
+
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/systemSetting/baseSetting/user/components/password/index.vue b/src/views/systemSetting/baseSetting/user/components/password/index.vue
index 1cb81c1..95d0c19 100644
--- a/src/views/systemSetting/baseSetting/user/components/password/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/password/index.vue
@@ -122,7 +122,7 @@
},
// 娓呯┖琛ㄥ崟
resetForm() {
-
+ this.$refs.pwd.resetFields();
}
}
}
--
Gitblit v1.8.0