From 62778d5d0ce4fdd257d5fcacc83681baf05d54a9 Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期三, 02 十一月 2022 15:15:27 +0800 Subject: [PATCH] 新增任务页面 --- src/views/operate/sms/smsIndex/index.vue | 7 src/views/operate/sms/smsIndex/createSms/index.vue | 433 +++++++++++++++++++++++++++++++++++++++ vue.config.js | 2 src/views/operate/rectification/taskList/components/createInterface/index.vue | 80 ++++--- src/views/operate/rectification/taskList/index.vue | 101 ++++---- 5 files changed, 530 insertions(+), 93 deletions(-) diff --git a/src/views/operate/rectification/taskList/components/createInterface/index.vue b/src/views/operate/rectification/taskList/components/createInterface/index.vue index 1be774b..8b0944b 100644 --- a/src/views/operate/rectification/taskList/components/createInterface/index.vue +++ b/src/views/operate/rectification/taskList/components/createInterface/index.vue @@ -5,39 +5,42 @@ <el-form ref="user" label-width="140px" autoComplete="on" :model="myInterface" :rules="createmyInterfaceRules" label-position="right"> <!-- 搴旂敤鍚嶇О --> - <el-form-item label="搴旂敤鍚嶇О:" prop="applicationName"> - <el-input v-model="myInterface.applicationName" placeholder="濉啓搴旂敤鍚嶇О"></el-input> + <el-form-item label="浠诲姟缂栧彿:" prop="applicationName"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓浠诲姟缂栧彿"></el-input> </el-form-item> <!-- 搴旂敤鍥炬爣 --> - <el-form-item label="搴旂敤鍥炬爣:" prop="applicationIconUrl"> - <div class="iconBox"> - <div class="upload"> - <img src="@/assets/imgs/user/default-avatar.jpg" alt=""> - </div> - <div class="iconView"> - <span>绀烘剰鍥�</span> - <img src="@/assets/imgs/user/default-avatar.jpg" alt=""> - </div> - <div class="tip"> - <span>鍙厑璁镐笂浼爅pg,jpeg,png,svg鏍煎紡鐨勫浘鐗囷紝寤鸿灏哄涓�105px*105px</span> - </div> - </div> + <el-form-item label="鏍囬:" prop="applicationIconUrl"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓妗堜欢缂栧彿"></el-input> </el-form-item> <!-- 搴旂敤绫诲瀷 --> - <el-form-item label="搴旂敤绫诲瀷:" prop="applicationType"> - <div class="optionItem"> - <el-radio-group v-model="myInterface.applicationType"> - <el-radio :label="1">缃戦〉搴旂敤</el-radio> - </el-radio-group> - </div> + <el-form-item label="绫诲瀷:" prop="applicationType"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓闂绫诲瀷"></el-input> </el-form-item> - <!--缃戠珯url --> - <el-form-item label="缃戠珯url:" prop="websiteUrl"> - <el-input v-model="myInterface.websiteUrl"></el-input> + <!-- 搴旂敤鍚嶇О --> + <el-form-item label="绾у埆:" prop="applicationName"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓琛楅亾"></el-input> </el-form-item> - <!-- 搴旂敤鎻忚堪 --> - <el-form-item label="搴旂敤鎻忚堪:" prop="description"> - <el-input v-model="myInterface.description" placeholder="璇峰~鍐欐弿杩�"></el-input> + <!-- 搴旂敤鍥炬爣 --> + <el-form-item label="琛楅亾:" prop="applicationIconUrl"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓绀惧尯"></el-input> + </el-form-item> + <!-- 搴旂敤绫诲瀷 --> + <el-form-item label="绀惧尯:" prop="applicationType"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓鐩戠潱鍛�"></el-input> + </el-form-item> + <!-- 搴旂敤鍥炬爣 --> + <el-form-item label="寮�濮嬫椂闂�:" prop="applicationIconUrl"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓闂鎻忚堪"></el-input> + </el-form-item> + <!-- 搴旂敤绫诲瀷 --> + <el-form-item label="缁撴潫鏃堕棿:" prop="applicationType"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓涓婃姤鏃堕棿"></el-input> + </el-form-item> + <el-form-item label="浠诲姟鎻忚堪:" prop="applicationType"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓涓婃姤鏃堕棿"></el-input> + </el-form-item> + <el-form-item label="鐘舵��:" prop="applicationType"> + <el-input v-model="myInterface.applicationName" placeholder="濉啓鐘舵��"></el-input> </el-form-item> <!-- 鎸夐挳 --> <el-form-item> @@ -95,7 +98,7 @@ }, createmyInterfaceRules: { applicationName: [ - { required: true, trigger: "blur", validator: validateApplicationName}, + { required: true, trigger: "blur", validator: validateApplicationName }, ], applicationIconUrl: [ { required: true, trigger: "blur", validator: validateApplicationIconUrl }, @@ -119,11 +122,11 @@ handleUser() { const { myInterface } = this; this.$axios.post('sccg/system/portal/thirdApp/add', { - websiteUrl:myInterface.websiteUrl, - applicationIconUrl:myInterface.applicationIconUrl, - applicationType:0, - description:myInterface.description, - applicationName:myInterface.applicationName + websiteUrl: myInterface.websiteUrl, + applicationIconUrl: myInterface.applicationIconUrl, + applicationType: 0, + description: myInterface.description, + applicationName: myInterface.applicationName }).then(res => { console.log(res); // if (res.code === 200) { @@ -145,6 +148,7 @@ padding: 0 55px; background-color: #09152f; padding-bottom: 50px; + .mainContent { display: flex; justify-content: center; @@ -188,16 +192,20 @@ } } } - .optionBtn{ + + .optionBtn { margin-top: 30px; - &::v-deep .el-button{ + + &::v-deep .el-button { padding: 12px 40px; } - .reset{ + + .reset { border: 1px solid #0079fe; color: #0079fe; } } + &::v-deep .el-form-item__label { color: #4b9bb7; } diff --git a/src/views/operate/rectification/taskList/index.vue b/src/views/operate/rectification/taskList/index.vue index bc326e6..8256cf7 100644 --- a/src/views/operate/rectification/taskList/index.vue +++ b/src/views/operate/rectification/taskList/index.vue @@ -6,7 +6,7 @@ <main> <div class="mainHeader"> <div class="add"> - <el-button type="primary" icon="el-icon-plus">鏂板浠诲姟</el-button> + <el-button type="primary" icon="el-icon-plus" @click="addTask()">鏂板浠诲姟</el-button> </div> <div class="date-search"> <span>鎸夊ぉ鏌ヨ:</span> @@ -34,25 +34,25 @@ :row-class-name="tableRowClassName"> <el-table-column type="selection" width="55"> </el-table-column> - <el-table-column label="浠诲姟缂栧彿" prop="applicationName" min-width="10"> + <el-table-column prop="number" label="浠诲姟缂栧彿" min-width="10"> </el-table-column> - <el-table-column prop="applicationType" label="鏍囬" min-width="10"> + <el-table-column prop="title" label="鏍囬" min-width="10"> </el-table-column> - <el-table-column prop="websiteUrl" label="绫诲瀷" min-width="10"> + <el-table-column prop="type" label="绫诲瀷" min-width="10"> </el-table-column> - <el-table-column prop="applicationType" label="绾у埆" min-width="10"> + <el-table-column prop="level" label="绾у埆" min-width="10"> </el-table-column> - <el-table-column prop="applicationType" label="琛楅亾" min-width="10"> + <el-table-column prop="streetId" label="琛楅亾" min-width="10"> </el-table-column> - <el-table-column prop="applicationType" label="绀惧尯" min-width="10"> + <el-table-column prop="communityId" label="绀惧尯" min-width="10"> </el-table-column> - <el-table-column prop="applicationType" label="寮�濮嬫椂闂�" min-width="10"> + <el-table-column prop="startTime" label="寮�濮嬫椂闂�" min-width="10"> </el-table-column> - <el-table-column prop="applicationType" label="缁撴潫鏃堕棿" min-width="10"> + <el-table-column prop="endTime" label="缁撴潫鏃堕棿" min-width="10"> </el-table-column> - <el-table-column prop="applicationType" label="浠诲姟鎻忚堪" min-width="10"> + <el-table-column prop="description" label="浠诲姟鎻忚堪" min-width="10"> </el-table-column> - <el-table-column prop="applicationType" label="鐘舵��" min-width="10"> + <el-table-column prop="status" label="鐘舵��" min-width="10"> </el-table-column> <el-table-column label="鎿嶄綔" min-width="10"> <template slot-scope="scope"> @@ -73,7 +73,7 @@ </main> <footer> <!-- 鍒涘缓寮圭獥 --> - <el-dialog :visible.sync="dialogCreate" title="鏂板绗笁鏂规帴鍙�" width="45%" v-if="dialogCreate" + <el-dialog :visible.sync="dialogCreate" title="鏂板浠诲姟" width="45%" v-if="dialogCreate" :before-close="handleClose"> <createInterface /> </el-dialog> @@ -101,52 +101,47 @@ updateFlag: false, userInfo: '', date:'', - // totalNum: 200, - // pageSize: 10, - // currentPage: 1, + totalNum: 200, + pageSize: 10, + currentPage: 1, } }, - created() { - this.getUserList(); + async created() { + const arr = await this.getUserList(); + this.tableData = arr.records; + this.totalNum = arr.total; }, methods: { + addTask() { + this.dialogCreate = true; + }, // 鑾峰彇鎺ュ彛鍒楄〃 - getUserList() { - // const that = this; - // // const { currentPage, pageSize, search } = this; - // this.dialogCreate = false; - // this.$axios.get("/sccg/task/list").then(res => { - // const { code, data } = res; - // if (code == 200) { - // this.tableData = data; - // } - // }) - - // let arr = []; - // const { currentPage, pageSize,context,messageStatus,messageKind } = this; - // await this.$axios({ - // method: 'post', - // url: '/sccg/task/list', - // data: { - // body: "", - // channelCode: messageKind === '00' ?'':messageKind, - // createUser: '', - // current: currentPage, - // head: context, - // messageType: "", - // pageSize: pageSize, - // randomCode: "", - // remark: "", - // sendTime: "", - // status: messageStatus === 2 ? '':messageStatus, - // targetFrom: "", - // targetTo: "" - // } - // }) - // .then(res => { - // this.tableData = res.data; - // }) - // return arr; + async getUserList() { + let arr = []; + const { currentPage, pageSize,context,messageStatus,messageKind } = this; + await this.$axios({ + method: 'post', + url: '/sccg/task/list', + data: { + body: "", + channelCode: "", + createUser: '', + current: currentPage, + head: context, + messageType: "", + pageSize: pageSize, + randomCode: "", + remark: "", + sendTime: "", + status:"", + targetFrom: "", + targetTo: "" + } + }) + .then(res => { + arr = res.data; + }) + return arr; }, // 璁剧疆琛ㄦ牸鏂戦┈绾� tableRowClassName({ row, rowIndex }) { diff --git a/src/views/operate/sms/smsIndex/createSms/index.vue b/src/views/operate/sms/smsIndex/createSms/index.vue new file mode 100644 index 0000000..f3082bd --- /dev/null +++ b/src/views/operate/sms/smsIndex/createSms/index.vue @@ -0,0 +1,433 @@ +<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="messageType"> + <div class="message-item"> + <div class="message-item__left"> + <el-select v-model="role.messageType" placeholder="璇烽�夋嫨娑堟伅鏍忕洰"> + <el-option v-for="item in colList" :key="item.id" :label="item.columnName" + :value="item.id"> + </el-option> + </el-select> + </div> + <span class="message-add" @click='dialogCreate = true'> 娣诲姞鏍忕洰</span> + </div> + </el-form-item> + <!-- 娑堟伅鏍囬 --> + <el-form-item class="optionItems" label="娑堟伅鏍囬:" prop="head"> + <div class="message-item__left"> + <el-input v-model="role.head" placeholder="璇烽�夋嫨娑堟伅鏍囬"></el-input> + </div> + </el-form-item> + <!-- 鎺ユ敹瀵硅薄 --> + <el-form-item class="optionItem" label="鎺ユ敹瀵硅薄:" prop="targetTo"> + <div class="message-item__left"> + <el-select v-model="role.targetTo" placeholder="璇烽�夋嫨鎺ユ敹瀵硅薄" > + <el-option :value="role.targetTo"> + <el-tree ref="tree" :data="departList" :props="defaultProps" show-checkbox + @check="handleCheck" default-expand-all node-key="id"> + </el-tree> + </el-option> + </el-select> + </div> + </el-form-item> + <!-- 娑堟伅鍐呭 --> + <el-form-item class="optionItem" label="娑堟伅鍐呭:" prop="body"> + <MyEditor ref="edit" @getMyBody="getMyBody"></MyEditor> + <!-- <el-input type="textarea" v-model="role.description" placeholder="璇疯緭鍏ユ弿杩板唴瀹�200瀛椾互鍐�"></el-input> --> + </el-form-item> + <!-- 鎻愰啋鏂瑰紡 --> + <!-- <el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode"> + <el-radio-group v-model="role.channelCode"> + <el-radio label="01">绔欏唴淇�</el-radio> + <el-radio label="02">閭欢</el-radio> + <el-radio label="03">鐭俊</el-radio> + </el-radio-group> + <span class="message-tip">(鐭俊鍙敤鏁�: 1000鏉�)</span> + </el-form-item> --> + <el-form-item> + <div class="optionBtn"> + <!-- <el-button type="primary" @click.native.prevent="handleSubmit(0)" class="btn save">淇濆瓨 + </el-button> --> + <el-button type="primary" @click.native.prevent="handleSubmit(1)" class="btn submit">鍙戝竷 + </el-button> + <!-- <el-button type="primary" @click.native.prevent="handleView" class="btn submit">棰勮 + </el-button> --> + <el-button class="btn cancel" @click.native.prevent="handleReset">閲嶇疆</el-button> + </div> + </el-form-item> + </el-form> + <!-- 鏂板鏍忕洰 --> + <el-dialog title="娣诲姞鏍忕洰" :visible.sync="dialogCreate" v-if="dialogCreate" width="60%" + :before-close="handleConfirmClose" append-to-body> + <MyColumnAdd @closeDialog="closeDialog"></MyColumnAdd> + </el-dialog> + <!-- 棰勮娑堟伅 --> + <el-dialog title="娑堟伅棰勮" :visible.sync="dialogView" v-if="dialogView" width="60%" + :before-close="handleConfirmClose" append-to-body> + <MyColView :info="info" @closeDialog="closeDialog"></MyColView> + </el-dialog> + </div> + </main> + </div> +</template> +<script> +import MyEditor from '@/components/edit' +export default { + components: { MyEditor }, + data() { + const validateNickname = (rule, value, callback) => { + if (!value) { + callback(new Error("璇峰~鍐欐秷鎭爮鐩�")); + } else { + callback(); + } + }; + const validatePass = (rule, value, callback) => { + if (!value) { + callback(); + } else { + callback(); + } + }; + const validateTruename = (rule, value, callback) => { + if (value.length !== 0) { + callback(); + } else { + callback(new Error('璇烽�夋嫨鎺ユ敹瀵硅薄')); + } + }; + return { + role: { + messageType: '', + head: '', + targetTo: '', + targetFrom: null, + body: '', + channelCode: '01', + }, + createRoleRules: { + messageType: [ + { required: true, trigger: "blur", validator: validateNickname }, + ], + head: [ + { required: false, trigger: "blur", validator: validatePass }, + ], + targetTo: [ + { required: false, trigger: "blur", validator: validateTruename }, + ], + }, + colList: [], + departList: [], + typeList: [], + dialogCreate: false, + dialogView: false, + defaultProps: { + children: 'children', + label: 'departName', + // disabled: function (data, node) { + // if (data.createTime) { + // return !data.leaf + // } + // } + }, + checkedList: [], + tempNameArr:[], + info:{}, + sendUser:"" + } + }, + created() { + this.setColumnList(); + this.setDepartList(); + this.getLoginUserInfo(); + }, + methods: { + // 鍏抽棴寮圭獥 + handleConfirmClose(done) { + this.$confirm('纭鍏抽棴?') + .then(_ => { + done(); + }) + }, + // 璁剧疆鏍忕洰 + async setColumnList() { + this.colList = await this.getColumnList(); + }, + // 鑾峰彇鏍忕洰 + async getColumnList() { + let arr; + await this.$axios({ + method: 'get', + url: 'sccg/message_column/getAllColumn' + }) + .then(res => { + console.log(res); + arr = res.data; + }) + return arr; + }, + // 鍏抽棴寮圭獥 + closeDialog({ flag, index }) { + this.dialogCreate = flag; + if (index === 1) { + // 閲嶆柊璁剧疆鏍忕洰 + this.setColumnList(); + } + }, + // 鑾峰彇閮ㄩ棬鏍� + async getDepartList() { + let arr + await this.$axios({ + method: 'get', + url: 'sccg/depart/tree' + }) + .then(res => { + arr = res.data + }) + return arr; + }, + // 璁剧疆閮ㄩ棬鏍� + async setDepartList() { + this.departList = await this.filterDepartList(); + }, + // 澶勭悊閮ㄩ棬鏍� + async filterDepartList() { + let arr = await this.getDepartList(); + const { setChildren } = this; + // console.log(setChildren); + arr.forEach(item => { + setChildren(item); + }) + return arr; + }, + // 閫掑綊children + setChildren(obj) { + if (obj.children !== null) { + if (obj.children.length !== 0) { + obj.children.forEach(item => { + return this.setChildren(item); + }) + } + } else { + if (obj.userInfoDTOS.length !== 0) { + obj.children = []; + obj.userInfoDTOS.forEach(item => { + obj.children.push({ id: item.userId, departName: item.username }) + }) + } + } + }, + // 閫変腑id + handleCheck(data, node) { + let arr = [],nameArr = [] + console.log(node.checkedNodes) + node.checkedNodes.forEach(item => { + if(!item.hasOwnProperty('departType')){ + arr.push(item.id) + nameArr.push(item.departName) + } + }) + this.checkedList = arr + this.tempNameArr = nameArr + console.log(this.tempNameArr) + this.role.targetTo = arr.length + '浜�' + }, + // 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅) + handleSubmit(mystatus) { + this.$refs.user.validate((valid) => { + if (valid) { + const { role, checkedList } = this; + console.log(checkedList); + this.$axios({ + method: 'post', + url: 'sccg/message/sendMessage', + data: { + body: role.body, + channelCode: '03', + head: role.head, + messageType: role.messageType, + sendTime: new Date(), + targetTo: checkedList.join(','), + targetFrom: `${role.targetFrom}`, + status: mystatus, + } + }) + .then(res => { + if (res.code === 200) { + this.$message({ + type: 'success', + message: mystatus === 1 ? '鍙戦�佹垚鍔�' : '淇濆瓨鎴愬姛', + }) + this.$emit('closeMyDialog', { flag: false, index: 1 }); + } + }) + } else { + return false; + } + }) + }, + // 鑾峰緱娑堟伅浣� + getMyBody(obj) { + console.log(obj); + this.role.body = obj; + }, + // 閲嶇疆琛ㄥ崟 + handleReset() { + this.$refs.edit.editor.txt.clear(); + // this.$refs.edit.wangEditor.txt.html('<p><br></p>') + this.setDepartList(); + this.$refs.user.resetFields(); + }, + // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 + getLoginUserInfo() { + const name = sessionStorage.getItem('name'); + this.$axios({ + method: 'get', + url: 'sccg/admin/info?name=' + name, + }) + .then(res => { + this.role.targetFrom = res.data.userId + this.sendUser = res.data.username + }) + }, + // 娑堟伅棰勮 + handleView() { + this.$refs.user.validate((valid) => { + if (valid) { + const { role,getColText,tempNameArr,sendUser } = this + this.dialogView = true; + let info = {} + // 鑾峰緱鏍忕洰娑堟伅 + info.channelCode = role.channelCode === '01'? '绔欏唴淇�': role.channelCode === '02' ? '閭欢':'鐭俊' + info.messageType = getColText(role.messageType) + info.body = role.body + info.head = role.head + info.targetTo = tempNameArr + info.targetFrom = sendUser + this.info = info + } else { + return false + } + }) + }, + // 鑾峰緱鏍忕洰娑堟伅 + getColText(id){ + console.log(id) + const {colList} = this + let str = '' + colList.forEach(item=>{ + item.id === id ? str = item.columnName : '' + }) + return str + } + }, + props: ['closeMyDialog'] +} +</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; + &:deep(.el-dialog__title) { + color: #4b9bb7; + } + &::v-deep .el-form-item__label { + color: #4b9bb7; + } + + &::v-deep .el-input__inner { + width: 400px; + background-color: #09152f; + border: 1px solid #17324c; + } + + .message-item__left { + width: 400px; + } + + .message-add { + &:hover { + cursor: pointer; + } + } + + .el-form-item__content :deep(.el-select) { + width: 400px; + } + + :deep(.el-input) { + width: 400px; + } + + .message-item { + display: flex; + + span { + margin-left: 20px; + color: #4b9bb7; + } + } + + .message-tip { + margin-left: 20px; + } + + :deep(.el-input--suffix) { + width: 400px; + } + + &::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/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue index f511252..c8dd445 100644 --- a/src/views/operate/sms/smsIndex/index.vue +++ b/src/views/operate/sms/smsIndex/index.vue @@ -71,10 +71,10 @@ </el-table-column> </el-table> <!-- 鏂板缓娑堟伅 --> - <!-- <el-dialog title="鏂板缓娑堟伅" :visible.sync="dialogCreate" v-if="dialogCreate" width="80%" + <el-dialog title="鏂板缓娑堟伅" :visible.sync="dialogCreate" v-if="dialogCreate" width="80%" :before-close="handleConfirmClose"> <MyCreate @closeMyDialog="closeDialog"></MyCreate> - </el-dialog> --> + </el-dialog> <!-- 娑堟伅璇︽儏 --> <!-- <el-dialog title="娑堟伅璇︽儏" :visible.sync="dialogView" v-if="dialogView" width="45%" :before-close="handleClose"> @@ -115,9 +115,10 @@ </template> <script> import helper from '@/utils/mydate' +import MyCreate from './createSms' export default { components: { - // MyView, MyCreate,MyEdit + MyCreate }, data() { return { diff --git a/vue.config.js b/vue.config.js index 957682a..fa4d698 100644 --- a/vue.config.js +++ b/vue.config.js @@ -39,7 +39,7 @@ proxy: { // 璺ㄥ煙閰嶇疆 "/sccg": { - target: `http://42.193.1.25:8082/`, + target: `http://localhost:8082/`, changeOrigin: true } }, -- Gitblit v1.8.0