|
|
@@ -310,7 +310,7 @@
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="选择时间"
|
|
|
@change="
|
|
|
- (val) => {
|
|
|
+ val => {
|
|
|
change_time(val, i);
|
|
|
}
|
|
|
"
|
|
|
@@ -372,6 +372,15 @@
|
|
|
<!-- <el-input v-model="item.unitId1" placeholder="单位" /> -->
|
|
|
</el-form-item>
|
|
|
<div class="box2">
|
|
|
+ <el-form-item label="" prop="organizer">
|
|
|
+ <el-input
|
|
|
+ v-model="item.organizer"
|
|
|
+ placeholder="组织人"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="" prop="personnel">
|
|
|
<el-input
|
|
|
v-model="item.peopleIds"
|
|
|
@@ -465,7 +474,7 @@ import {
|
|
|
addBdglweekwork,
|
|
|
updateBdglweekwork,
|
|
|
exportBdglweekwork,
|
|
|
- exportBdglgetWeekWork,
|
|
|
+ exportBdglgetWeekWork
|
|
|
} from "@/api/grassrootsregistration/bdglweekwork";
|
|
|
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
@@ -473,7 +482,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
import {
|
|
|
getZhuChiRen,
|
|
|
getDept,
|
|
|
- getShouBu,
|
|
|
+ getShouBu
|
|
|
} from "@/api/grassrootsregistration/bdglmeeting";
|
|
|
export default {
|
|
|
name: "Bdglweekwork",
|
|
|
@@ -516,18 +525,18 @@ export default {
|
|
|
peopleId2: null,
|
|
|
time: null,
|
|
|
unitId: null,
|
|
|
- adminId: null,
|
|
|
+ adminId: null
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
unitId: [
|
|
|
- { required: true, message: "单位名称不能为空", trigger: "change" },
|
|
|
+ { required: true, message: "单位名称不能为空", trigger: "change" }
|
|
|
],
|
|
|
startTime: [
|
|
|
- { required: true, message: "时间不能为空", trigger: "change" },
|
|
|
- ],
|
|
|
+ { required: true, message: "时间不能为空", trigger: "change" }
|
|
|
+ ]
|
|
|
},
|
|
|
//下拉s
|
|
|
options: [],
|
|
|
@@ -540,51 +549,51 @@ export default {
|
|
|
week: [
|
|
|
{
|
|
|
value: "选项1",
|
|
|
- label: "星期一",
|
|
|
+ label: "星期一"
|
|
|
},
|
|
|
{
|
|
|
value: "选项2",
|
|
|
- label: "星期二",
|
|
|
+ label: "星期二"
|
|
|
},
|
|
|
{
|
|
|
value: "选项3",
|
|
|
- label: "星期三",
|
|
|
+ label: "星期三"
|
|
|
},
|
|
|
{
|
|
|
value: "选项4",
|
|
|
- label: "星期四",
|
|
|
+ label: "星期四"
|
|
|
},
|
|
|
{
|
|
|
value: "选项5",
|
|
|
- label: "星期五",
|
|
|
+ label: "星期五"
|
|
|
},
|
|
|
{
|
|
|
value: "选项6",
|
|
|
- label: "星期六",
|
|
|
+ label: "星期六"
|
|
|
},
|
|
|
{
|
|
|
value: "选项7",
|
|
|
- label: "星期日",
|
|
|
- },
|
|
|
+ label: "星期日"
|
|
|
+ }
|
|
|
],
|
|
|
//早中晚选中
|
|
|
day: [
|
|
|
{
|
|
|
value: "选项1",
|
|
|
- label: "早晨",
|
|
|
+ label: "早晨"
|
|
|
},
|
|
|
{
|
|
|
value: "选项2",
|
|
|
- label: "上午",
|
|
|
+ label: "上午"
|
|
|
},
|
|
|
{
|
|
|
value: "选项3",
|
|
|
- label: "下午",
|
|
|
+ label: "下午"
|
|
|
},
|
|
|
{
|
|
|
value: "选项4",
|
|
|
- label: "晚上",
|
|
|
- },
|
|
|
+ label: "晚上"
|
|
|
+ }
|
|
|
],
|
|
|
// 树形列表
|
|
|
deptOptions: [],
|
|
|
@@ -602,7 +611,8 @@ export default {
|
|
|
peopleIds: null,
|
|
|
address: null,
|
|
|
contents: null,
|
|
|
- },
|
|
|
+ organizer:null,
|
|
|
+ }
|
|
|
],
|
|
|
// 搜索单位列表
|
|
|
deptOptionss: [],
|
|
|
@@ -612,13 +622,12 @@ export default {
|
|
|
names: "",
|
|
|
// start: "06:00",
|
|
|
// end: "08:00",
|
|
|
-
|
|
|
+
|
|
|
option: {
|
|
|
start: "06:00",
|
|
|
step: "00:30",
|
|
|
- end: "08:00",
|
|
|
-
|
|
|
- },
|
|
|
+ end: "08:00"
|
|
|
+ }
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -639,6 +648,7 @@ export default {
|
|
|
peopleIds: null,
|
|
|
address: null,
|
|
|
contents: null,
|
|
|
+ organizer:null,
|
|
|
});
|
|
|
},
|
|
|
//点击删除工作登记
|
|
|
@@ -667,7 +677,7 @@ export default {
|
|
|
},
|
|
|
// 查询单位列表
|
|
|
getDept() {
|
|
|
- getShouBu().then((res) => {
|
|
|
+ getShouBu().then(res => {
|
|
|
this.deptOptionss = res.data;
|
|
|
});
|
|
|
},
|
|
|
@@ -685,7 +695,7 @@ export default {
|
|
|
},
|
|
|
// 获取人员
|
|
|
ZhuChiRen(id) {
|
|
|
- getZhuChiRen(id).then((res) => {
|
|
|
+ getZhuChiRen(id).then(res => {
|
|
|
this.renYuan = res.data;
|
|
|
});
|
|
|
},
|
|
|
@@ -711,7 +721,7 @@ export default {
|
|
|
this.form.endTime != null
|
|
|
) {
|
|
|
this.form.bdglWeekworkRegisterList = null;
|
|
|
- exportBdglgetWeekWork(this.form).then((res) => {
|
|
|
+ exportBdglgetWeekWork(this.form).then(res => {
|
|
|
this.code = res.code;
|
|
|
if (res.code == 200) {
|
|
|
this.$modal.msgWarning(res.msg);
|
|
|
@@ -727,7 +737,7 @@ export default {
|
|
|
this.form.endTime != null
|
|
|
) {
|
|
|
this.form.bdglWeekworkRegisterList = null;
|
|
|
- exportBdglgetWeekWork(this.form).then((res) => {
|
|
|
+ exportBdglgetWeekWork(this.form).then(res => {
|
|
|
this.code = res.code;
|
|
|
if (res.code == 200) {
|
|
|
this.$modal.msgWarning(res.msg);
|
|
|
@@ -744,7 +754,7 @@ export default {
|
|
|
) {
|
|
|
this.form.unitName = null;
|
|
|
this.form.bdglWeekworkRegisterList = null;
|
|
|
- exportBdglgetWeekWork(this.form).then((res) => {
|
|
|
+ exportBdglgetWeekWork(this.form).then(res => {
|
|
|
console.log(res.code);
|
|
|
this.code = res.code;
|
|
|
if (res.code == 200) {
|
|
|
@@ -755,14 +765,14 @@ export default {
|
|
|
},
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getTreeselect() {
|
|
|
- getDept().then((response) => {
|
|
|
+ getDept().then(response => {
|
|
|
this.deptOptions = response.data;
|
|
|
});
|
|
|
},
|
|
|
/** 查询一周工作安排列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listBdglweekwork(this.queryParams).then((response) => {
|
|
|
+ listBdglweekwork(this.queryParams).then(response => {
|
|
|
this.bdglweekworkList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -800,7 +810,7 @@ export default {
|
|
|
department: null,
|
|
|
personnel: null,
|
|
|
place: null,
|
|
|
- content: null,
|
|
|
+ content: null
|
|
|
};
|
|
|
// 一周工作安排字段
|
|
|
(this.tomList = [
|
|
|
@@ -814,7 +824,8 @@ export default {
|
|
|
peopleIds: null,
|
|
|
address: null,
|
|
|
contents: null,
|
|
|
- },
|
|
|
+ organizer:null
|
|
|
+ }
|
|
|
]),
|
|
|
this.resetForm("refform");
|
|
|
},
|
|
|
@@ -835,7 +846,7 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map((item) => item.id);
|
|
|
+ this.ids = selection.map(item => item.id);
|
|
|
this.single = selection.length !== 1;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
@@ -854,7 +865,7 @@ export default {
|
|
|
this.form.unitId = row.unitId;
|
|
|
this.ZhuChiRen(this.form.unitId);
|
|
|
const id = row.id || this.ids;
|
|
|
- getBdglweekwork(id).then((response) => {
|
|
|
+ getBdglweekwork(id).then(response => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
this.title = "修改一周工作安排";
|
|
|
@@ -867,7 +878,7 @@ export default {
|
|
|
// 是否隐藏按钮
|
|
|
this.opens = false;
|
|
|
const id = row.id || this.ids;
|
|
|
- getBdglweekwork(id).then((response) => {
|
|
|
+ getBdglweekwork(id).then(response => {
|
|
|
this.wordInfo = response.data;
|
|
|
console.log(this.wordInfo);
|
|
|
this.title = "查看一周工作安排";
|
|
|
@@ -880,11 +891,11 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- this.$refs["refform"].validate((valid) => {
|
|
|
+ this.$refs["refform"].validate(valid => {
|
|
|
if (valid) {
|
|
|
this.form.bdglWeekworkRegisterList = this.tomList;
|
|
|
if (this.form.id != null) {
|
|
|
- updateBdglweekwork(this.form).then((response) => {
|
|
|
+ updateBdglweekwork(this.form).then(response => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -893,7 +904,7 @@ export default {
|
|
|
this.form.bdglWeekworkRegisterList = this.tomList;
|
|
|
if (this.code != 200) {
|
|
|
if (this.form.unitId) {
|
|
|
- addBdglweekwork(this.form).then((response) => {
|
|
|
+ addBdglweekwork(this.form).then(response => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -910,7 +921,7 @@ export default {
|
|
|
this.$modal
|
|
|
// .confirm('是否确认删除一周工作安排编号为"' + ids + '"的数据项？')
|
|
|
.confirm("是否确认删除该数据？")
|
|
|
- .then(function () {
|
|
|
+ .then(function() {
|
|
|
return delBdglweekwork(ids);
|
|
|
})
|
|
|
.then(() => {
|
|
|
@@ -928,7 +939,7 @@ export default {
|
|
|
this.exportLoading = true;
|
|
|
return exportBdglweekwork(queryParams);
|
|
|
})
|
|
|
- .then((response) => {
|
|
|
+ .then(response => {
|
|
|
this.$download.name(response.msg);
|
|
|
this.exportLoading = false;
|
|
|
})
|
|
|
@@ -949,8 +960,8 @@ export default {
|
|
|
this.option.start = "18:00";
|
|
|
this.option.end = "23:00";
|
|
|
}
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style scoped>
|
zxr