|
@@ -144,18 +144,36 @@
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="单位" prop="deptName">
|
|
|
- <el-input v-model="form.deptName" placeholder="请输入单位" />
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.deptId"
|
|
|
+ placeholder="请选择单位"
|
|
|
+ clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in typeOptionstwo"
|
|
|
+ :key="dict.deptId"
|
|
|
+ :label="dict.deptName"
|
|
|
+ :value="dict.deptId"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="类型" prop="noticeType">
|
|
|
- <el-radio-group v-model="form.noticeType">
|
|
|
- <el-radio
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.noticeType"
|
|
|
+ placeholder="请选择类型"
|
|
|
+ clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
v-for="dict in typeOptions"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictValue"
|
|
|
- >{{dict.dictLabel}}</el-radio>
|
|
|
- </el-radio-group>
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
@@ -185,6 +203,7 @@
|
|
|
|
|
|
<script>
|
|
|
import { listNotice, getNotice, getNoticetwo, delNotice, addNotice, updateNotice, exportNotice,listNoticetwo } from "@/api/system/notice";
|
|
|
+import {listConfigfieu} from "@/api/system/config";
|
|
|
import Editor from '@/components/Editor';
|
|
|
|
|
|
export default {
|
|
@@ -224,6 +243,7 @@ export default {
|
|
|
createBy: undefined,
|
|
|
status: undefined
|
|
|
},
|
|
|
+ typeOptionstwo:[],
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
@@ -231,8 +251,8 @@ export default {
|
|
|
noticeTitle: [
|
|
|
{ required: true, message: "公告标题不能为空", trigger: "blur" }
|
|
|
],
|
|
|
- noticeType: [
|
|
|
- { required: true, message: "公告类型不能为空", trigger: "change" }
|
|
|
+ createBy: [
|
|
|
+ { required: true, message: "作者不能为空", trigger: "change" }
|
|
|
]
|
|
|
},
|
|
|
configList: [{}],
|
|
@@ -241,6 +261,7 @@ export default {
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
+ this.getListthuy()
|
|
|
this.getDicts("sys_notice_status").then(response => {
|
|
|
this.statusOptions = response.data;
|
|
|
});
|
|
@@ -249,6 +270,17 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 单位列表
|
|
|
+ getListthuy() {
|
|
|
+ this.loading = true;
|
|
|
+ listConfigfieu().then((response) => {
|
|
|
+ console.log(response);
|
|
|
+ this.typeOptionstwo = response.data;
|
|
|
+ // this.fileList = this.queryParams.attachment
|
|
|
+ // this.total = response.total;
|
|
|
+ this.loading = false;
|
|
|
+ });
|
|
|
+ },
|
|
|
/** 查询公告列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
@@ -368,7 +400,7 @@ export default {
|
|
|
if(file.response.code == 200){
|
|
|
this.msgSuccess("上传成功");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
console.log(response.url, file, fileList);
|
|
|
}
|
|
|
}
|