From 9736af164d1aae76b3388944d675cb21b61c755b Mon Sep 17 00:00:00 2001 From: Oliver <1070107765@qq.com> Date: 星期一, 12 十二月 2022 14:01:04 +0800 Subject: [PATCH] fix bug --- src/views/operate/sms/smsIndex/index.vue | 188 +++++++------ src/views/operate/sms/smsIndex/createSms/index.vue | 7 src/views/systemSetting/baseSetting/department/index.vue | 327 +++++++++++++--------- src/views/layout/components/Header/updatePassword/index.vue | 260 ++++++++++-------- src/views/intelligentPatrol/studyJudge/index.vue | 4 src/views/systemSetting/baseSetting/user/components/createUser/index.vue | 16 6 files changed, 446 insertions(+), 356 deletions(-) diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue index 5888e19..b5fc94f 100644 --- a/src/views/intelligentPatrol/studyJudge/index.vue +++ b/src/views/intelligentPatrol/studyJudge/index.vue @@ -49,7 +49,7 @@ <span>{{ currentEvent.conntinueTime }}</span> </el-form-item> <el-form-item label="鍏宠仈搴楅摵" prop="store"> - <el-select v-model="eventInfoData.store" @change="selectStoreChange" placeholder="璇烽�夋嫨鍏宠仈搴楅摵"> + <el-select v-model="eventInfoData.store" clearable @change="selectStoreChange" placeholder="璇烽�夋嫨鍏宠仈搴楅摵"> <el-option v-for="store in storeList" :value="store.id" :label="store.storeName" :key="store.id" /> </el-select> </el-form-item> @@ -370,4 +370,4 @@ color: #4b9bb7; } } -</style> \ No newline at end of file +</style> diff --git a/src/views/layout/components/Header/updatePassword/index.vue b/src/views/layout/components/Header/updatePassword/index.vue index 6a7d481..5e5c04c 100644 --- a/src/views/layout/components/Header/updatePassword/index.vue +++ b/src/views/layout/components/Header/updatePassword/index.vue @@ -1,139 +1,165 @@ <template> - <div class="createUser"> - <main> - <div class="mainContent"> - <el-form ref="password" label-width="140px" :rules="passwordRules" autoComplete="on" :model="password" - label-position="right"> - <el-form-item class="optionItem" label="褰撳墠瀵嗙爜:" prop="oldPassword"> - <el-input type="password" v-model="password.oldPassword" placeholder="璇峰~鍐欏綋鍓嶅瘑鐮�"></el-input> - </el-form-item> - <el-form-item class="optionItems" label="鏂板瘑鐮�:" prop="newPassword"> - <el-input type="password" v-model="password.newPassword" placeholder="璇峰~鍐欐柊瀵嗙爜"></el-input> - </el-form-item> - <el-form-item class="optionItems" label="纭畾鏂板瘑鐮�:" prop="confirmPassword"> - <el-input type="password" v-model="password.confirmPassword" placeholder="璇峰啀娆″~鍐欐柊瀵嗙爜"></el-input> - </el-form-item> - <el-form-item class="optionItems"> - <el-button type="primary" @click="onSubmit">鎻愪氦</el-button> - </el-form-item> - </el-form> - </div> - </main> - </div> + <div class="createUser"> + <main> + <div class="mainContent"> + <el-form ref="password" label-width="140px" :rules="passwordRules" autoComplete="on" :model="password" + label-position="right"> + <el-form-item class="optionItem" label="褰撳墠瀵嗙爜:" prop="oldPassword"> + <el-input type="password" v-model="password.oldPassword" placeholder="璇峰~鍐欏綋鍓嶅瘑鐮�"></el-input> + </el-form-item> + <el-form-item class="optionItems" label="鏂板瘑鐮�:" prop="newPassword"> + <el-input type="password" v-model="password.newPassword" placeholder="璇峰~鍐欐柊瀵嗙爜"></el-input> + </el-form-item> + <el-form-item class="optionItems" label="纭畾鏂板瘑鐮�:" prop="confirmPassword"> + <el-input type="password" v-model="password.confirmPassword" placeholder="璇峰啀娆″~鍐欐柊瀵嗙爜"></el-input> + </el-form-item> + <el-form-item class="optionItems"> + <el-button type="primary" @click="onSubmit">鎻愪氦</el-button> + </el-form-item> + </el-form> + </div> + </main> + </div> </template> <script> import users from "@/api/users"; export default { - data() { - return { - updatePasswordParam:{ - newPassword:"", - oldPassword:"", - username:"" - }, - password: { - oldPassword: null, - newPassword: null, - confirmPassword: null - }, - passwordRules: { - newPassword: [{ required: true, trigger: 'blur', message: '瀵嗙爜涓嶈兘涓虹┖' }], - oldPassword: [{ required: true, trigger: 'blur', message: '鏂板瘑鐮佷笉鑳戒负绌�' }], - confirmPassword: [{ required: true, trigger: 'blur', message: '鏂板瘑鐮佷笉鑳戒负绌�' }], - }, - } - }, - created() { - }, - methods: { - onSubmit() { - this.$refs.password.validate(valid => { - if (valid) { - this.updatePasswordParam.oldPassword=this.password.oldPassword; - this.updatePasswordParam.username=sessionStorage.getItem('name'); - this.updatePasswordParam.newPassword=this.password.newPassword; - users.updatePassword(this.updatePasswordParam) - .then(() => { - this.$message.success('淇敼瀵嗙爜鎴愬姛, 鍗冲皢閲嶆柊鐧诲綍'); - this.logout(); - location.reload(); - }) - .catch(err => this.$message.error(err)) + data() { + const validatePass = (rule, value, callback) => { + if (!value) { + callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖")); + } else { + if (value.length < 6 || value.length > 16) { + callback(new Error("鐢ㄦ埛瀵嗙爜闀垮害涓嶅悎娉�")); + } else { + const rep = /^\w+$/; + if (!rep.test(value)) { + callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆")); + } else { + callback(); } - }) - }, - logout() { - users.logout() - .then(() => { - sessionStorage.clear(); - }) - .catch(err => this.$message.error(err)) + } } - }, + }; + return { + updatePasswordParam: { + newPassword: "", + oldPassword: "", + username: "" + }, + password: { + oldPassword: null, + newPassword: null, + confirmPassword: null + }, + passwordRules: { + newPassword: [ + {required: true, trigger: 'blur', message: '瀵嗙爜涓嶈兘涓虹┖'}, + {validator: validatePass, trigger: 'blur'} + ], + oldPassword: [ + {required: true, trigger: 'blur', message: '鏂板瘑鐮佷笉鑳戒负绌�'}, + {validator: validatePass, trigger: 'blur'} + ], + confirmPassword: [ + {required: true, trigger: 'blur', message: '鏂板瘑鐮佷笉鑳戒负绌�'}, + {validator: validatePass, trigger: 'blur'} + ], + } + } + }, + created() { + }, + methods: { + onSubmit() { + this.$refs.password.validate(valid => { + if (valid) { + this.updatePasswordParam.oldPassword = this.password.oldPassword; + this.updatePasswordParam.username = sessionStorage.getItem('name'); + this.updatePasswordParam.newPassword = this.password.newPassword; + users.updatePassword(this.updatePasswordParam) + .then(() => { + this.$message.success('淇敼瀵嗙爜鎴愬姛, 鍗冲皢閲嶆柊鐧诲綍'); + this.logout(); + location.reload(); + }) + .catch(err => this.$message.error(err)) + } + }) + } + , + logout() { + users.logout() + .then(() => { + sessionStorage.clear(); + }) + .catch(err => this.$message.error(err)) + } + }, } </script> <style lang="scss" scoped> .createUser { - border-radius: 1px; + border-radius: 1px; + background-color: #09152f; + + main { + text-align: left; + padding: 0 55px; background-color: #09152f; + padding-bottom: 50px; - main { - text-align: left; - padding: 0 55px; - background-color: #09152f; - padding-bottom: 50px; + .mainContent { + display: flex; + justify-content: center; + padding-top: 50px; - .mainContent { - display: flex; - justify-content: center; - padding-top: 50px; + .el-form-item__content { + width: 400px; - .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; - } - } - + .el-select { + width: 100%; } - } + } - &::v-deep .el-textarea__inner { - background-color: #09152f; - border: 1px solid #17324c; - } + .optionHandleSp { + display: flex; - ::v-deep .el-form-item__label { - color: #4b9bb7; - } + .areaNumber, + .moreNumber { + flex: 1; + } - ::v-deep .el-input__inner { - background-color: #09152f; - border: 1px solid #17324c; + .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 +</style> diff --git a/src/views/operate/sms/smsIndex/createSms/index.vue b/src/views/operate/sms/smsIndex/createSms/index.vue index 7cbf7c0..dc3c07e 100644 --- a/src/views/operate/sms/smsIndex/createSms/index.vue +++ b/src/views/operate/sms/smsIndex/createSms/index.vue @@ -82,7 +82,7 @@ { required: true, trigger: "blur", message: '璇疯緭鍏ョ煭淇℃爣棰�' }, ], targetTo: [ - { required: true , trigger: "blur", message: '璇烽�夋嫨鎺ユ敹浜�' }, + { required: true , trigger: "blur", message: '璇烽�夋嫨鎺ユ敹瀵硅薄' }, ], body: [ { required: true, trigger: ['blur', 'change'], validator: validateMessageContent } @@ -172,6 +172,7 @@ }, // 閫変腑id handleCheck(data, node) { + this.checkedList = [] node.checkedNodes.forEach(item => { if(!item.hasOwnProperty('departType')){ this.checkedList.push(item.id) @@ -191,7 +192,7 @@ sendMessage(params) .then(() => { this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' }); - this.$emit('closeDialog'); + this.$emit('closeMyDialog'); }) .catch(err => this.$message({ type: 'error', message: err })); } else { @@ -328,4 +329,4 @@ } } } -</style> \ No newline at end of file +</style> diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue index 0684d13..c723854 100644 --- a/src/views/operate/sms/smsIndex/index.vue +++ b/src/views/operate/sms/smsIndex/index.vue @@ -13,20 +13,22 @@ <span>鐭俊鍥炴墽:</span> <el-select v-model="messageStatus" placeholder="璇烽�夋嫨"> <el-option - v-for="item in statusList" - :key="item.value" - :label="item.label" - :value="item.label" + v-for="item in statusList" + :key="item.value" + :label="item.label" + :value="item.label" > </el-option> </el-select> </div> <div class="find"> <el-button type="primary" icon="el-icon-search" @click="getTableData" - >鏌ヨ</el-button + >鏌ヨ + </el-button > <el-button icon="el-icon-delete-solid" @click="handleReset" - >閲嶇疆</el-button + >閲嶇疆 + </el-button > </div> </div> @@ -36,29 +38,30 @@ <div class="main-nav"> <span>鏁版嵁鍒楄〃</span> <el-button - class="button-addition" - type="primary" - icon="el-icon-plus" - @click="isShowDialog = true" - >娣诲姞</el-button + class="button-addition" + type="primary" + icon="el-icon-plus" + @click="isShowDialog = true" + >娣诲姞 + </el-button > </div> <!-- 鏁版嵁灞曠ず --> <el-table - ref="multipleTable" - :header-cell-style="{ + ref="multipleTable" + :header-cell-style="{ background: '#06122c', 'font-size': '12px', color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px', }" - :data="tableData" - style="width: 100%" - :row-class-name="tableRowClassName" - @selection-change="tableChange" + :data="tableData" + style="width: 100%" + :row-class-name="tableRowClassName" + @selection-change="tableChange" > - <el-table-column type="selection" min-width="5"> </el-table-column> + <el-table-column type="selection" min-width="5"></el-table-column> <el-table-column label="ID" min-width="5" prop="id"> <template slot-scope="scope">{{ scope.row.id }}</template> </el-table-column> @@ -71,26 +74,28 @@ <el-table-column prop="status" label="鍙戝竷鐘舵��" min-width="5"> <template slot-scope="scope"> <span>{{ - statusList.find((item) => item.value === scope.row.status).label - }}</span> + statusList.find((item) => item.value === scope.row.status).label + }}</span> </template> </el-table-column> <el-table-column prop="operation" label="鎿嶄綔" min-width="15"> <template slot-scope="scope"> <div class="operation"> <el-link - class="leftPx" - icon="el-icon-delete-solid" - :underline="false" - @click="handleDelete([scope.row.id])" - >鍒犻櫎</el-link + class="leftPx" + icon="el-icon-delete-solid" + :underline="false" + @click="handleDelete([scope.row.id])" + >鍒犻櫎 + </el-link > <el-link - icon="el-icon-edit" - class="leftPx" - :underline="false" - @click="resend(scope.row)" - >閲嶆柊鍙戦��</el-link + icon="el-icon-edit" + class="leftPx" + :underline="false" + @click="resend(scope.row)" + >閲嶆柊鍙戦�� + </el-link > </div> </template> @@ -98,12 +103,12 @@ </el-table> <!-- 鏂板缓娑堟伅 --> <el-dialog - title="鏂板缓娑堟伅" - :destroy-on-close="true" - :key="dialogType" - :visible.sync="isShowDialog" - width="80%" - :before-close="handleConfirmClose" + title="鏂板缓娑堟伅" + :destroy-on-close="true" + :key="dialogType" + :visible.sync="isShowDialog" + width="80%" + :before-close="handleConfirmClose" > <MyCreate @closeMyDialog="closeDialog" :type="dialogType"></MyCreate> </el-dialog> @@ -111,25 +116,27 @@ <div class="funs"> <div class="funsItem funs-sp"> <el-checkbox v-model="all" @change="selectAll()" - >鍏ㄩ��</el-checkbox + >鍏ㄩ�� + </el-checkbox > </div> <div class="funsItem funs-sp"> <el-checkbox v-model="unsame" @change="disSame(tableData)" - >鍙嶉��</el-checkbox + >鍙嶉�� + </el-checkbox > </div> <div class="funsItem"> <el-select - v-model="myIdx" - placeholder="鎵归噺鎿嶄綔" - @change="selectChange" + v-model="myIdx" + placeholder="鎵归噺鎿嶄綔" + @change="selectChange" > <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" + v-for="item in options" + :key="item.value" + :label="item.label" + :value="item.value" > </el-option> </el-select> @@ -137,12 +144,12 @@ </div> <div class="pagination"> <el-pagination - background - :current-page="currentPage" - layout="prev, pager, next" - :total="totalNum" - :page-size="pageSize" - @current-change="changeCurrentPage" + background + :current-page="currentPage" + layout="prev, pager, next" + :total="totalNum" + :page-size="pageSize" + @current-change="changeCurrentPage" > </el-pagination> </div> @@ -247,18 +254,18 @@ // 鍒犻櫎淇℃伅 handleDelete(ids) { this.$confirm("纭鍒犻櫎?").then(() => { - deleteMessage({ ids: ids.join(",") }) - .then(() => { - this.$message({ type: "success", message: "鎿嶄綔鎴愬姛" }); - this.getTableData(); - }) - .catch((err) => this.$message({ type: "error", message: err })); + deleteMessage({ids: ids.join(",")}) + .then(() => { + this.$message({type: "success", message: "鎿嶄綔鎴愬姛"}); + this.getTableData(); + }) + .catch((err) => this.$message({type: "error", message: err})); }); }, getTableData() { const respondResult = - this.messageStatus === "鍏ㄩ儴" ? null : this.messageStatus; + this.messageStatus === "鍏ㄩ儴" ? null : this.messageStatus; getMessageList({ channelCode: "02", current: this.currentPage, @@ -266,13 +273,13 @@ pageSize: this.pageSize, head: this.context, }) - .then(({ records, total }) => { - this.tableData = records; - this.totalNum = total; - }) - .catch((err) => { - this.$message({ type: "error", message: err }); - }); + .then(({records, total}) => { + this.tableData = records; + this.totalNum = total; + }) + .catch((err) => { + this.$message({type: "error", message: err}); + }); }, resend(data) { @@ -280,11 +287,11 @@ return; } sendMessage(data) - .then(() => { - this.$message.success("鎿嶄綔鎴愬姛"); - this.getTableData(); - }) - .catch((err) => this.$message.error(`${err}`)); + .then(() => { + this.$message.success("鎿嶄綔鎴愬姛"); + this.getTableData(); + }) + .catch((err) => this.$message.error(`${err}`)); }, // 鎵归噺涓嬫媺妗嗘搷浣� @@ -310,24 +317,25 @@ // 鎵归噺鎿嶄綔 mulUpdateStatus(idArr, flag) { this.$confirm( - flag === 1 - ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤瑙掕壊鍚�?" - : "鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤瑙掕壊鍚�?" + flag === 1 + ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤瑙掕壊鍚�?" + : "鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤瑙掕壊鍚�?" ) - .then((_) => { - this.$axios({ - method: "post", - url: "sccg/role/updateStatusBatch?ids=" + idArr + "&status=" + flag, - }) - .then(() => { - this.getTableData(); - this.$message({ type: "success", message: "鎿嶄綔鎴愬姛" }); + .then((_) => { + this.$axios({ + method: "post", + url: "sccg/role/updateStatusBatch?ids=" + idArr + "&status=" + flag, }) - .catch((err) => { - this.$message({ type: "error", message: err }); - }); - }) - .catch((err) => {}); + .then(() => { + this.getTableData(); + this.$message({type: "success", message: "鎿嶄綔鎴愬姛"}); + }) + .catch((err) => { + this.$message({type: "error", message: err}); + }); + }) + .catch((err) => { + }); }, // 琛ㄦ牸鐩戝惉 tableChange(list) { @@ -338,7 +346,7 @@ this.all = list.length === this.tableData.length; }, // 淇敼鏃堕棿鏍煎紡 - changeTime({ updateTime }) { + changeTime({updateTime}) { return helper(updateTime); }, // 鍏ㄩ�� @@ -352,7 +360,7 @@ }); }, // 璁剧疆琛ㄦ牸鏂戦┈绾� - tableRowClassName({ row, rowIndex }) { + tableRowClassName({row, rowIndex}) { if ((rowIndex + 1) % 2 === 0) { return "warning-row"; } else { @@ -406,6 +414,7 @@ min-width: 120px; padding-left: 15px; } + .search, .message-status, .message-kind { @@ -430,6 +439,7 @@ .find { margin-left: 15px; } + .findBtn { line-height: 100px; margin-left: 15px; @@ -627,4 +637,4 @@ padding: 0; } } -</style> \ No newline at end of file +</style> diff --git a/src/views/systemSetting/baseSetting/department/index.vue b/src/views/systemSetting/baseSetting/department/index.vue index 1ae0aa0..da964c5 100644 --- a/src/views/systemSetting/baseSetting/department/index.vue +++ b/src/views/systemSetting/baseSetting/department/index.vue @@ -11,18 +11,19 @@ </div> <div class="addUser"> <el-button class="addBtn" type="primary" @click="dialogCreate = true" - >鏂板閮ㄩ棬</el-button + >鏂板閮ㄩ棬 + </el-button > <el-dialog - :visible.sync="dialogCreate" - title="鏂板閮ㄩ棬淇℃伅" - width="45%" - v-if="dialogCreate" - :before-close="handleClose2" + :visible.sync="dialogCreate" + title="鏂板閮ㄩ棬淇℃伅" + width="45%" + v-if="dialogCreate" + :before-close="handleClose2" > <createUser - :refresh="context === '' ? getUserList : search" - @changMyDialog="changMyDialog" + :refresh="context === '' ? getUserList : search" + @changMyDialog="changMyDialog" /> </el-dialog> </div> @@ -32,20 +33,20 @@ <div class="mainContent"> <!-- 鏁版嵁灞曠ず --> <el-table - ref="multipleTable" - :header-cell-style="{ + ref="multipleTable" + :header-cell-style="{ background: '#06122c', 'font-size': '12px', color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px', }" - :data="tableData" - style="width: 100%" - :row-class-name="tableRowClassName" - @selection-change="tableChange" + :data="tableData" + style="width: 100%" + :row-class-name="tableRowClassName" + @selection-change="tableChange" > - <el-table-column type="selection" min-width="5"> </el-table-column> + <el-table-column type="selection" min-width="5"></el-table-column> <el-table-column prop="id" label="閮ㄩ棬ID" min-width="5"> <!-- <template slot-scope="scope">{{ scope.row.id }}</template> --> </el-table-column> @@ -60,11 +61,11 @@ <el-table-column prop="status" label="鍚敤" min-width="5"> <template slot-scope="scope"> <el-switch - class="switchStyle" - v-model="scope.row.status" - active-color="#3fef9a" - inactive-color="#000212" - disabled + class="switchStyle" + v-model="scope.row.status" + active-color="#3fef9a" + inactive-color="#000212" + disabled > </el-switch> </template> @@ -83,17 +84,17 @@ </el-table> <!-- 鏌ョ湅淇敼椤甸潰 --> <el-dialog - :visible.sync="dialogUpdate" - width="45%" - :title="updateFlag ? '淇敼閮ㄩ棬淇℃伅' : '鏌ョ湅閮ㄩ棬淇℃伅'" - v-if="dialogUpdate" - :before-close="handleClose" + :visible.sync="dialogUpdate" + width="45%" + :title="updateFlag ? '淇敼閮ㄩ棬淇℃伅' : '鏌ョ湅閮ㄩ棬淇℃伅'" + v-if="dialogUpdate" + :before-close="handleClose" > <updateUser - :updateFlag="updateFlag" - :userInfo="userInfo" - :getDepartList="context === '' ? getUserList : search" - @changeDialog="changMyDialog" + :updateFlag="updateFlag" + :userInfo="userInfo" + :getDepartList="context === '' ? getUserList : search" + @changeDialog="changMyDialog" /> </el-dialog> <!-- tools --> @@ -101,26 +102,28 @@ <div class="funs"> <div class="funsItem funs-sp"> <el-checkbox v-model="all" @change="selectAll()" - >鍏ㄩ��</el-checkbox + >鍏ㄩ�� + </el-checkbox > </div> <div class="funsItem funs-sp"> <el-checkbox v-model="unsame" @change="disSame(tableData)" - >鍙嶉��</el-checkbox + >鍙嶉�� + </el-checkbox > </div> <div class="funsItem"> <el-select - v-model="myIdx" - placeholder="鎵归噺鎿嶄綔" - @change="selectChange" + v-model="myIdx" + placeholder="鎵归噺鎿嶄綔" + @change="selectChange" > <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - :disabled="item.disabled" + v-for="item in options" + :key="item.value" + :label="item.label" + :value="item.value" + :disabled="item.disabled" > </el-option> </el-select> @@ -128,14 +131,14 @@ </div> <div class="pagination"> <el-pagination - background - :current-page="currentPage" - layout="prev, pager, next" - :total="totalNum" - :page-size="pageSize" - @current-change="changeCurrentPage" - @prev-click="handlePrev" - @next-click="handleNext" + background + :current-page="currentPage" + layout="prev, pager, next" + :total="totalNum" + :page-size="pageSize" + @current-change="changeCurrentPage" + @prev-click="handlePrev" + @next-click="handleNext" > </el-pagination> </div> @@ -147,6 +150,7 @@ <script> import createUser from "./createUser"; import updateUser from "./updateUser"; + export default { components: { createUser, @@ -196,9 +200,17 @@ selectChange(list) { console.log(this.tempList); if (this.tempList.length !== 0) { + if (list === 1) { + this.preMyIdx = list; + this.mulPut(this.tempList, list); + } + if (list === 2) { + this.preMyIdx = list; + this.mulPut(this.tempList); + } if (list === 3) { this.preMyIdx = list; - this.mulDelete(this.tempList); + this.mulDelete(this.tempList, list); } } else { this.myIdx = this.preMyIdx; @@ -208,31 +220,61 @@ }); } }, + mulPut(idArr, option) { + const status = option === 1 ? 1 : 0 + const tag = option === 1 ? "鍚敤" : "绂佺敤" + let list = JSON.parse(JSON.stringify(this.tableData)) + list = list.filter(x => idArr.indexOf(x.id) > -1) + list.forEach(x => x.status = status) + console.log(list) + this.$confirm(`鎮ㄧ‘瀹氳鎵归噺${tag}閮ㄩ棬鍚�?`) + .then((_) => { + this.$axios({ + method: "PUT", + url: "sccg/depart/batch_status", + data: list + }).then(res => { + console.log(res) + if (res.code === 200) { + this.$message({ + type: "success", + message: `鎵归噺${tag}閮ㄩ棬鎴愬姛` + }) + this.getUserList() + } else { + this.$message({ + type: "error", + message: res.message, + }) + } + }) + }) + }, // 澶氭潯鏁版嵁鍒犻櫎 mulDelete(idArr) { this.$confirm("鎮ㄧ‘瀹氳鎵归噺鍒犻櫎閮ㄩ棬鍚�?") - .then((_) => { - this.$axios({ - method: "post", - url: "sccg/depart/batch_deletion?ids=" + idArr, - }).then((res) => { - if (res.code === 200) { - this.$message({ - type: "success", - message: "鎵归噺鍒犻櫎閮ㄩ棬鎴愬姛", - }); - this.getUserList(); - } else { - this.$message({ - type: "error", - message: res.message, - }); - } + .then((_) => { + this.$axios({ + method: "post", + url: "sccg/depart/batch_deletion?ids=" + idArr, + }).then((res) => { + if (res.code === 200) { + this.$message({ + type: "success", + message: "鎵归噺鍒犻櫎閮ㄩ棬鎴愬姛", + }); + this.getUserList(); + } else { + this.$message({ + type: "error", + message: res.message, + }); + } + }); + }) + .catch((err) => { + console.log(err); }); - }) - .catch((err) => { - console.log(err); - }); }, tableChange(list) { this.tempList = []; @@ -254,37 +296,38 @@ }); }, // 鍗曟潯鏁版嵁鍒犻櫎 - handleDelete({ id }) { + handleDelete({id}) { this.$confirm("纭鍒犻櫎锛�") - .then((_) => { - this.$axios({ - method: "post", - url: "sccg/depart/delete", - data: { - id, - }, - }).then((res) => { - this.$message({ - type: res.code === 404 ? "warning" : "success", - message: res.message, - }); + .then((_) => { + this.$axios({ + method: "post", + url: "sccg/depart/delete", + data: { + id, + }, + }).then((res) => { + this.$message({ + type: res.code === 404 ? "warning" : "success", + message: res.message, + }); - this.getUserList(); + this.getUserList(); + }); + }) + .catch((_) => { }); - }) - .catch((_) => {}); }, // 淇敼鐘舵�� handleChangeStatus(obj) { - let { id, status } = obj; + let {id, status} = obj; status == true ? (status = 1) : (status = 0); this.$axios - .post(`sccg/depart/status`, { id: id, status: status }) - .then((res) => { - if (res.code == 200) { - this.getUserList(); - } - }); + .post(`sccg/depart/status`, {id: id, status: status}) + .then((res) => { + if (res.code == 200) { + this.getUserList(); + } + }); }, // 鑾峰彇鐢ㄦ埛鍒楄〃 getUserList() { @@ -292,47 +335,47 @@ this.dialogCreate = false; // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭� this.$axios - .get("sccg/depart/page", { - params: { - currentPage: this.currentPage, - pageSize: this.pageSize, - departName: this.context, - }, - }) - .then((res) => { - if (res.code === 200) { - res.data.records.forEach((item) => { - item.status == 0 ? (item.status = false) : (item.status = true); - }); - that.totalNum = res.data.total; - that.tableData = res.data.records; - } - }); + .get("sccg/depart/page", { + params: { + currentPage: this.currentPage, + pageSize: this.pageSize, + departName: this.context, + }, + }) + .then((res) => { + if (res.code === 200) { + res.data.records.forEach((item) => { + item.status == 0 ? (item.status = false) : (item.status = true); + }); + that.totalNum = res.data.total; + that.tableData = res.data.records; + } + }); }, search() { const that = this; this.dialogCreate = false; // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭� this.$axios - .get("sccg/depart/page", { - params: { - currentPage: this.currentPage, - pageSize: this.pageSize, - departName: this.context, - }, - }) - .then((res) => { - if (res.code === 200) { - res.data.records.forEach((item) => { - item.status == 1 ? (item.status = true) : (item.status = false); - }); - that.totalNum = res.data.total; - that.tableData = res.data.records; - } - }); + .get("sccg/depart/page", { + params: { + currentPage: this.currentPage, + pageSize: this.pageSize, + departName: this.context, + }, + }) + .then((res) => { + if (res.code === 200) { + res.data.records.forEach((item) => { + item.status == 1 ? (item.status = true) : (item.status = false); + }); + that.totalNum = res.data.total; + that.tableData = res.data.records; + } + }); }, // 璁剧疆琛ㄦ牸鏂戦┈绾� - tableRowClassName({ row, rowIndex }) { + tableRowClassName({row, rowIndex}) { if ((rowIndex + 1) % 2 == 0) { return "warning-row"; } else { @@ -368,29 +411,31 @@ this.search(); }, // 鍏抽棴dialog - changMyDialog({ flag }) { + changMyDialog({flag}) { this.dialogUpdate = flag; this.dialogCreate = flag; }, handleClose(done) { if (this.updateFlag) { this.$confirm("纭鍏抽棴锛�") - .then((_) => { - this.dialogUpdate = false; - this.dialogCreate = false; - done(); - }) - .catch((_) => {}); + .then((_) => { + this.dialogUpdate = false; + this.dialogCreate = false; + done(); + }) + .catch((_) => { + }); } else { done(); } }, handleClose2(done) { this.$confirm("纭鍏抽棴锛�") - .then((_) => { - done(); - }) - .catch((_) => {}); + .then((_) => { + done(); + }) + .catch((_) => { + }); }, }, }; @@ -403,7 +448,7 @@ header { background-color: #09152f; - border: 1pox solid #fff; + border: 1 pox solid #fff; .headerContent { padding: 0 40px; @@ -457,7 +502,7 @@ background-color: #09152f; margin-top: 20px; padding-bottom: 50px; - border: 1pox solid #fff; + border: 1 pox solid #fff; .mainTitle { line-height: 60px; @@ -468,9 +513,11 @@ justify-content: space-between; align-items: center; padding: 0 20px; + .funs-sp { border: 1px solid #17324c; } + .funs { display: flex; @@ -531,6 +578,7 @@ .el-table { color: #4b9bb7; font-size: 10px; + .operation { display: flex; @@ -543,6 +591,7 @@ } } } + // &::v-deep .switchStyle .el-switch__label { // position: absolute; // display: none; @@ -573,4 +622,4 @@ // } } } -</style> \ No newline at end of file +</style> diff --git a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue index 274dda7..70e1bfc 100644 --- a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue +++ b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue @@ -191,11 +191,15 @@ if (!value) { callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖")); } else { - const rep = /^\w+$/; - if (!rep.test(value)) { - callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆")); - } else { - callback(); + if (value.length < 6 || value.length > 16){ + callback(new Error("鐢ㄦ埛瀵嗙爜闀垮害涓嶅悎娉�")); + }else { + const rep = /^\w+$/; + if (!rep.test(value)) { + callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆")); + } else { + callback(); + } } } }; @@ -552,4 +556,4 @@ } } } -</style> \ No newline at end of file +</style> -- Gitblit v1.8.0