From a598d935a61fea27312fc57becd80e23bf09f788 Mon Sep 17 00:00:00 2001 From: “dzb” <2632970487@qq.com> Date: 星期五, 21 十月 2022 18:04:19 +0800 Subject: [PATCH] 修改bug --- src/api/logs.js | 3 src/views/operate/message/myIndex/createUser/index.vue | 131 +++++++++++----- src/views/operate/car/myIndex/create/soil/index.vue | 35 ++-- src/views/operate/car/myIndex/index.vue | 6 src/views/operate/fivepack/shop/components/createUser/index.vue | 152 +++++++++++++----- src/views/operate/message/myIndex/messageView/index.vue | 102 ++++++++++++ src/views/operate/fivepack/shop/components/header/index.vue | 2 src/views/operate/management/myIndex/index.vue | 5 src/views/operate/log/index.vue | 22 + src/views/operate/message/myIndex/index.vue | 6 src/components/solveProblem/index.vue | 4 11 files changed, 344 insertions(+), 124 deletions(-) diff --git a/src/api/logs.js b/src/api/logs.js index 349eee2..95fec44 100644 --- a/src/api/logs.js +++ b/src/api/logs.js @@ -23,6 +23,7 @@ method:'post', url:baseUrl+'/export', headers:{...token}, - params:data + params:data, + responseType: 'arraybuffer', }) }; diff --git a/src/components/solveProblem/index.vue b/src/components/solveProblem/index.vue index 6e36f23..05d47c5 100644 --- a/src/components/solveProblem/index.vue +++ b/src/components/solveProblem/index.vue @@ -9,13 +9,13 @@ <el-timeline-item :color="mycolor" v-for="item in list" :key="item.id"> <div class="title"> <div class="title-left">銆恵{item.name}}銆戝鐞嗕汉: {{item.disposeRecords && item.disposeRecords.length - != 0 ? item.disposeRecords[0].handlerText:''}} {{item.disposeRecords && item.disposeRecords.length}} + != 0 ? item.disposeRecords[0].handlerText:''}} </div> <div class="title-right">{{item.disposeRecords.length !==0 ? filterTime(item.disposeRecords[0].endTime):''}} </div> </div> - <div class="message">{{filterPerson(item.name)}}</div> + <div class="message">{{filterPerson(item.name)}} {{item.disposeRecords && item.disposeRecords.length !=0 ? item.disposeRecords[0].result:''}}</div> </el-timeline-item> </el-timeline> </div> diff --git a/src/views/operate/car/myIndex/create/soil/index.vue b/src/views/operate/car/myIndex/create/soil/index.vue index 3c300e2..dced212 100644 --- a/src/views/operate/car/myIndex/create/soil/index.vue +++ b/src/views/operate/car/myIndex/create/soil/index.vue @@ -17,16 +17,16 @@ </el-select> </el-form-item> <!-- 杞︿富濮撳悕 --> - <el-form-item class="optionItem" label="杞︿富濮撳悕:" prop="carUser"> - <el-input v-model="car.ownerName" placeholder="璇疯緭鍏ヨ溅涓诲鍚�"></el-input> + <el-form-item class="optionItem" label="杞︿富濮撳悕:" prop="carOwner"> + <el-input v-model="car.carOwner" placeholder="璇疯緭鍏ヨ溅涓诲鍚�"></el-input> </el-form-item> <!-- 杞﹁締浣跨敤浜哄憳 --> - <el-form-item class="optionItem" label="杞﹁締浣跨敤浜哄憳:" prop="vehicleUser"> - <el-input v-model="car.vehicleUser" placeholder="璇疯緭鍏ヨ溅杈嗕娇鐢ㄤ汉鍛�"></el-input> + <el-form-item class="optionItem" label="杞﹁締浣跨敤浜哄憳:" prop="carUser"> + <el-input v-model="car.carUser" placeholder="璇疯緭鍏ヨ溅杈嗕娇鐢ㄤ汉鍛�"></el-input> </el-form-item> <!-- 鑱旂郴鏂瑰紡 --> - <el-form-item class="optionItem" label="鑱旂郴鏂瑰紡:" prop="contact"> - <el-input v-model="car.contact" placeholder="璇疯緭鍏ヨ溅涓绘墜鏈哄彿鐮�"></el-input> + <el-form-item class="optionItem" label="鑱旂郴鏂瑰紡:" prop="phone"> + <el-input v-model="car.phone" placeholder="璇疯緭鍏ヨ溅涓绘墜鏈哄彿鐮�"></el-input> </el-form-item> <!-- 鏂藉伐鍗曚綅 --> <el-form-item class="optionItems" label="鏂藉伐鍗曚綅:" prop="constructionOrg"> @@ -123,13 +123,12 @@ return { car: { carNumber: "", - contact: "", - belong: "", - // id: 0, - ownerName: "", + phone: "", + carOwner: "", trajectory: "", - vehicleUser: "", + carUser: "", constructionOrg: '', + geographicPosition:'', }, createCarRules: { carNumber: [ @@ -142,18 +141,18 @@ required: true, trigger:'change',validator: checkCarModel } ], - contact: [ + phone: [ { required: true,trigger:'blur', validator: checkPhone } ], // id: 0, - ownerName: [ + carOwner: [ { required: true,trigger:'blur', validator: checkName } ], - vehicleUser: [ + carUser: [ { required: true, trigger:'blur',validator: checkUser } @@ -201,14 +200,12 @@ carNumber: car.carNumber, carModel:car.carModel, carPhoto:'', + carUser:car.carUser, + phone:car.phone, + carOwner:car.carOwner, constructionOrg:car.constructionOrg, geographicPosition:car.geographicPosition, - // contact: car.contact, - // belong: car.belong, - // id: 0, - // ownerName: car.ownerName, trajectory: car.trajectory, - // vehicleUser: car.vehicleUser, } }) .then(res => { diff --git a/src/views/operate/car/myIndex/index.vue b/src/views/operate/car/myIndex/index.vue index 8ecdd43..07e85bd 100644 --- a/src/views/operate/car/myIndex/index.vue +++ b/src/views/operate/car/myIndex/index.vue @@ -30,11 +30,11 @@ </el-table-column> <el-table-column prop="carModel" label="杞﹀瀷" min-width="10" v-if="mystatus===2"> </el-table-column> - <el-table-column prop="ownerName" label="杞︿富濮撳悕" min-width="10"> + <el-table-column :prop="mystatus ===1 ? 'ownerName':'carOwner'" label="杞︿富濮撳悕" min-width="10"> </el-table-column> - <el-table-column prop="vehicleUser" label="杞﹁締浣跨敤浜哄憳" min-width="10"> + <el-table-column :prop="mystatus ===1 ? 'vehicleUser' : 'carUser'" label="杞﹁締浣跨敤浜哄憳" min-width="10"> </el-table-column> - <el-table-column prop="contact" label="鑱旂郴鏂瑰紡" min-width="10"> + <el-table-column :prop="mystatus ===1 ? 'contact' : 'phone' " label="鑱旂郴鏂瑰紡" min-width="10"> </el-table-column> <el-table-column :prop="mystatus===1 ? 'belong' : 'geographicPosition'" :label="mystatus === 1 ? '鎵�灞為儴闂�':'鏂藉伐鍦板潃'" min-width="10"> </el-table-column> diff --git a/src/views/operate/fivepack/shop/components/createUser/index.vue b/src/views/operate/fivepack/shop/components/createUser/index.vue index 5860e28..0e5b88d 100644 --- a/src/views/operate/fivepack/shop/components/createUser/index.vue +++ b/src/views/operate/fivepack/shop/components/createUser/index.vue @@ -6,8 +6,11 @@ label-position="right"> <!-- 搴楅摵绫诲瀷 --> <el-form-item class="optionItem" label="搴楅摵绫诲瀷:" prop="storetype"> - <el-select v-model="store.storetype" placeholder="閫夋嫨搴楅摵/闂ㄥ簵绫诲瀷"> - <el-option v-for="item in shopTypeList" :key="item.name" :label="item.name" :value="item.value"> + <el-select v-model="store.storetype" placeholder="璇烽�夋嫨搴楅摵绫诲瀷"> + <el-option value="1"> + <el-tree ref="tree" :check-strictly="true" :data="shopTypeList" :props="defaultProps" + show-checkbox @check-change="handleCheck" default-expand-all node-key="id"> + </el-tree> </el-option> </el-select> </el-form-item> @@ -39,12 +42,13 @@ <footer> <div class="optionBtn"> <el-button class="btn reset" @click="handleBack">鍙栨秷</el-button> - <el-button type="primary" class="btn submit" @click="handleUser">纭畾</el-button> + <el-button type="primary" class="btn submit" @click="handleStore">纭畾</el-button> </div> </footer> </div> </template> <script> +import { getCodeList } from '@/utils/helper' export default { data() { const validateNickname = (rule, value, callback) => { @@ -75,7 +79,7 @@ const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/ if (!rep.test(value)) { callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜"); - }else{ + } else { callback(); } } @@ -90,7 +94,7 @@ const validateType = (rule, value, callback) => { if (!value) { callback(new Error('闂ㄥ簵绫诲瀷涓嶈兘涓虹┖')); - } else { + } else { callback(); } }; @@ -115,9 +119,9 @@ owner: [ { required: true, trigger: "blur", validator: validateNickname }, ], - storetype:[ + storetype: [ { - required:true,trigger:'change', validator:validateType, + required: true, trigger: 'change', validator: validateType, } ], idcardinfo: [ @@ -139,62 +143,116 @@ shopTypeList: [ { name: '绫诲瀷1', value: 1 }, { name: '绫诲瀷2', value: 2 } ], + defaultProps: { + children: 'children', + label: 'name', + disabled: (data, node) => { + if (node.level === 1 && node.childNodes.length !== 0) { + return !data.leaf + } + } + }, + selectOrg: { + orgsid: [] + }, } }, created() { - this.getCodeList(); + this.getShopTypeList(); }, methods: { - handleUser() { + handleStore() { const { store } = this; - console.log('in'); - this.$refs.user.validate((valid)=>{ + this.$refs.user.validate((valid) => { console.log(valid); - if(valid){ + if (valid) { this.$axios({ - method:'post', - url:'sccg/store/storeinfo/add', - data:{ - contact:store.contact, - idcardinfo:'511025184612310215', - owner:store.owner, - storeaddr:store.storeaddr, - storename:store.storename, + method: 'post', + url: 'sccg/store/storeinfo/add', + data: { + contact: store.contact, + idcardinfo: '511025184612310215', + owner: store.owner, + storeaddr: store.storeaddr, + storename: store.storename, } }) - .then(res=>{ - console.log(res); - if(res.code===200){ - this.$message({ - type:'success', - message:'娣诲姞鎴愬姛', - }) - this.$emit('sendDialog',{flag:false}); - }else{ - this.$message({ - type:'error', - message:res.message, - }) - } - }) - }else{ + .then(res => { + console.log(res); + if (res.code === 200) { + this.$message({ + type: 'success', + message: '娣诲姞鎴愬姛', + }) + this.$emit('sendDialog', { flag: false }); + } else { + this.$message({ + type: 'error', + message: res.message, + }) + } + }) + } else { return false; } }) }, - handleBack(){ - this.$emit('sendDialog',{flag:false}) + handleBack() { + this.$emit('sendDialog', { flag: false }) }, // 鑾峰彇瀛楀吀 - getCodeList(){ - this.$axios({ - method:'get', - url:'sccg/dict/queryByCode?code='+"03" - }) - .then(res=>{ - console.log(res); - }) - } + async getShopTypeList() { + let arr = await getCodeList('16'); + this.shopTypeList = this.createShopTypeTree(arr); + }, + // 鍒涘缓鍟嗛摵绫诲瀷鏍� + createShopTypeTree(arr) { + if (arr.length && arr.length !== 0) { + // 鑾峰彇椤剁骇鑿滃崟 + let treeRoot = arr.filter(item => { + return item.parentId === 0 + }) + console.log(treeRoot); + // 娣诲姞child + treeRoot.forEach(item => { + item.children = [] + arr.forEach(child => { + if (child.parentId === item.id) { + item.children.push(child) + } + }) + }) + return treeRoot; + } + }, + handleCheck(data, checked) { + this.store.storetype = data.name; + // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮� + const indexs = this.selectOrg.orgsid.indexOf(data.id) + // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠h〃涓嶈兘鍐嶆閫夋嫨銆� + if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) { + this.$message({ + message: '鍙兘閫夋嫨涓�涓儴闂紒', + type: 'warning', + showClose: true + }) + // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕� + this.$refs.tree.setChecked(data, false) + } else if (this.selectOrg.orgsid.length === 0 && checked) { + // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨 + // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push + this.selectOrg.orgsid = [] + this.selectOrg.orgsid.push(data.id) + } else if ( + indexs >= 0 && + this.selectOrg.orgsid.length === 1 && + !checked + ) { + // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣� + this.selectOrg.orgsid = [] + this.store.storetype = '' + } + }, }, props: ['sendDialog'] } diff --git a/src/views/operate/fivepack/shop/components/header/index.vue b/src/views/operate/fivepack/shop/components/header/index.vue index ba96679..d4899f3 100644 --- a/src/views/operate/fivepack/shop/components/header/index.vue +++ b/src/views/operate/fivepack/shop/components/header/index.vue @@ -65,7 +65,7 @@ // 娓呯┖search clearSearch(){ this.search = ''; - // this.$emit('getSearch',{text:this.search}); + this.$emit('getSearch',{text:this.search}); }, }, props: ['setDialog', 'getSearch', 'flag'], diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue index dcc0d0b..a7a9923 100644 --- a/src/views/operate/log/index.vue +++ b/src/views/operate/log/index.vue @@ -23,11 +23,10 @@ <el-date-picker v-model="mytime" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"> </el-date-picker> - <!-- <el-input placeholder="閫夋嫨鏃堕棿鑼冨洿" v-model="timeArea"></el-input> --> </div> <div class="find"> <el-button type="primary" icon="el-icon-search" @click="setTableData">鏌ヨ</el-button> - <el-button icon="el-icon-delete-solid">閲嶇疆</el-button> + <el-button icon="el-icon-delete-solid" @click="resetTableData">閲嶇疆</el-button> </div> </div> </header> @@ -93,6 +92,7 @@ </template> <script> import helper from '@/utils/mydate' +import {parseTime} from '@/utils/index' import { createNamespacedHelpers } from "vuex"; const { mapActions } = createNamespacedHelpers("logs"); export default { @@ -117,10 +117,9 @@ ], mysort: 0, tempList: [], - timeArea: '', operationType: '鍏ㄩ儴', operationTypeList: [], - mytime: '', + mytime: ['',''], } }, created() { @@ -129,6 +128,14 @@ }, methods: { ...mapActions(["getLogsList", 'getLogsOperationType', 'exportLogs']), + // 閲嶇疆 + resetTableData(){ + const {setTableData} = this + this.operationType = '鍏ㄩ儴' + this.mytime = ['',''] + this.context = '' + setTableData(); + }, // 瀵煎嚭鏃ュ織 async handleExport() { const { currentPage, pageSize, context, operationType } = this; @@ -211,16 +218,17 @@ }, // 鑾峰彇鏃ュ織鏁版嵁 async getLogList() { - const { currentPage, pageSize, context, operationType, mysort } = this; + const { currentPage, pageSize, context, operationType, mysort,mytime } = this; + console.log(mytime) let arr = await this.getLogsList({ content: context, current: currentPage, - endTime: '', + endTime: mytime[1] !==''?parseTime(mytime[1]):'', id: '', operationType: operationType === '鍏ㄩ儴' ? '' : operationType, portEquipment: '', size: pageSize, - startTime: '', + startTime: mytime[0] !==''?parseTime(mytime[0]):'', sort: mysort }) console.log(arr) diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue index 75c2111..2288ce0 100644 --- a/src/views/operate/management/myIndex/index.vue +++ b/src/views/operate/management/myIndex/index.vue @@ -83,7 +83,7 @@ </el-dialog> <!-- 璇︽儏椤甸潰 --> <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView" - :before-close="handleClose"> + :before-close="handleNoClose"> <MyDetail :info=info v-if="myproblem==1 ? true:false"></MyDetail> <MyIllDetail :info=info v-else></MyIllDetail> </el-dialog> @@ -299,6 +299,9 @@ }) .catch(_ => { }); }, + handleNoClose(done) { + done(); + }, async JumpView(data) { await this.getEventInfo(data.code); }, diff --git a/src/views/operate/message/myIndex/createUser/index.vue b/src/views/operate/message/myIndex/createUser/index.vue index 9b2fdc5..2c25012 100644 --- a/src/views/operate/message/myIndex/createUser/index.vue +++ b/src/views/operate/message/myIndex/createUser/index.vue @@ -26,10 +26,10 @@ <!-- 鎺ユ敹瀵硅薄 --> <el-form-item class="optionItem" label="鎺ユ敹瀵硅薄:" prop="targetTo"> <div class="message-item__left"> - <el-select v-model="role.targetTo" placeholder="璇烽�夋嫨鎺ユ敹瀵硅薄"> + <el-select v-model="role.targetTo" placeholder="璇烽�夋嫨鎺ユ敹瀵硅薄" > <el-option :value="role.targetTo"> - <el-tree ref="tree" check-strictly :data="departList" :props="defaultProps" - show-checkbox @check="handleCheck" default-expand-all node-key="id"> + <el-tree ref="tree" :data="departList" :props="defaultProps" show-checkbox + @check="handleCheck" default-expand-all node-key="id"> </el-tree> </el-option> </el-select> @@ -51,11 +51,11 @@ </el-form-item> <el-form-item> <div class="optionBtn"> - <el-button type="primary" class="btn save">淇濆瓨 + <el-button type="primary" @click.native.prevent="handleSubmit(0)" class="btn save">淇濆瓨 </el-button> - <el-button type="primary" @click.native.prevent="handleSubmit" class="btn submit">鍙戝竷 + <el-button type="primary" @click.native.prevent="handleSubmit(1)" class="btn submit">鍙戝竷 </el-button> - <el-button type="primary" class="btn submit">棰勮 + <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> @@ -66,6 +66,11 @@ :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> @@ -73,8 +78,9 @@ <script> import MyEditor from '@/components/edit' import MyColumnAdd from '@/views/operate/message/mycontrol/createUser' +import MyColView from '../messageView' export default { - components: { MyEditor, MyColumnAdd }, + components: { MyEditor, MyColumnAdd,MyColView }, data() { const validateNickname = (rule, value, callback) => { if (!value) { @@ -102,7 +108,7 @@ messageType: '', head: '', targetTo: '', - targetFrom:null, + targetFrom: null, body: '', channelCode: '01', }, @@ -121,16 +127,20 @@ departList: [], typeList: [], dialogCreate: false, + dialogView: false, defaultProps: { children: 'children', label: 'departName', - disabled: function (data, node) { - if (data.createTime) { - return !data.leaf - } - } + // disabled: function (data, node) { + // if (data.createTime) { + // return !data.leaf + // } + // } }, - checkedList: [] + checkedList: [], + tempNameArr:[], + info:{}, + sendUser:"" } }, created() { @@ -216,17 +226,25 @@ }, // 閫変腑id handleCheck(data, node) { - console.log(data, node); - this.checkedList = node.checkedKeys; - this.role.targetTo = node.checkedKeys.length + '浜�'; + 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 + '浜�' }, - // 鏂板缓娑堟伅 - handleSubmit() { - console.log(this.role); + // 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅) + handleSubmit(mystatus) { this.$refs.user.validate((valid) => { - console.log(valid) if (valid) { - const {role,checkedList} = this; + const { role, checkedList } = this; + console.log(checkedList); this.$axios({ method: 'post', url: 'sccg/message/sendMessage', @@ -237,19 +255,19 @@ messageType: role.messageType, sendTime: new Date(), targetTo: checkedList.join(','), - targetFrom:`${role.targetFrom}`, - status:1, + targetFrom: `${role.targetFrom}`, + status: mystatus, } }) - .then(res=>{ - if(res.code === 200){ - this.$message({ - type:'success', - message:'鍙戦�佹垚鍔�', - }) - this.$emit('closeMyDialog',{flag:false,index:1}); - } - }) + .then(res => { + if (res.code === 200) { + this.$message({ + type: 'success', + message: mystatus === 1 ? '鍙戦�佹垚鍔�' : '淇濆瓨鎴愬姛', + }) + this.$emit('closeMyDialog', { flag: false, index: 1 }); + } + }) } else { return false; } @@ -261,22 +279,53 @@ this.role.body = obj; }, // 閲嶇疆琛ㄥ崟 - handleReset(){ + handleReset() { this.$refs.edit.editor.txt.clear(); // this.$refs.edit.wangEditor.txt.html('<p><br></p>') this.setDepartList(); this.$refs.user.resetFields(); }, // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 - getLoginUserInfo(){ + getLoginUserInfo() { const name = sessionStorage.getItem('name'); this.$axios({ - method:'get', - url:'sccg/admin/info?name='+name, + method: 'get', + url: 'sccg/admin/info?name=' + name, }) - .then(res=>{ - this.role.targetFrom = res.data.userId + .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'] @@ -297,7 +346,9 @@ display: flex; justify-content: center; padding-top: 50px; - + &:deep(.el-dialog__title) { + color: #4b9bb7; + } &::v-deep .el-form-item__label { color: #4b9bb7; } diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue index 1c0cd18..a6a6527 100644 --- a/src/views/operate/message/myIndex/index.vue +++ b/src/views/operate/message/myIndex/index.vue @@ -231,15 +231,15 @@ data: { body: "", channelCode: "", - createUser: 0, + createUser: '', current: currentPage, head: "", - messageType: 0, + messageType: "", pageSize: pageSize, randomCode: "", remark: "", sendTime: "", - status: 0, + status: '', targetFrom: "", targetTo: "" } diff --git a/src/views/operate/message/myIndex/messageView/index.vue b/src/views/operate/message/myIndex/messageView/index.vue new file mode 100644 index 0000000..558dda2 --- /dev/null +++ b/src/views/operate/message/myIndex/messageView/index.vue @@ -0,0 +1,102 @@ +<template> + <div class="updateUser"> + <main> + <div class="mainContent"> + <el-form ref="user" label-width="140px" autoComplete="on" :model="message" label-position="right"> + <!-- 鏍囬 --> + <el-form-item class="optionItem" label="鏍囬:"> + <el-input v-model="message.head" disabled></el-input> + </el-form-item> + <!-- 绫诲瀷 --> + <el-form-item class="optionItem" label="鏍忕洰绫诲瀷:"> + <el-input v-model="message.messageType" disabled></el-input> + </el-form-item> + <!-- 鍙戦�佷汉 --> + <el-form-item class="optionItem" label="鍙戦�佷汉:"> + <el-input v-model="message.targetFrom" disabled></el-input> + </el-form-item> + <!-- 鎺ユ敹瀵硅薄 --> + <el-form-item class="optionItem" label="鎺ユ敹瀵硅薄:"> + <el-input type="textarea" v-model="message.targetTo" disabled></el-input> + </el-form-item> + <!-- 娑堟伅鍐呭 --> + <el-form-item class="optionItem" label="娑堟伅鍐呭:"> + <el-input type="textarea" :rows="5" disabled v-html="message.body"></el-input> + </el-form-item> + <!-- 鎻愰啋鏂瑰紡 --> + <el-form-item class="optionItem" label="鏂瑰紡:"> + <el-input v-model="message.channelCode" disabled></el-input> + </el-form-item> + </el-form> + </div> + </main> + </div> +</template> +<script> +export default { + data() { + return { + message: { + }, + } + }, + created() { + this.message = JSON.parse(JSON.stringify(this.info)) + this.message.targetTo = this.message.targetTo.join(',') + }, + methods: { + + }, + props: ['info', 'closeDialog'] +} +</script> +<style lang="scss" scoped> +.updateUser { + border-radius: 1px; + background-color: #09152f; + + :deep(.el-tag) { + background-color: #09152f; + } + + .el-select-dropdown.is-multiple .el-select-dropdown__item.selected { + background-color: #09152f; + color: #4b9bb7; + } + + main { + 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%; + } + } + + &:deep(.el-textarea__inner) { + background-color: #09152f; + border: 1px solid #17324c; + } + } + } +} + +.updateUser::v-deep .el-form-item__label { + color: #4b9bb7; +} + +.updateUser::v-deep .el-input__inner { + background-color: #09152f; + border: 1px solid #17324c; +} +</style> \ No newline at end of file -- Gitblit v1.8.0