wangyifang
/
mkw-visit-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日志

Browse Source
master
lion 3 years ago
parent fb10904398
commit 5597b5d1fd
5 changed files with 71 additions and 37 deletions
Show Stats Download Patch File Download Diff File

8
src/components/XyDialog/index.vue
Unescape View File

@ -144,8 +144,10 @@ export default {
}
}
return (
<div style={$scopedSlots.logs ? {'display':'flex','justify-content': 'space-around;'} : {}}>
<el-form
style={title.length === 0 ? {'margin-top':'32px'} : {}}
// title.length === 0 ? {'margin-top':'32px'} : {},
style={$scopedSlots.logs ? {'width':'70%'} : {}}
ref="elForm"
props={{
model:form,
@ -172,6 +174,10 @@ export default {
{$scopedSlots.extraFormBottom ? $scopedSlots.extraFormBottom() : ''}
</el-form>
<div style={$scopedSlots.logs ? {'width':'30%','margin-top':'20px'} : {}}>
{$scopedSlots.logs ? $scopedSlots.logs() : ''}
</div>
</div>
)
}else{
return (

5
src/components/XyTinymce/index.vue
Unescape View File

@ -31,6 +31,7 @@ import "tinymce/plugins/wordcount";
import "tinymce/plugins/colorpicker";
import "tinymce/plugins/textcolor";
import "tinymce/icons/default"
import 'tinymce/plugins/code'
export default {
components: {
Editor,
@ -52,11 +53,11 @@ export default {
plugins: {
type: [String, Array],
default:
"paste preview searchreplace autolink directionality visualblocks visualchars fullscreen image template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave ",
"code paste preview searchreplace autolink directionality visualblocks visualchars fullscreen image template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave ",
},
toolbar: {
type: [String, Array],
default: ` undo redo restoredraft | assignment | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough anchor | alignleft aligncenter alignright alignjustify outdent indent |
default: ` undo redo restoredraft | code | assignment | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough anchor | alignleft aligncenter alignright alignjustify outdent indent |
styleselect formatselect fontselect fontsizeselect | table image charmap emoticons hr pagebreak |bullist numlist | blockquote subscript superscript removeformat |
insertdatetime print preview | fullscreen | bdmap indent2em lineheight formatpainter axupimgs`,
},

2
src/views/visit/check.vue
Unescape View File

@ -254,7 +254,7 @@
})
},
checkRecords(row){
this.$refs['showVisit'].form = row
this.$refs['showVisit'].id = row.id
this.$refs['showVisit'].formDataType='checkrecord'
this.$refs['showVisit'].isShow = true
// this.$refs['checkRecord'].id = row.id

7
src/views/visit/component/addCommon.vue
Unescape View File

@ -362,7 +362,7 @@
customFn: (row) => {
return (<el-select placeholder = "请选择证件类型"
style = "width: 140px"
value = {row.credent_name}
value = {row.credent==1?'身份证':'护照'}
on = {
{
["change"]: (e) => (row.credent_name = e.value, row.credent = e.id),
@ -510,7 +510,10 @@
this.visitTimeList = res.data
const resarea = await getAreaList()
this.visitAreaList = resarea.data
const resuser = await listCommonuser()
const resuser = await listCommonuser({
page:1,
page_zise:99
})
this.adminList = resuser.data
const reason = await getparameter({

86
src/views/visit/component/showVisit.vue
Unescape View File

@ -1,18 +1,26 @@
<template>
<div>
<xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="`${form.type_text}`" :form="formData">
<xy-dialog ref="dialog" :width="70" :is-show.sync="isShow" type="form" :title="`${form.type_text}`" :form="formData">
<template v-slot:logs>
<el-timeline :reverse="true">
<el-timeline-item
v-for="(item, index) in form.logs"
:key="index"
:timestamp="item.created_at">
{{item.remark}}
</el-timeline-item>
</el-timeline>
</template>
<template v-slot:codeForm v-if="formDataType=='coderecord'">
<div class="xy-table-item">
<div class="xy-table-item-label" style="font-size: 32px;width: 230px!important;">
核销码：
</div>
<div class="xy-table-item-content">
<el-input style="font-size: 32px;padding: 25px;width:300px" v-model="codeForm.code" ref="codeInput" placeholder="请输入核销码或扫码"></el-input>
<el-input style="font-size: 32px;padding: 25px;width:400px" v-model="codeForm.code" ref="codeInput" placeholder="请输入核销码或扫码"></el-input>
</div>
</div>
</template>
<template v-slot:visitinfo>
<div style="width:600px">
拜访信息
@ -269,7 +277,10 @@
<script>
import {
save
} from "@/api/visit/check.js"
} from "@/api/visit/check.js"
import {
show
} from "@/api/visit/record.js"
import {
cancelCode
} from "@/api/gate"
@ -335,8 +346,12 @@ import Cookies from 'js-cookie'
},
{
label: "证件类型",
// width: 180,
width: 200,
// width: 180,
prop:'credent',
width: 200,
formatter(cell,data,val){
return val==1?'身份证':'护照'
}
}, {
label: "证件号码",
prop: "idcard",
@ -376,29 +391,8 @@ import Cookies from 'js-cookie'
if (newVal) {
let that = this
if (this.formDataType == 'checkrecord') {
this.checkForm.visit_id = this.form.id
for (let item of that.form.audit) {
if(item.status==0){
if (item.audit_admin_id == that.userId) {
that.checkForm.level = item.level
that.checkForm.id = item.id
that.checkForm.audit_admin_id = item.audit_admin_id
that.isCheck = true
return
}else{
that.checkLevel.map(item1=>{
if(item.level==item1.id){
that.checkText = item1.value
}
})
that.isCheck = false
return
}
}else{
that.isCheck = false
}
}
this.checkForm.visit_id = this.id
this.getDetail()
}
if (this.formDataType == 'coderecord') {
@ -427,8 +421,38 @@ import Cookies from 'js-cookie'
async getUserId() {
const res = await getInfo()
this.userId = res.id
},
async getDetail() {
const res = await show({
id: this.id
})
let that = this
this.form = res
for (let item of that.form.audit) {
if(item.status==0){
if (item.audit_admin_id == that.userId) {
that.checkForm.level = item.level
that.checkForm.id = item.id
that.checkForm.audit_admin_id = item.audit_admin_id
that.isCheck = true
return
}else{
that.checkLevel.map(item1=>{
if(item.level==item1.id){
that.checkText = item1.value
}
})
that.isCheck = false
return
}
}else{
that.isCheck = false
}
}
},
reset() {
reset() {
this.id=''
this.formDataType = ''
this.checkForm = {}
this.check_admin_name = ''

Write Preview
Loading…
Cancel
Save