From fde4758dd43927cce678d99ffe71e05931616f26 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期日, 09 十月 2022 10:46:35 +0800
Subject: [PATCH] 创建车辆管理
---
src/views/systemSetting/baseSetting/department/updateUser/index.vue | 2
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue | 1
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 11 +
src/views/operate/fivepack/shop/components/createUser/index.vue | 125 +++------------
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue | 15 -
src/components/dispatch/index.vue | 11 +
src/utils/mydate.js | 1
src/router/index.js | 8 +
src/views/operate/myWait/index.vue | 54 ++----
src/utils/validate.js | 9 +
src/views/layout/components/Menu/index.vue | 2
src/utils/helper.js | 61 ++++++-
src/views/operate/disposal/casepool/pool/index.vue | 133 ++++++++--------
/dev/null | 0
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 5
src/views/systemSetting/baseSetting/department/createUser/index.vue | 7
src/views/systemSetting/baseSetting/department/index.vue | 7
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue | 7
src/views/systemSetting/baseSetting/role/viewRole/index.vue | 13 -
src/views/operate/car/index.vue | 3
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue | 1
21 files changed, 224 insertions(+), 252 deletions(-)
diff --git a/src/components/dispatch/index.vue b/src/components/dispatch/index.vue
index a9fe5b6..73c86db 100644
--- a/src/components/dispatch/index.vue
+++ b/src/components/dispatch/index.vue
@@ -63,7 +63,7 @@
</div>
<div class="footer">
<el-button type="primary" @click="handleDispatch">纭畾</el-button>
- <el-button>杩斿洖</el-button>
+ <el-button @click="handleBack">杩斿洖</el-button>
</div>
</div>
</template>
@@ -73,7 +73,7 @@
components: {
MyMap
},
- props: ['id','changeDialog'],
+ props: ['id','changeDialog','refresh'],
created() {
console.log(this.id);
},
@@ -243,12 +243,17 @@
type: res.code === 200 ? 'success':'error',
message: res.code === 200 ? '璋冨害鎴愬姛':res.message,
})
- this.$emit('changeDialog',{dialogView:false});
+ this.$emit('changeDialog',{flag:false});
+ this.refresh();
})
} else {
return false;
}
})
+ },
+ // 鍙栨秷璋冨害
+ handleBack(){
+ this.$emit('changeDialog',{flag:false})
}
}
}
diff --git a/src/router/index.js b/src/router/index.js
index fb17ea5..7bda25a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -177,6 +177,14 @@
component: () => import('@/views/operate/management/myIndex'),
}
]
+ },
+ {
+ path: 'car',
+ name: 'car',
+ component: () => import('@/views/operate/car'),
+ children: [
+
+ ]
}
]
},
diff --git a/src/utils/helper.js b/src/utils/helper.js
index d3865cc..68a299d 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -1,17 +1,62 @@
+import { hash } from "immutable";
+
// 娣辨嫹璐�
-function deepClone(obj){
+function deepClone(obj) {
let objClone = Array.isArray(obj) ? [] : {};
- if(obj && typeof obj === 'object' && obj != null){
- for(let key in obj){
- if(obj.hasOwnProperty(key)){
- if(obj[key] && typeof obj[key] === 'object'){
+ if (obj && typeof obj === 'object' && obj != null) {
+ for (let key in obj) {
+ if (obj.hasOwnProperty(key)) {
+ if (obj[key] && typeof obj[key] === 'object') {
objClone[key] = deepClone(obj[key]);
- }else{
+ } else {
objClone[key] = obj[key];
}
}
}
}
return objClone;
-}
-export {deepClone};
+}
+// 璁＄畻鏃堕棿
+function computeTime(time2) {
+ const t1 = new Date();
+ const t2 = new Date(time2);
+ return filterTime(t2.getTime() - t1.getTime());
+}
+function filterTime(time) {
+ if (time < 0) {
+ return '宸查�炬湡';
+ }
+ let dd = Math.floor(time/24/60/60/1000),
+ hh = Math.floor(time/60/60/1000-dd*24),
+ mi = Math.floor(time/60/1000-dd*24*60-hh*60);
+ console.log(dd, hh, mi)
+ return addDay(fillTime(dd)) + addHour(fillTime(hh)) + addMin(fillTime(mi));
+}
+function fillTime(num) {
+ if (num < 10) {
+ return '0' + num;
+ }
+ return num;
+}
+function addDay(str) {
+ str = parseFloat(str);
+ if (str <= 0) {
+ return;
+ }
+ return str + '澶�'
+}
+function addHour(str) {
+ str = parseFloat(str);
+ if (str <= 0) {
+ return;
+ }
+ return str + '灏忔椂'
+}
+function addMin(str) {
+ str = parseFloat(str);
+ if (str <= 0) {
+ return;
+ }
+ return str + '鍒嗛挓'
+}
+export { deepClone, computeTime };
diff --git a/src/utils/mydate.js b/src/utils/mydate.js
index a058424..521b6d2 100644
--- a/src/utils/mydate.js
+++ b/src/utils/mydate.js
@@ -1,3 +1,4 @@
+// 澶勭悊鏃堕棿
function filterTime(time){
const result = new Date(time);
let yy = result.getFullYear(),
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 04c0afe..c8f70ca 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -9,5 +9,14 @@
const urlregex = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
return urlregex.test(textval)
}
+// 鏍￠獙姹夊瓧鍚�
+export function validateName(str){
+
+}
+// 鏍￠獙鎵嬫満鍙�
+export function validatePhone(str){
+ const phoneRep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
+ return phoneRep.test(str);
+}
diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue
index 01e779d..daa74db 100644
--- a/src/views/layout/components/Menu/index.vue
+++ b/src/views/layout/components/Menu/index.vue
@@ -109,7 +109,7 @@
<el-menu-item index="/home/operate/fivepack/shop">搴楅摵绠＄悊</el-menu-item>
</el-submenu>
<el-menu-item index="/home/operate/dasdas">绠楁硶妯″瀷绠＄悊</el-menu-item>
- <el-menu-item index="/home/operate/dasdas">杞﹁締绠＄悊</el-menu-item>
+ <el-menu-item index="/home/operate/car">杞﹁締绠＄悊</el-menu-item>
<el-menu-item index="/home/operate">鍥剧墖绠＄悊</el-menu-item>
<el-menu-item index="/home/operate">瑙嗛绠＄悊</el-menu-item>
<el-menu-item index="/home/operate">娑堟伅绠＄悊</el-menu-item>
diff --git a/src/views/operate/car/index.vue b/src/views/operate/car/index.vue
new file mode 100644
index 0000000..d005be1
--- /dev/null
+++ b/src/views/operate/car/index.vue
@@ -0,0 +1,3 @@
+<template>
+<router-view></router-view>
+</template>
\ No newline at end of file
diff --git a/src/views/operate/disposal/casepool/dispatch/createUser/index.vue b/src/views/operate/disposal/casepool/dispatch/createUser/index.vue
deleted file mode 100644
index b609337..0000000
--- a/src/views/operate/disposal/casepool/dispatch/createUser/index.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
- <div class="createUser">
- <main>
- <div class="mainContent">
- <el-form ref="user" 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-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-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="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="璇疯緭鍏ユ鐢辨弿杩板唴瀹�"
- :disabled="!updateFlag" disabled></el-input>
- </el-form-item>
- <el-form-item v-if="updateFlag">
- <div class="optionBtn">
- <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">纭
- </el-button>
- </div>
- </el-form-item>
- </el-form>
-
- </div>
- </main>
- </div>
-</template>
-<script>
-export default {
- data() {
- return {
- things: {
- number: 0,
- type: '',
- typeFirst: '',
- typeSecond: '',
- typeThird: '',
- },
- roleList: [],
- typeThirdList:[],
- typeSecondList:[],
- typeFirstList:[],
- }
- },
- created() {
- console.log(this.userInfo);
- this.things = JSON.parse(JSON.stringify(this.userInfo));
- // 鑾峰彇鎵�灞炵被鍨嬪垪琛�
- this.getTypeThird();
- this.getTypeSecond();
- this.getTypeFirst();
- },
- methods: {
- // handleUser() {
- // this.$refs.user.validate((valid) => {
- // if (valid) {
- // const { role } = this;
- // console.log(role);
- // this.$axios.post('/sccg/role/update/' + role.id, {
- // id: role.id,
- // status: role.status,
- // description: role.description,
- // name: role.name,
- // sort: 0
- // }).then(res => {
- // this.$emit('changeDialog', { dialogUpdate: false });
- // this.getUserList();
- // })
- // } else {
- // return false;
- // }
- // })
- // },
- // 鏌ヨ鎵�灞炵被鍨�
- getTypeThird() {
- this.$axios({
- method: 'get',
- url: "sccg/violations/query/type_first",
- })
- .then(res => {
- this.typeThirdList = res.data;
- })
- },
- // 鏌ヨ鎵�灞炲ぇ绫�
- getTypeSecond(){
- this.$axios({
- method: 'get',
- url: "sccg/violations/query/type_second",
- })
- .then(res => {
- this.typeSecondList = res.data;
- })
- },
- // 鏌ヨ鎵�灞炲皬绫�
- getTypeFirst(){
- this.$axios({
- method: 'get',
- url: "sccg/violations/query/type_third",
- })
- .then(res => {
- this.typeFirstList = res.data;
- })
- }
- },
- props: ['getUserList']
-}
-</script>
-<style lang="scss" scoped>
-.createUser {
- border-radius: 1px;
- background-color: #09152f;
-
- main {
- // border: 1px solid #fff;
- text-align: left;
- padding: 0 55px;
- background-color: #09152f;
- padding-bottom: 50px;
-
- .mainContent {
- display: flex;
- justify-content: center;
- padding-top: 50px;
-
- .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;
- }
- }
-
- }
- }
-
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
- ::v-deep .el-form-item__label {
- color: #4b9bb7;
- }
-
- ::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-}
-</style>
\ No newline at end of file
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 d948e0f..39ef1b8 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
@@ -104,7 +104,6 @@
fileList: [],
}
},
- props:['getArrive'],
methods: {
handleSuccess(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
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 108127b..6f02459 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
@@ -443,7 +443,6 @@
]
}
},
- props:['getEvidence'],
methods: {
handleSuccess2(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
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 58b14d6..73bb31f 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
@@ -12,7 +12,7 @@
<!-- 搴曢儴鎸夐挳 -->
<div class="footer">
<el-button @click="handleSubmit" type="primary">纭畾</el-button>
- <el-button>杩斿洖</el-button>
+ <el-button @click="handleBack">杩斿洖</el-button>
</div>
</div>
</template>
@@ -29,7 +29,7 @@
// result:'',
}
},
- props: ['caseId'],
+ props: ['caseId','closeDialog'],
created() {
console.log(this.caseId);
this.getUserId();
@@ -152,6 +152,9 @@
.then(res=>{
console.log(res);
})
+ },
+ handleBack(){
+ this.$emit('closeDialog',{falg:false})
}
}
}
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 a76722b..5b084e3 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
@@ -1,13 +1,13 @@
<template>
<div class="vio">
<!-- 鍒拌揪鐜板満鎯呭喌 -->
- <MyArrive ref="arrive" @getArrive="getArrive"></MyArrive>
+ <MyArrive ref="arrive"></MyArrive>
<!-- 璋冩煡鍙栬瘉 -->
- <MyEvidence ref="evidence" @getEvidence="getEvidence"></MyEvidence>
+ <MyEvidence ref="evidence"></MyEvidence>
<!-- 搴曢儴鎸夐挳 -->
<div class="footer">
<el-button @click="handleSubmit" type="primary">纭畾</el-button>
- <el-button>杩斿洖</el-button>
+ <el-button @click="handleBack">杩斿洖</el-button>
</div>
</div>
</template>
@@ -100,13 +100,8 @@
}
})
},
- // 鑾峰緱arrive鐨勪俊鎭�
- getArrive(obj) {
- console.log(obj);
- },
- // 鑾峰緱evidence瀵硅薄
- getEvidence(obj) {
- console.log(obj);
+ handleBack(){
+ this.$emit('closeDialog',{flag:false});
}
}
}
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 5831571..0d4cc25 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -362,7 +362,8 @@
type: 'success',
message: res.message
})
- this.$emit('changeDialog', { dialogView: false });
+ this.$emit('changeDialog', { flag: false });
+ this.refresh();
} else {
this.$message({
type: 'warning',
@@ -413,7 +414,7 @@
this.ill.negative = baseUrl + res.data.url1;
}
},
- props: ['mytype', 'changeDialog']
+ props: ['mytype', 'changeDialog','refresh']
}
</script>
<style lang="scss" scoped>
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 1533c2f..12be6b8 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -117,7 +117,7 @@
</div>
<div class="input-footer">
<el-button type="primary" class="confirm" @click="handleSubmit">纭畾</el-button>
- <el-button class="back">杩斿洖</el-button>
+ <el-button class="back" @click="handleBack">杩斿洖</el-button>
</div>
</div>
<div class="map-area">
@@ -368,7 +368,8 @@
type: 'success',
message: res.message
})
- this.$emit('changeDialog', { dialogView: false });
+ this.$emit('changeDialog', { flag: false });
+ this.refresh();
} else {
this.$message({
type: 'warning',
@@ -380,9 +381,13 @@
return false;
}
})
+ },
+ // 杩斿洖
+ handleBack(){
+ this.$emit('changeDialog',{flag:false})
}
},
- props: ['mytype', 'changeDialog']
+ props: ['mytype', 'changeDialog','refresh']
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index f85ea4e..89d9262 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -26,9 +26,10 @@
<el-dialog :before-close="handleClose" :visible.sync="dialogNewAdd"
:title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏' " width="60%" v-if="dialogNewAdd">
<!-- 杩濆缓鐧昏 -->
- <MyIll v-if="newAddType === 1" :mytype=newAddType @changeDialog=changeDialog />
+ <MyIll v-if="newAddType === 1" :refresh="getUserList" :mytype=newAddType
+ @changeDialog=changeDialog />
<!-- 杩濊鐧昏 -->
- <myVio v-else :mytype=newAddType @changeDialog=changeDialog />
+ <myVio v-else :mytype=newAddType @changeDialog=changeDialog :refresh="getUserList" />
</el-dialog>
</div>
</div>
@@ -94,13 +95,13 @@
<!-- 璋冨害 -->
<el-dialog :visible.sync="dialogDispatch" width="80%" title="璋冨害淇℃伅" v-if="dialogDispatch"
:before-close="handleClose">
- <MyDispatch :id="baseId" @changeDialog="changeDialog"></MyDispatch>
+ <MyDispatch :id="baseId" @changeDialog="changeDialog" :refresh="getUserList"></MyDispatch>
</el-dialog>
<!-- tools -->
<div class="tools">
<div class="funs">
<div class="funsItem">
- <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
+ <el-checkbox v-model="all" @change="selectAll()" :disabled="tableData.length !== 0 ? false : true">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
<el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
@@ -152,7 +153,7 @@
dialogCreate: false,
dialogView: false,
dialogNewAdd: false,
- dialogDispatch:false,
+ dialogDispatch: false,
newAddType: 0,
totalNum: null,
pageSize: 10,
@@ -223,7 +224,7 @@
],
mystatus: '',
statusArr: [],
- baseId:0
+ baseId: 0
}
},
@@ -267,7 +268,7 @@
.then(_ => {
this.$axios({
method: 'delete',
- url: 'sccg/base-case/batch_deletion?ids=' + idArr + '&type=' + statusArr[1],
+ url: 'sccg/base_case/batch_deletion?ids=' + idArr + '&type=' + statusArr[1],
}).then(res => {
if (res.code === 200) {
this.getUserList();
@@ -305,7 +306,7 @@
tableChange(list) {
this.tempList = [];
list.forEach(item => {
- this.tempList.push(item.code);
+ this.tempList.push(item.id);
})
if (list.length === this.tableData.length) {
this.all = true;
@@ -335,10 +336,10 @@
this.tableData = res.data.records;
console.log(res);
})
- .catch(err=>{
- console.log(err)
- this.tableData = [];
- })
+ .catch(err => {
+ console.log(err)
+ this.tableData = [];
+ })
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
@@ -369,12 +370,12 @@
this.currentPage = page;
this.getUserList();
},
- changeDialog(val) {
- this.dialogNewAdd = val.dialogView;
- this.dialogCreate = val.dialogView;
- this.dialogView = val.dialogView;
- this.dialogDispatch = val.dialogView;
- this.getUserList();
+ changeDialog({ flag }) {
+ this.dialogNewAdd = flag;
+ this.dialogCreate = flag;
+ this.dialogView = flag;
+ this.dialogDispatch = flag;
+ // this.getUserList();
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -431,62 +432,62 @@
})
},
// 鍦ㄥ涔�
- handleLearn({id}){
+ handleLearn({ id }) {
console.log(id);
this.$axios({
- method:'put',
- url:'sccg/base_case/case_status_update?caseId='+id + '&state='+3
+ method: 'put',
+ url: 'sccg/base_case/case_status_update?caseId=' + id + '&state=' + 3
})
- .then(res=>{
- console.log(res);
- if(res.code === 200){
- this.$notify({
- title:'娓╅Θ鎻愮ず',
- message:'姝や簨浠跺凡蹇界暐,杩斿洖绯荤粺鍦ㄥ涔�',
- type:'success',
- position: 'bottom-right'
- })
- // this.$message({
- // type:'success',
- // message:'鎿嶄綔鎴愬姛',
- // })
- this.getUserList();
- }else{
- this.$message({
- type:'error',
- message:'鎿嶄綔澶辫触'
- })
- }
- })
+ .then(res => {
+ console.log(res);
+ if (res.code === 200) {
+ this.$notify({
+ title: '娓╅Θ鎻愮ず',
+ message: '姝や簨浠跺凡蹇界暐,杩斿洖绯荤粺鍦ㄥ涔�',
+ type: 'success',
+ position: 'bottom-right'
+ })
+ // this.$message({
+ // type:'success',
+ // message:'鎿嶄綔鎴愬姛',
+ // })
+ this.getUserList();
+ } else {
+ this.$message({
+ type: 'error',
+ message: '鎿嶄綔澶辫触'
+ })
+ }
+ })
},
// 鏆備笉澶勭悊
- handleNotDeal({id}){
+ handleNotDeal({ id }) {
console.log(id);
this.$axios({
- method:'put',
- url:'sccg/base_case/case_status_update?caseId='+id + '&state='+4
+ method: 'put',
+ url: 'sccg/base_case/case_status_update?caseId=' + id + '&state=' + 4
})
- .then(res=>{
- console.log(res);
- if(res.code === 200){
- this.$notify({
- title:'娓╅Θ鎻愮ず',
- message:'姝や簨浠舵殏涓嶅鐞�,璇峰墠寰�鏆備笉澶勭悊鐣岄潰鏌ョ湅璇︽儏',
- type:'success',
- position: 'bottom-right'
- })
- // this.$message({
- // type:'success',
- // message:'鎿嶄綔鎴愬姛',
- // })
- this.getUserList();
- }else{
- this.$message({
- type:'error',
- message:'鎿嶄綔澶辫触'
- })
- }
- })
+ .then(res => {
+ console.log(res);
+ if (res.code === 200) {
+ this.$notify({
+ title: '娓╅Θ鎻愮ず',
+ message: '姝や簨浠舵殏涓嶅鐞�,璇峰墠寰�鏆備笉澶勭悊鐣岄潰鏌ョ湅璇︽儏',
+ type: 'success',
+ position: 'bottom-right'
+ })
+ // this.$message({
+ // type:'success',
+ // message:'鎿嶄綔鎴愬姛',
+ // })
+ this.getUserList();
+ } else {
+ this.$message({
+ type: 'error',
+ message: '鎿嶄綔澶辫触'
+ })
+ }
+ })
}
}
}
diff --git a/src/views/operate/fivepack/shop/components/createUser/index.vue b/src/views/operate/fivepack/shop/components/createUser/index.vue
index df0021d..f6b3f2c 100644
--- a/src/views/operate/fivepack/shop/components/createUser/index.vue
+++ b/src/views/operate/fivepack/shop/components/createUser/index.vue
@@ -5,15 +5,15 @@
<el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
label-position="right">
<!-- 搴楅摵绫诲瀷 -->
- <el-form-item class="optionItem" label="搴楅摵绫诲瀷:" prop="nickName">
- <el-select v-model="user.userType" placeholder="閫夋嫨搴楅摵/闂ㄥ簵绫诲瀷">
+ <el-form-item class="optionItem" label="搴楅摵绫诲瀷:" prop="storetype">
+ <el-select v-model="user.storetype" 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="password">
+ <el-form-item class="optionItems" label="搴楅摵鍚嶇О:" prop="storename">
<el-input v-model="user.password" type="password" placeholder="璇峰～鍐欏簵閾哄悕绉�"></el-input>
</el-form-item>
<!-- 璐熻矗浜� -->
@@ -52,27 +52,23 @@
data() {
const validateNickname = (rule, value, callback) => {
if (!value) {
- callback(new Error("璇峰～鍐欑敤鎴峰悕绉�"));
+ callback(new Error("璐熻矗浜轰笉鑳戒负绌�"));
+ }else{
+ callback();
}
};
const validatePass = (rule, value, callback) => {
if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
+ callback();
} else {
- const rep = /^\w+$/;
- if (!rep.test(value)) {
- callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
- }
+ callback();
}
};
const validateTruename = (rule, value, callback) => {
if (!value) {
- callback(new Error("璇峰～鍐欑敤鎴峰鍚�"));
+ callback();
} else {
- const rep = /^[\u4E00-\u9FA5]{2,4}$/;
- if (!rep.test(value)) {
- callback("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕");
- }
+ callback(new Error('搴楅摵鍦板潃涓嶈兘涓虹┖'))
}
};
const validatePhone = (rule, value, callback) => {
@@ -87,118 +83,47 @@
};
const validateMail = (rule, value, callback) => {
if (value) {
- const rep = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
- if (!rep.test(value)) {
- callback(new Error("璇疯緭鍏ユ纭殑閭"))
- }
- }
- };
- const validateRole = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
- } else {
callback();
+ }else{
+ callback(new Error('搴楅摵鍚嶇О涓嶈兘涓虹┖'))
}
};
const validateType = (rule, value, callback) => {
if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
- } else {
callback();
- }
- };
- const validateDepartment = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
- } else {
- callback();
- }
- };
- const validateWork = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
- } else {
- callback();
- }
- };
- const validateMac = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
- } else {
- callback();
- }
- };
- const validateIp = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
} else {
callback();
}
};
return {
user: {
- nickName: '',
- password: '',
- username: '',
- // gender: 1,
- isDy: 0,
- mobile: '',
- email: '',
- // role: null,
- userType: null,
- zj: {
- areaNumber: '',
- phoneNumber: "",
- moreNumber: "",
- },
- departmentId: null,
- jobTitle: null,
- // mac: '',
- // ip: '',
+ contact:'',
+ idcardinfo:'',
+ owner:'',
+ storeaddr:'',
+ storename:'',
+ storedesc:'',
+ storetype:'',
},
createUserRules: {
- nickName: [
+ owner: [
{ required: true, trigger: "blur", validator: validateNickname },
],
- password: [
+ idcardinfo: [
{ required: true, trigger: "blur", validator: validatePass },
],
- username: [
+ storeaddr: [
{ required: true, trigger: "blur", validator: validateTruename },
],
- // gender: [
- // { required: true, trigger: "blur" },
- // ],
- isDy: [
- { required: true, trigger: "blur" },
- ],
- mobile: [
+ contact: [
{ required: true, trigger: "blur", validator: validatePhone },
],
- email: [
+ storename: [
{ required: false, trigger: "blur", validator: validateMail },
],
- // role: [
- // { required: true, trigger: "blur", validator: validateRole },
- // ],
- userType: [
+ storedesc: [
{ required: true, trigger: "blur", validator: validateType },
],
- zj: [
- { required: false, trigger: "blur" },
- ],
- departmentId: [
- { required: true, trigger: "blur", validator: validateDepartment },
- ],
- jobTitle: [
- { required: true, trigger: "blur", validator: validateWork },
- ],
- // mac: [
- // { required: false, trigger: "blur", validator: validateMac },
- // ],
- // ip: [
- // { required: false, trigger: "blur", validator: validateIp },
- // ],
},
roleList: [
{ name: '瑙掕壊1', value: 1 }, { name: '瑙掕壊2', value: 2 }
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 163a582..ba01d51 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -30,15 +30,18 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="number" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
</el-table-column>
- <el-table-column prop="typeThird" label="闂灏忕被" min-width="10">
+ <el-table-column prop="category" label="闂灏忕被" min-width="10">
</el-table-column>
- <el-table-column prop="typeSecond" label="闂鎻忚堪" min-width="10">
+ <el-table-column prop="eventSource" label="闂鎻忚堪" min-width="10">
</el-table-column>
- <el-table-column prop="typeFirst" label="鍒涘缓鏃堕棿" min-width="10">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
</el-table-column>
<el-table-column prop="type" label="鍓╀綑鏃堕棿" min-width="10">
+ <template slot-scope="scope">
+ <span>{{getRestTime(scope.row.limitTime)}}</span>
+ </template>
</el-table-column>
<el-table-column prop="type" label="闂鐘舵��" min-width="10">
</el-table-column>
@@ -91,6 +94,7 @@
<script>
import updateUser from "./updateUser"
import createUser from "./createUser"
+import {computeTime} from '@/utils/helper'
export default {
components: {
updateUser,createUser
@@ -213,44 +217,14 @@
// 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
this.$axios({
method: 'get',
- url: `sccg/violations/query?current=${currentPage}&size=${pageSize}&keyWord=${context}`,
+ // ?current=${currentPage},&size=${pageSize}&
+ url: `sccg/my_backlog/query?num=${context}`,
})
.then(res => {
- this.tableData = res.data.records;
- this.totalNum = res.data.total;
+ this.tableData = res.data;
+ this.totalNum = res.data.length;
})
},
- // search() {
- // const that = this;
- // const { currentPage, pageSize, context } = this;
- // // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- // if (context == '') {
- // this.$axios.get('sccg/role/list?keyword=' + '&pageNum=' + currentPage + '&pageSize=' + pageSize).then(res => {
- // if (res.code === 200) {
- // console.log(res);
- // res.data.list.forEach(item => {
- // // item.createTime = helper(item.createTime);
- // item.status == 1 ? item.status = true : item.status = false;
- // })
- // that.tableData = res.data.list;
- // this.totalNum = res.data.list.length;
- // }
- // })
- // } else {
- // this.$axios({
- // method: 'get',
- // url: 'sccg/role/list?keyword=' + context + '&pageNum=' + currentPage + '&pageSize=' + pageSize,
- // }).then(res => {
- // if (res.code === 200) {
- // res.data.list.forEach(item => {
- // item.status == 1 ? item.status = true : item.status = false;
- // })
- // that.tableData = res.data.list
- // this.totalNum = res.data.list.length;
- // }
- // })
- // }
- // },
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 == 0) {
@@ -293,6 +267,10 @@
done();
})
.catch(_ => { });
+ },
+ // 璁＄畻鏃堕棿
+ getRestTime(time2){
+ return computeTime(time2);
}
}
}
diff --git "a/src/views/operate/\345\233\276\347\211\207\347\256\241\347\220\206" "b/src/views/operate/\345\233\276\347\211\207\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\345\233\276\347\211\207\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\345\256\241\346\240\270\347\256\241\347\220\206" "b/src/views/operate/\345\256\241\346\240\270\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\345\256\241\346\240\270\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\346\211\247\346\263\225\347\256\241\347\220\206" "b/src/views/operate/\346\211\247\346\263\225\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\346\211\247\346\263\225\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\346\227\245\345\277\227\347\256\241\347\220\206" "b/src/views/operate/\346\227\245\345\277\227\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\346\227\245\345\277\227\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\346\266\210\346\201\257\347\256\241\347\220\206" "b/src/views/operate/\346\266\210\346\201\257\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\346\266\210\346\201\257\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\347\237\255\344\277\241\347\256\241\347\220\206" "b/src/views/operate/\347\237\255\344\277\241\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\347\237\255\344\277\241\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\347\256\227\346\263\225\346\250\241\345\236\213\347\256\241\347\220\206" "b/src/views/operate/\347\256\227\346\263\225\346\250\241\345\236\213\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\347\256\227\346\263\225\346\250\241\345\236\213\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\350\247\206\351\242\221\347\256\241\347\220\206" "b/src/views/operate/\350\247\206\351\242\221\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\350\247\206\351\242\221\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\350\260\203\345\272\246\347\256\241\347\220\206" "b/src/views/operate/\350\260\203\345\272\246\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\350\260\203\345\272\246\347\256\241\347\220\206"
+++ /dev/null
diff --git "a/src/views/operate/\350\275\246\350\276\206\347\256\241\347\220\206" "b/src/views/operate/\350\275\246\350\276\206\347\256\241\347\220\206"
deleted file mode 100644
index e69de29..0000000
--- "a/src/views/operate/\350\275\246\350\276\206\347\256\241\347\220\206"
+++ /dev/null
diff --git a/src/views/systemSetting/baseSetting/department/createUser/index.vue b/src/views/systemSetting/baseSetting/department/createUser/index.vue
index 26eaf15..58926d7 100644
--- a/src/views/systemSetting/baseSetting/department/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/createUser/index.vue
@@ -54,7 +54,7 @@
</main>
<footer>
<div class="optionBtn">
- <el-button>鍙栨秷</el-button>
+ <el-button @click="handleClose">鍙栨秷</el-button>
<el-button type="primary" class="btn submit" @click="handleUser">纭畾</el-button>
</div>
</footer>
@@ -193,8 +193,11 @@
console.log(this.checkedUser);
this.openUser = false;
},
+ handleClose(){
+ this.$emit('changMyDialog',{flag:false});
+ }
},
- props: ['refresh']
+ props: ['refresh','changMyDialog']
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/systemSetting/baseSetting/department/index.vue b/src/views/systemSetting/baseSetting/department/index.vue
index 50a8b22..1e1ac1b 100644
--- a/src/views/systemSetting/baseSetting/department/index.vue
+++ b/src/views/systemSetting/baseSetting/department/index.vue
@@ -13,7 +13,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="context==='' ? getUserList : search " />
+ <createUser :refresh="context==='' ? getUserList : search " @changMyDialog="changMyDialog" />
</el-dialog>
</div>
</div>
@@ -307,8 +307,9 @@
this.search();
},
// 鍏抽棴dialog
- changMyDialog(val) {
- this.dialogUpdate = val.dialogFlag;
+ changMyDialog({flag}) {
+ this.dialogUpdate = flag;
+ this.dialogCreate = flag;
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
diff --git a/src/views/systemSetting/baseSetting/department/updateUser/index.vue b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
index 1c85622..6f1c887 100644
--- a/src/views/systemSetting/baseSetting/department/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
@@ -147,7 +147,7 @@
message:res.message,
type:res.code === 200 ? 'success' : 'warning',
})
- this.$emit('changeDialog', { dialogUpdate: false });
+ this.$emit('changeDialog', { flag: false });
this.getUserList();
})
} else {
diff --git a/src/views/systemSetting/baseSetting/role/viewRole/index.vue b/src/views/systemSetting/baseSetting/role/viewRole/index.vue
index 0b85c5b..1d029ac 100644
--- a/src/views/systemSetting/baseSetting/role/viewRole/index.vue
+++ b/src/views/systemSetting/baseSetting/role/viewRole/index.vue
@@ -6,20 +6,11 @@
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-input v-model="role.name" 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瀛椾互鍐�"></el-input>
+ <el-input type="textarea" v-model="role.description" placeholder="璇疯緭鍏ユ弿杩板唴瀹�200瀛椾互鍐�" disabled></el-input>
</el-form-item>
</el-form>
--
Gitblit v1.8.0