Skip to content

S
smart_gov_platform
Commit e1f51edf authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 990bc874 5d17cd6f
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 106 deletions
base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
View file @ e1f51edf
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-model-item label="所属窗口" prop="windowId"> <a-form-model-item label="所属窗口" prop="windowId">
<a-select <a-select
v-model="form.windowId" v-model="form.windowId"
...@@ -79,14 +79,14 @@ ...@@ -79,14 +79,14 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col> -->
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="经办人Id" prop="operatorId"> <a-form-model-item label="经办人Id" prop="operatorId">
<a-input v-model="form.operatorId" placeholder="请输入经办人Id" /> <a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="星级" prop="starlevel"> <a-form-model-item label="星级" prop="starlevel">
<a-select <a-select
...@@ -102,27 +102,27 @@ ...@@ -102,27 +102,27 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="职务" prop="userpost"> <a-form-model-item label="职务" prop="userpost">
<a-input v-model="form.userpost" placeholder="请输入职务" /> <a-input v-model="form.userpost" placeholder="请输入职务" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="职称" prop="posttitle"> <a-form-model-item label="职称" prop="posttitle">
<a-input v-model="form.posttitle" placeholder="请输入职称" /> <a-input v-model="form.posttitle" placeholder="请输入职称" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="称号" prop="dangyuan"> <a-form-model-item label="政治面貌" prop="politicalstatus">
<a-select <a-select
allowClear allowClear
v-model="form.dangyuan" v-model="form.politicalstatus"
placeholder="请选择称号" placeholder="请选择政治面貌"
> >
<a-select-option <a-select-option
v-for="(value, key) in designationDict" v-for="(value, key) in politicalDict"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
>{{ value }}</a-select-option >{{ value }}</a-select-option
...@@ -130,15 +130,17 @@ ...@@ -130,15 +130,17 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="政治面貌" prop="politicalstatus"> <a-form-model-item label="称号" prop="dangyuan">
<a-select <a-select
allowClear allowClear
v-model="form.politicalstatus" v-model="form.dangyuan"
placeholder="请选择政治面貌" placeholder="请选择称号"
> >
<a-select-option <a-select-option
v-for="(value, key) in politicalDict" v-for="(value, key) in designationDict"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
>{{ value }}</a-select-option >{{ value }}</a-select-option
...@@ -151,11 +153,6 @@ ...@@ -151,11 +153,6 @@
<a-input v-model="form.phone" placeholder="请输入电话" /> <a-input v-model="form.phone" placeholder="请输入电话" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" />
</a-form-model-item>
</a-col>
</a-row> </a-row>
<a-row v-if="form.dangyuan === 99"> <a-row v-if="form.dangyuan === 99">
<!-- <a-col :span="12"> </a-col> --> <!-- <a-col :span="12"> </a-col> -->
...@@ -166,6 +163,11 @@ ...@@ -166,6 +163,11 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12">
<a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" />
</a-form-model-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="身份证" prop="idCard"> <a-form-model-item label="身份证" prop="idCard">
<a-input v-model="form.idCard" placeholder="请输入身份证号码" /> <a-input v-model="form.idCard" placeholder="请输入身份证号码" />
...@@ -494,15 +496,15 @@ export default { ...@@ -494,15 +496,15 @@ export default {
// 部门选择 // 部门选择
async handleDeptSelect(val, node) { async handleDeptSelect(val, node) {
this.form.windowId = undefined; // this.form.windowId = undefined;
this.form.windowName = ""; // this.form.windowName = "";
if (val) { if (val) {
let { text } = node.componentOptions.children[0]; let { text } = node.componentOptions.children[0];
this.form.deptName = text; this.form.deptName = text;
this.windowData = await this.getWindowList(val); // this.windowData = await this.getWindowList(val);
} else { } else {
this.form.deptName = ""; this.form.deptName = "";
this.windowData = []; // this.windowData = [];
} }
}, },
//编辑获取窗口 //编辑获取窗口
...@@ -535,7 +537,7 @@ export default { ...@@ -535,7 +537,7 @@ export default {
}, },
// 编辑 // 编辑
onEdit(data) { onEdit(data) {
this.editWindow(data.deptId); // this.editWindow(data.deptId);
this.form = { ...data }; this.form = { ...data };
this.form.loginName && this.$delete(this.form, "loginName"); this.form.loginName && this.$delete(this.form, "loginName");
this.form.loginPwd && this.$delete(this.form, "loginPwd"); this.form.loginPwd && this.$delete(this.form, "loginPwd");
...@@ -554,15 +556,16 @@ export default { ...@@ -554,15 +556,16 @@ export default {
}, },
// 关闭对话框 // 关闭对话框
handleClose() { handleClose() {
this.$refs.formData.resetFields();
this.fileList = [];
this.loading = false; this.loading = false;
this.Visible = false; this.Visible = false;
this.form.windowName = ""; // this.windowData = [];
this.fileList = []; // this.form.windowName = "";
this.$refs.formData.resetFields();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.form.windowName = ""; // this.form.windowName = "";
this.$refs.formData.resetFields(); this.$refs.formData.resetFields();
}, },
// 照片上传 // 照片上传
......
base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue
View file @ e1f51edf
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-model-item label="所属窗口" prop="windowId"> <a-form-model-item label="所属窗口" prop="windowId">
<a-select <a-select
v-model="form.windowId" v-model="form.windowId"
...@@ -79,14 +79,14 @@ ...@@ -79,14 +79,14 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col> -->
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="经办人Id" prop="operatorId"> <a-form-model-item label="经办人Id" prop="operatorId">
<a-input v-model="form.operatorId" placeholder="请输入经办人Id" /> <a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="星级" prop="starlevel"> <a-form-model-item label="星级" prop="starlevel">
<a-select <a-select
...@@ -102,27 +102,27 @@ ...@@ -102,27 +102,27 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="职务" prop="userpost"> <a-form-model-item label="职务" prop="userpost">
<a-input v-model="form.userpost" placeholder="请输入职务" /> <a-input v-model="form.userpost" placeholder="请输入职务" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="职称" prop="posttitle"> <a-form-model-item label="职称" prop="posttitle">
<a-input v-model="form.posttitle" placeholder="请输入职称" /> <a-input v-model="form.posttitle" placeholder="请输入职称" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="称号" prop="dangyuan"> <a-form-model-item label="政治面貌" prop="politicalstatus">
<a-select <a-select
allowClear allowClear
v-model="form.dangyuan" v-model="form.politicalstatus"
placeholder="请选择称号" placeholder="请选择政治面貌"
> >
<a-select-option <a-select-option
v-for="(value, key) in designationDict" v-for="(value, key) in politicalDict"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
>{{ value }}</a-select-option >{{ value }}</a-select-option
...@@ -130,15 +130,17 @@ ...@@ -130,15 +130,17 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="政治面貌" prop="politicalstatus"> <a-form-model-item label="称号" prop="dangyuan">
<a-select <a-select
allowClear allowClear
v-model="form.politicalstatus" v-model="form.dangyuan"
placeholder="请选择政治面貌" placeholder="请选择称号"
> >
<a-select-option <a-select-option
v-for="(value, key) in politicalDict" v-for="(value, key) in designationDict"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
>{{ value }}</a-select-option >{{ value }}</a-select-option
...@@ -151,11 +153,6 @@ ...@@ -151,11 +153,6 @@
<a-input v-model="form.phone" placeholder="请输入电话" /> <a-input v-model="form.phone" placeholder="请输入电话" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" />
</a-form-model-item>
</a-col>
</a-row> </a-row>
<a-row v-if="form.dangyuan === 99"> <a-row v-if="form.dangyuan === 99">
<!-- <a-col :span="12"> </a-col> --> <!-- <a-col :span="12"> </a-col> -->
...@@ -166,6 +163,11 @@ ...@@ -166,6 +163,11 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12">
<a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" />
</a-form-model-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="身份证" prop="idCard"> <a-form-model-item label="身份证" prop="idCard">
<a-input v-model="form.idCard" placeholder="请输入身份证号码" /> <a-input v-model="form.idCard" placeholder="请输入身份证号码" />
...@@ -528,15 +530,15 @@ export default { ...@@ -528,15 +530,15 @@ export default {
}, },
// 部门选择 // 部门选择
async handleDeptSelect(val, node) { async handleDeptSelect(val, node) {
this.form.windowId = undefined; // this.form.windowId = undefined;
this.form.windowName = ""; // this.form.windowName = "";
if (val) { if (val) {
let { text } = node.componentOptions.children[0]; let { text } = node.componentOptions.children[0];
this.form.deptName = text; this.form.deptName = text;
this.windowData = await this.getWindowList(val); // this.windowData = await this.getWindowList(val);
} else { } else {
this.form.deptName = ""; this.form.deptName = "";
this.windowData = []; // this.windowData = [];
} }
}, },
//编辑获取窗口 //编辑获取窗口
...@@ -572,7 +574,7 @@ export default { ...@@ -572,7 +574,7 @@ export default {
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.form.windowName = ""; // this.form.windowName = "";
this.$refs.formData.resetFields(); this.$refs.formData.resetFields();
}, },
// 新增 // 新增
...@@ -583,7 +585,7 @@ export default { ...@@ -583,7 +585,7 @@ export default {
// 编辑 // 编辑
onEdit(data) { onEdit(data) {
this.form = { ...data }; this.form = { ...data };
this.editWindow(data.deptId); // this.editWindow(data.deptId);
if (this.form.photoPath) { if (this.form.photoPath) {
this.fileList = [ this.fileList = [
{ {
...@@ -599,9 +601,9 @@ export default { ...@@ -599,9 +601,9 @@ export default {
// 关闭对话框 // 关闭对话框
handleClose() { handleClose() {
// this.$refs.formData.resetFields(); // this.$refs.formData.resetFields();
this.windowData = []; // this.windowData = [];
this.fileList = []; this.fileList = [];
this.form.windowName = ""; // this.form.windowName = "";
this.loading = false; this.loading = false;
this.Visible = false; this.Visible = false;
}, },
......
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
View file @ e1f51edf
...@@ -246,9 +246,9 @@ ...@@ -246,9 +246,9 @@
{{ text.createTime | dateFormat }} {{ text.createTime | dateFormat }}
</template> </template>
<!-- 最后登录时间 --> <!-- 最后登录时间 -->
<template slot="logintime" slot-scope="text"> <template slot="lastLoginTime" slot-scope="text">
<span v-if="text.logintime">{{ <span v-if="text.lastLoginTime">{{
text.logintime | dateFormat text.lastLoginTime | dateFormat
}}</span> }}</span>
<span v-else>--</span> <span v-else>--</span>
</template> </template>
...@@ -369,7 +369,7 @@ const columns = [ ...@@ -369,7 +369,7 @@ const columns = [
{ {
title: "最后登录时间", title: "最后登录时间",
scopedSlots: { scopedSlots: {
customRender: "logintime", customRender: "lastLoginTime",
}, },
}, },
......
base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ e1f51edf
...@@ -9,32 +9,18 @@ import com.mortals.framework.annotation.UnAuth; ...@@ -9,32 +9,18 @@ import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.FileUtil; import com.mortals.framework.util.FileUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
import com.mortals.xhx.base.framework.annotation.Operlog;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.role.model.RoleQuery;
import com.mortals.xhx.base.system.role.model.RoleUserEntity;
import com.mortals.xhx.base.system.role.model.RoleUserQuery;
import com.mortals.xhx.base.system.role.service.RoleService;
import com.mortals.xhx.base.system.role.service.RoleUserService;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.OnlineEnum; import com.mortals.xhx.common.code.OnlineEnum;
import com.mortals.xhx.module.dept.model.DeptEntity; import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.service.DeptService; import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.model.model.ModelQuery;
import com.mortals.xhx.module.model.service.ModelService;
import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.service.SiteService; import com.mortals.xhx.module.site.service.SiteService;
import com.mortals.xhx.module.window.model.WindowEntity; import com.mortals.xhx.module.window.model.WindowEntity;
import com.mortals.xhx.module.window.service.WindowService; import com.mortals.xhx.module.window.service.WindowService;
import com.mortals.xhx.module.workman.model.WorkmanEntity; import com.mortals.xhx.module.workman.model.WorkmanEntity;
import com.mortals.xhx.module.workman.model.WorkmanQuery;
import com.mortals.xhx.module.workman.service.WorkmanService; import com.mortals.xhx.module.workman.service.WorkmanService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -45,7 +31,6 @@ import java.io.IOException; ...@@ -45,7 +31,6 @@ import java.io.IOException;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 工作人员 * 工作人员
...@@ -107,6 +92,13 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -107,6 +92,13 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip); WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip);
workmanEntity.setLastLoginAddress(ip); workmanEntity.setLastLoginAddress(ip);
workmanEntity.setLastLoginTime(new Date()); workmanEntity.setLastLoginTime(new Date());
if(query.getWindowId()!=null) {
workmanEntity.setWindowId(query.getWindowId());
WindowEntity windowEntity = windowService.get(query.getWindowId());
if(windowEntity!=null){
workmanEntity.setWindowName(windowEntity.getName());
}
}
this.service.getDao().update(workmanEntity); this.service.getDao().update(workmanEntity);
if (query.getSiteId() != workmanEntity.getSiteId()) { if (query.getSiteId() != workmanEntity.getSiteId()) {
throw new AppException("当前工作人员不在当前站点下！"); throw new AppException("当前工作人员不在当前站点下！");
......
portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/makeRecordReport.vue
View file @ e1f51edf
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<div> <div>
<a-button <a-button
:loading="btnLoading" :loading="btnLoading"
type="primary" class="addclass" type="primary"
class="addclass"
@click="handleExportTable" @click="handleExportTable"
> >
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span> <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
...@@ -28,7 +29,11 @@ ...@@ -28,7 +29,11 @@
v-model="searchForm.time" v-model="searchForm.time"
> >
</a-range-picker> </a-range-picker>
<a-select v-model="searchForm.sectionid" showSearch :option-filter-prop="'label'"> <a-select
v-model="searchForm.sectionid"
showSearch
:option-filter-prop="'label'"
>
<a-select-option value="" label="全部"> 全部部门 </a-select-option> <a-select-option value="" label="全部"> 全部部门 </a-select-option>
<a-select-option <a-select-option
v-for="(v, key) in depList" v-for="(v, key) in depList"
...@@ -43,14 +48,15 @@ ...@@ -43,14 +48,15 @@
<a-select-option value=""> 全部 </a-select-option> <a-select-option value=""> 全部 </a-select-option>
<a-select-option <a-select-option
v-for="(v, key) in statusItem" v-for="(v, key) in statusItem"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
> >
{{ v }} {{ v }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button> <a-button type="primary" class="addclass" @click="handleSearch"
>搜索</a-button
>
<a-button @click="handleReset">重置</a-button> <a-button @click="handleReset">重置</a-button>
</a-space> </a-space>
</span> </span>
...@@ -91,28 +97,28 @@ ...@@ -91,28 +97,28 @@
v-if="text.status == 0" v-if="text.status == 0"
color="#108ee9" color="#108ee9"
> >
{{statusItem[text.status]}} {{ statusItem[text.status] }}
</a-tag> </a-tag>
<a-tag <a-tag
@click="openDetails(text.id)" @click="openDetails(text.id)"
v-else-if="text.status == 1" v-else-if="text.status == 1"
color="#2db7f5" color="#2db7f5"
> >
{{statusItem[text.status]}} {{ statusItem[text.status] }}
</a-tag> </a-tag>
<a-tag <a-tag
@click="openDetails(text.id)" @click="openDetails(text.id)"
v-else-if="text.status == 2" v-else-if="text.status == 2"
color="#f50" color="#f50"
> >
{{statusItem[text.status]}} {{ statusItem[text.status] }}
</a-tag> </a-tag>
<a-tag <a-tag
@click="openDetails(text.id)" @click="openDetails(text.id)"
v-else-if="text.status == 3" v-else-if="text.status == 3"
color="red" color="red"
> >
{{statusItem[text.status]}} {{ statusItem[text.status] }}
</a-tag> </a-tag>
</template> </template>
</a-table> </a-table>
...@@ -121,7 +127,7 @@ ...@@ -121,7 +127,7 @@
</template> </template>
<script> <script>
import { getOrderList,getDeptList } from "@/api/dataAdmin"; import { getOrderList, getDeptList } from "@/api/dataAdmin";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
let tHeader = [ let tHeader = [
// 导出的表头名信息 // 导出的表头名信息
...@@ -162,7 +168,7 @@ const style = { ...@@ -162,7 +168,7 @@ const style = {
2: "办理中", 2: "办理中",
3: "办理中", 3: "办理中",
4: "办理完成", 4: "办理完成",
} };
export default { export default {
name: "PortalAdminVueMakeRecordReport", name: "PortalAdminVueMakeRecordReport",
data() { data() {
...@@ -206,17 +212,31 @@ export default { ...@@ -206,17 +212,31 @@ export default {
title: "办理地点", title: "办理地点",
align: "center", align: "center",
dataIndex: "address", dataIndex: "address",
customRender: (text, row) => {
return row.address || "--";
},
}, },
{ {
title: "预约编号", title: "预约编号",
align: "center", align: "center",
dataIndex: "number", dataIndex: "number",
customRender: (text,row) => {
return row.number || "--";
},
},
{
title: "排号编码",
align: "center",
dataIndex: "flownum",
customRender: (text,row) => {
return row.flownum || "--";
},
}, },
{ {
title: "预约时间", title: "预约时间",
align: "center", align: "center",
dataIndex: "starttime", dataIndex: "starttime",
customRender: (text,row) => { customRender: (text, row) => {
return `${row.starttime}-${row.endtime}` || "--"; return `${row.starttime}-${row.endtime}` || "--";
}, },
}, },
...@@ -230,8 +250,8 @@ export default { ...@@ -230,8 +250,8 @@ export default {
{ {
title: "取消时间", title: "取消时间",
align: "center", align: "center",
customRender: (text) => { customRender: (text,row) => {
return text.canceltime || "--"; return row.canceltime || "--";
}, },
}, },
{ {
...@@ -271,7 +291,7 @@ export default { ...@@ -271,7 +291,7 @@ export default {
searchForm: { searchForm: {
status: "", status: "",
title: "", title: "",
sectionid:"", sectionid: "",
time: [ time: [
this.$moment(new Date()).format("YYYY-MM-DD"), this.$moment(new Date()).format("YYYY-MM-DD"),
this.$moment(new Date()).format("YYYY-MM-DD"), this.$moment(new Date()).format("YYYY-MM-DD"),
...@@ -284,22 +304,22 @@ export default { ...@@ -284,22 +304,22 @@ export default {
tableSelectedKeys: [], tableSelectedKeys: [],
tableSelectedRows: [], tableSelectedRows: [],
tableSourceData: [], tableSourceData: [],
depList:[]//部门列表 depList: [], //部门列表
}; };
}, },
created() { created() {
this.getOrderList(); this.getOrderList();
this.getDeptList() this.getDeptList();
}, },
methods: { methods: {
// 部门列表 // 部门列表
getDeptList(){ getDeptList() {
getDeptList({page:1,size:-1}).then(res=>{ getDeptList({ page: 1, size: -1 }).then((res) => {
const {data} = res.data const { data } = res.data;
if(res.code == 1){ if (res.code == 1) {
this.depList = data this.depList = data;
} }
}) });
}, },
// 获取报表数据 // 获取报表数据
async getOrderList(search = {}) { async getOrderList(search = {}) {
...@@ -388,7 +408,10 @@ export default { ...@@ -388,7 +408,10 @@ export default {
for (let item of data) { for (let item of data) {
Object.keys(this.statusItem).forEach((key) => { Object.keys(this.statusItem).forEach((key) => {
if (item.status == key) { if (item.status == key) {
item.status = item.status==1?this.style[item.style]:this.statusItem[key]; item.status =
item.status == 1
? this.style[item.style]
: this.statusItem[key];
} }
}); });
} }
...@@ -400,7 +423,10 @@ export default { ...@@ -400,7 +423,10 @@ export default {
for (let item of data) { for (let item of data) {
Object.keys(this.statusItem).forEach((key) => { Object.keys(this.statusItem).forEach((key) => {
if (item.status == key) { if (item.status == key) {
item.status = item.status==1?this.style[item.style]:this.statusItem[key]; item.status =
item.status == 1
? this.style[item.style]
: this.statusItem[key];
} }
}); });
} }
...@@ -425,5 +451,3 @@ export default { ...@@ -425,5 +451,3 @@ export default {
cursor: pointer; cursor: pointer;
} }
</style> </style>
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/HandlingDetails.vue
View file @ e1f51edf
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</div> </div>
<div class="description_box" slot="description"> <div class="description_box" slot="description">
<div class="details"> <div class="details">
<span><i class="lable">办理窗口：</i>{{ dataList.window_name || "--" }}</span> <span><i class="lable">办理窗口：</i>{{ dataList.window_name + '-' + dataList.window_fromnum || "--" }}</span>
<span><i class="lable">办理开始时间：</i>{{ dataList.calltime || "--" }}</span> <span><i class="lable">办理开始时间：</i>{{ dataList.calltime || "--" }}</span>
<span><i class="lable">工作人员：</i>{{ dataList.workman_name || "--" }}</span> <span><i class="lable">工作人员：</i>{{ dataList.workman_name || "--" }}</span>
<span><i class="lable">叫号设备：</i>{{ dataList.call_name || "--" }}</span> <span><i class="lable">叫号设备：</i>{{ dataList.call_name || "--" }}</span>
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue
View file @ e1f51edf
...@@ -314,8 +314,8 @@ export default { ...@@ -314,8 +314,8 @@ export default {
style: "", // 状态 style: "", // 状态
time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间 time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
flownum: "", // 排号编码 flownum: "", // 排号编码
hallid:"", hallid: "",
sectionid:"" sectionid: ""
}, },
//状态 //状态
style: [ style: [
...@@ -342,9 +342,9 @@ export default { ...@@ -342,9 +342,9 @@ export default {
tableSelectedKeys: [], tableSelectedKeys: [],
tableSelectedRows: [], tableSelectedRows: [],
// 大厅列表 // 大厅列表
datingList:[], datingList: [],
// 部门列表 // 部门列表
bumenList:[], bumenList: [],
}; };
}, },
components: { components: {
......
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