Commit 5eaa4fe0 authored by Mac's avatar Mac

1

parent 6360d8dd
...@@ -10,15 +10,15 @@ ...@@ -10,15 +10,15 @@
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input clearable @change="getList" standout="bg-primary text-white" v-model="msg.Title" <q-input clearable @change="getList" standout="bg-primary text-white" v-model="msg.Title"
label="公文标题" /> label="公文标题" @clear="getList"/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input clearable @change="getList" standout="bg-primary text-white" v-model="msg.Number" <q-input clearable @change="getList" standout="bg-primary text-white" v-model="msg.Number"
label="编号/ID" /> label="编号" @clear="getList"/>
</div> </div>
<q-select @input="getList" filled stack-label option-value="Id" option-label="EmployeeName" use-input <q-select @input="getList" filled stack-label option-value="Id" option-label="EmployeeName" use-input
v-model="msg.UpdateBy" ref="DeptTier" :options="PersionList" label="发布人" :dense="false" v-model="msg.UpdateBy" ref="DeptTier" :options="PersionList" label="发布人" :dense="false"
class="col-3 q-pr-lg q-pb-lg" emit-value map-options clearable @clear="getList" @filter="filterFn"> class="col-3 q-pr-lg q-pb-lg" emit-value map-options @filter="filterFn">
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey"> <q-item-section class="text-grey">
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="col-3"> <div class="col-3">
<q-select @input="getList" filled stack-label option-value="Id" option-label="Name" <q-select @input="getList" filled stack-label option-value="Id" option-label="Name"
v-model="msg.NoticeState" ref="DeptTier" :options="NoticeList" label="发布状态" :dense="false" v-model="msg.NoticeState" ref="DeptTier" :options="NoticeList" label="发布状态" :dense="false"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options clearable @clear="getList" /> class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
</div> </div>
</div> </div>
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
label="撤回" @click="setNoticeOtion(props.row.Id,3)" v-if="props.row.NoticeState==1" /> label="撤回" @click="setNoticeOtion(props.row.Id,3)" v-if="props.row.NoticeState==1" />
<q-btn flat size="xs" icon="iconfont icon-xiugai1" color="secondary" style="font-weight:400" class="q-mr-xs" <q-btn flat size="xs" icon="iconfont icon-xiugai1" color="secondary" style="font-weight:400" class="q-mr-xs"
label="修改" v-if="props.row.NoticeState!=1" @click="addDoc(props.row.Id)" /> label="修改" v-if="props.row.NoticeState!=1" @click="addDoc(props.row.Id)" />
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
...@@ -85,19 +84,19 @@ ...@@ -85,19 +84,19 @@
</q-uploader> </q-uploader>
</div> </div>
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-4">
<q-input clearable standout="bg-primary text-white" v-model="NoticeBaseInfo.From" label="公文来源(FR)" /> <q-input clearable standout="bg-primary text-white" v-model="NoticeBaseInfo.From" label="公文来源(FR)" />
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-3" style="margin-top: 20px"> <div class="col-4" style="margin-top: 20px">
<q-select filled stack-label option-value="Id" option-label="Name" <q-select filled stack-label option-value="Id" option-label="Name"
v-model="NoticeBaseInfo.NumberRule" ref="DeptTier" :options="RuleEnumList" label="编号规则" :dense="false" v-model="NoticeBaseInfo.NumberRule" ref="DeptTier" :options="RuleEnumList" label="编号规则" :dense="false"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options clearable /> class="col-6 q-pr-lg q-pb-lg" emit-value map-options clearable />
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-3" > <div class="col-4" >
<q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips <q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input use-chips
option-value="Id" option-label="EmployeeName" v-model="tempManager" ref="ManagerId" :options="PersionList" option-value="Id" option-label="EmployeeName" v-model="tempManager" ref="ManagerId" :options="PersionList"
label="默认抄送" :dense="false" emit-value map-options @filter="filterFn"> label="默认抄送" :dense="false" emit-value map-options @filter="filterFn">
...@@ -253,7 +252,7 @@ ...@@ -253,7 +252,7 @@
Number:'', Number:'',
NoticeState:0, NoticeState:0,
Is_Top:0, Is_Top:0,
UpdateBy:0 UpdateBy:-1
}, },
loading: true, loading: true,
//公告column //公告column
...@@ -317,7 +316,7 @@ ...@@ -317,7 +316,7 @@
addMsg:{//添加和修改公告 addMsg:{//添加和修改公告
Id:0, Id:0,
From:'', From:'',
To:'',//抄送部门 To:'-1',//抄送部门
CopyPeople:'-1',//抄送人 CopyPeople:'-1',//抄送人
Title:'', Title:'',
Content:'', Content:'',
...@@ -437,7 +436,7 @@ ...@@ -437,7 +436,7 @@
if (res.Code == 1) { if (res.Code == 1) {
let obj={ let obj={
EmployeeName:'不限', EmployeeName:'不限',
Id:0 Id:-1
} }
res.Data.unshift(obj) res.Data.unshift(obj)
var jsonData = res.Data; var jsonData = res.Data;
...@@ -556,6 +555,7 @@ ...@@ -556,6 +555,7 @@
addDoc(id){ addDoc(id){
this.nNumber =null this.nNumber =null
if (id) { if (id) {
this.getNInfo(id) this.getNInfo(id)
} else { } else {
this.tempManager2=this.tempManager?this.tempManager:[] this.tempManager2=this.tempManager?this.tempManager:[]
...@@ -596,8 +596,14 @@ ...@@ -596,8 +596,14 @@
} }
this.addMsg.FileList.push(obj) this.addMsg.FileList.push(obj)
}) })
console.log(this.addMsg) let data = this.addMsg
setNoticeInfo(this.addMsg).then(res => { if(data.CopyPeople==''){
data.CopyPeople=-1
}
if(data.To==''){
data.To=-1
}
setNoticeInfo(data).then(res => {
this.saveLoading = false this.saveLoading = false
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
...@@ -656,4 +662,7 @@ ...@@ -656,4 +662,7 @@
.document .NoticeStateNimg{ .document .NoticeStateNimg{
width: 30px;height: 30px;margin-right: 5px; width: 30px;height: 30px;margin-right: 5px;
} }
.document .q-pr-lg{
padding-right: 0;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment