Commit 7b31b9fc authored by 赵啸非's avatar 赵啸非

Merge remote-tracking branch 'origin/master'

parents 24e6b80e 7a9c690c
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
cancel-text="取消" cancel-text="取消"
width="820px" width="820px"
:maskClosable="false" :maskClosable="false"
destroyOnClose
> >
<a-form-model <a-form-model
:model="form" :model="form"
...@@ -53,31 +54,14 @@ ...@@ -53,31 +54,14 @@
{{ v.name }}</a-select-option {{ v.name }}</a-select-option
> >
</a-select> </a-select>
<!-- <a-select
v-model="form.deptId"
@change="handleDeptSelect"
placeholder="请选择部门"
>
<a-select-option
v-for="v in diptData"
:key="v.id"
:value="v.id"
>{{ v.name }}</a-select-option
>
</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="starlevel"> <a-form-model-item label="经办人Id" prop="operatorId">
<a-select v-model="form.starlevel" placeholder="请选择星级"> <a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
<a-select-option :value="5">5星</a-select-option>
<a-select-option :value="4">4星</a-select-option>
<a-select-option :value="3">3星</a-select-option>
<a-select-option :value="2">2星</a-select-option>
<a-select-option :value="1">1星</a-select-option>
</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
...@@ -96,18 +80,33 @@ ...@@ -96,18 +80,33 @@
</a-col> --> </a-col> -->
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12">
<a-form-model-item label="星级" prop="starlevel">
<a-select
allowClear
v-model="form.starlevel"
placeholder="请选择星级"
>
<a-select-option :value="5">5星</a-select-option>
<a-select-option :value="4">4星</a-select-option>
<a-select-option :value="3">3星</a-select-option>
<a-select-option :value="2">2星</a-select-option>
<a-select-option :value="1">1星</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="政治面貌" prop="politicalstatus"> <a-form-model-item label="政治面貌" prop="politicalstatus">
<a-select <a-select
...@@ -140,9 +139,14 @@ ...@@ -140,9 +139,14 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-model-item label="电话" prop="phone">
<a-input v-model="form.phone" 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> -->
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="其他称号" prop="dangyuanext"> <a-form-model-item label="其他称号" prop="dangyuanext">
<a-input v-model="form.dangyuanext" placeholder="请输入称号" /> <a-input v-model="form.dangyuanext" placeholder="请输入称号" />
...@@ -150,18 +154,11 @@ ...@@ -150,18 +154,11 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12">
<a-form-model-item label="电话" prop="phone">
<a-input v-model="form.phone" placeholder="请输入电话" />
</a-form-model-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="手机" prop="mobile"> <a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" /> <a-input v-model="form.mobile" 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="idCard"> <a-form-model-item label="身份证" prop="idCard">
<a-input v-model="form.idCard" placeholder="请输入身份证号码" /> <a-input v-model="form.idCard" placeholder="请输入身份证号码" />
...@@ -428,6 +425,7 @@ export default { ...@@ -428,6 +425,7 @@ export default {
duty: "", // 岗位职责 duty: "", // 岗位职责
promise: "", // 服务承诺 promise: "", // 服务承诺
business: "", // 办理事项 business: "", // 办理事项
operatorId: "", // 经办人id
// modelIds: [], // 模块 // modelIds: [], // 模块
}, },
rules: { rules: {
...@@ -529,7 +527,7 @@ export default { ...@@ -529,7 +527,7 @@ export default {
}, },
// 关闭对话框 // 关闭对话框
handleClose() { handleClose() {
this.$refs.formData.resetFields(); // this.$refs.formData.resetFields();
this.loading = false; this.loading = false;
this.Visible = false; this.Visible = false;
}, },
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
cancel-text="重置" cancel-text="重置"
width="820px" width="820px"
:maskClosable="false" :maskClosable="false"
destroyOnClose
> >
<a-form-model <a-form-model
:model="form" :model="form"
...@@ -53,37 +54,14 @@ ...@@ -53,37 +54,14 @@
{{ v.name }}</a-select-option {{ v.name }}</a-select-option
> >
</a-select> </a-select>
<!-- <a-select
v-model="form.deptId"
@change="handleDeptSelect"
allowClear
placeholder="请选择部门"
>
<a-select-option
v-for="v in diptData"
:key="v.id"
:value="v.id"
>{{ v.name }}</a-select-option
>
</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="starlevel"> <a-form-model-item label="经办人Id" prop="operatorId">
<a-select <a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
allowClear
v-model="form.starlevel"
placeholder="请选择星级"
>
<a-select-option :value="5">5星</a-select-option>
<a-select-option :value="4">4星</a-select-option>
<a-select-option :value="3">3星</a-select-option>
<a-select-option :value="2">2星</a-select-option>
<a-select-option :value="1">1星</a-select-option>
</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
...@@ -102,18 +80,33 @@ ...@@ -102,18 +80,33 @@
</a-col> --> </a-col> -->
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12">
<a-form-model-item label="星级" prop="starlevel">
<a-select
allowClear
v-model="form.starlevel"
placeholder="请选择星级"
>
<a-select-option :value="5">5星</a-select-option>
<a-select-option :value="4">4星</a-select-option>
<a-select-option :value="3">3星</a-select-option>
<a-select-option :value="2">2星</a-select-option>
<a-select-option :value="1">1星</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="政治面貌" prop="politicalstatus"> <a-form-model-item label="政治面貌" prop="politicalstatus">
<a-select <a-select
...@@ -146,9 +139,14 @@ ...@@ -146,9 +139,14 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-model-item label="电话" prop="phone">
<a-input v-model="form.phone" 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> -->
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="其他称号" prop="dangyuanext"> <a-form-model-item label="其他称号" prop="dangyuanext">
<a-input v-model="form.dangyuanext" placeholder="请输入称号" /> <a-input v-model="form.dangyuanext" placeholder="请输入称号" />
...@@ -156,18 +154,11 @@ ...@@ -156,18 +154,11 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12">
<a-form-model-item label="电话" prop="phone">
<a-input v-model="form.phone" placeholder="请输入电话" />
</a-form-model-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="手机" prop="mobile"> <a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" /> <a-input v-model="form.mobile" 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="idCard"> <a-form-model-item label="身份证" prop="idCard">
<a-input v-model="form.idCard" placeholder="请输入身份证号码" /> <a-input v-model="form.idCard" placeholder="请输入身份证号码" />
...@@ -470,6 +461,7 @@ export default { ...@@ -470,6 +461,7 @@ export default {
duty: "", // 岗位职责 duty: "", // 岗位职责
promise: "", // 服务承诺 promise: "", // 服务承诺
business: "", // 办理事项 business: "", // 办理事项
operatorId: "", // 经办人id
// modelIds: [], // 模块 // modelIds: [], // 模块
}, },
rules: { rules: {
...@@ -582,7 +574,7 @@ export default { ...@@ -582,7 +574,7 @@ export default {
}, },
// 关闭对话框 // 关闭对话框
handleClose() { handleClose() {
this.$refs.formData.resetFields(); // this.$refs.formData.resetFields();
this.loading = false; this.loading = false;
this.Visible = false; this.Visible = false;
}, },
......
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
onChange: handlePagination, onChange: handlePagination,
onShowSizeChange: showSizeChange, onShowSizeChange: showSizeChange,
}" }"
:scroll="{ y: 450 }" :scroll="{ y: 530 }"
:loading="loading" :loading="loading"
:columns="columns" :columns="columns"
:data-source="WorkmanData" :data-source="WorkmanData"
......
This diff is collapsed.
...@@ -28,6 +28,11 @@ export function getWorkerInfo(params) { ...@@ -28,6 +28,11 @@ export function getWorkerInfo(params) {
return http.get(`${baseURL}/base/workman/info`, params); return http.get(`${baseURL}/base/workman/info`, params);
} }
//评价选项
export function getOptonList(params){
return http.post(`${BASEURL}/bkb/bkbset/optionlist`,params)
}
//评价数据列表 //评价数据列表
export function getEvaList(params) { export function getEvaList(params) {
return http.post(`${BASEURL}/bkb/evaluate/evaluatelist`, params); return http.post(`${BASEURL}/bkb/evaluate/evaluatelist`, params);
......
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
<div v-if="modalInfo.show==1"> <div v-if="modalInfo.show==1">
<div class="headerInfo"> <div class="headerInfo">
<p> <p>
<span>总耗时:{{queEvaData.alltime}}<i class="fa fa-long-arrow-down"></i></span> <span>总耗时:{{queEvaData.alltime?queEvaData.alltime:'--'}}<i class="fa fa-long-arrow-down"></i></span>
<span>等待时间:{{queEvaData.waittime}}<i class="fa fa-long-arrow-down"></i></span> <span>等待时间:{{queEvaData.waittime?queEvaData.waittime:'--'}}<i class="fa fa-long-arrow-down"></i></span>
<span>办理时间:{{queEvaData.bltime}}<i class="fa fa-long-arrow-down"></i></span> <span>办理时间:{{queEvaData.bltime?queEvaData.bltime:'--'}}<i class="fa fa-long-arrow-down"></i></span>
</p> </p>
<p> <p>
<span>平均耗时:{{queEvaData.p_alltime}}</span> <span>平均耗时:{{queEvaData.p_alltime?queEvaData.p_alltime:'--'}}</span>
<span>平均等待时间:{{queEvaData.p_waittime}}</span> <span>平均等待时间:{{queEvaData.p_waittime?queEvaData.p_waittime:'--'}}</span>
<span>平均办理时间:{{queEvaData.p_bltime}}</span> <span>平均办理时间:{{queEvaData.p_bltime?queEvaData.p_bltime:'--'}}</span>
</p> </p>
</div> </div>
<div class="state" v-if="queEvaData.style==0">未办理</div> <div class="state" v-if="queEvaData.style==0">未办理</div>
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
slot="description" slot="description"
> >
<div class="details"> <div class="details">
<span><i class="lable">申报人:</i>{{queEvaData.people_name}}</span> <span><i class="lable">申报人:</i>{{queEvaData.people_name?queEvaData.people_name:'--'}}</span>
<span><i class="lable">取号时间:</i>{{queEvaData.taketime}}</span> <span><i class="lable">取号时间:</i>{{queEvaData.taketime?queEvaData.taketime:'--'}}</span>
<span><i class="lable">排队编码:</i>{{queEvaData.flownum}}</span> <span><i class="lable">排队编码:</i>{{queEvaData.flownum?queEvaData.flownum:'--'}}</span>
<span><i class="lable">取号方式:</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span> <span><i class="lable">取号方式:</i>{{queEvaData.wy_signin==''?'--':queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
<span><i class="lable">注册方式:</i>--</span> <span><i class="lable">注册方式:</i>--</span>
<span><i class="lable">取号设备:</i>{{queEvaData.take_name}}</span> <span><i class="lable">取号设备:</i>{{queEvaData.take_name?queEvaData.take_name:'--'}}</span>
</div> </div>
</div> </div>
</a-step> </a-step>
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
slot="description" slot="description"
> >
<div class="details"> <div class="details">
<span><i class="lable">办理窗口:</i>{{queEvaData.window_name}}</span> <span><i class="lable">办理窗口:</i>{{queEvaData.window_name?queEvaData.window_name:'--'}}</span>
<span><i class="lable">办理开始时间:</i>{{queEvaData.bltime}}</span> <span><i class="lable">办理开始时间:</i>{{queEvaData.bltime?queEvaData.bltime:'--'}}</span>
<span><i class="lable">工作人员:</i>{{queEvaData.workman_name}}</span> <span><i class="lable">工作人员:</i>{{queEvaData.workman_name?queEvaData.workman_name:'--'}}</span>
<span><i class="lable">叫号设备:</i>{{queEvaData.calltime}}</span> <span><i class="lable">叫号设备:</i>{{queEvaData.call_name}}</span>
</div> </div>
</div> </div>
</a-step> </a-step>
...@@ -92,17 +92,18 @@ ...@@ -92,17 +92,18 @@
slot="description" slot="description"
> >
<div class="details"> <div class="details">
<span><i class="lable">办理结束时间:</i>{{queEvaData.endtime}}</span> <span><i class="lable">办理结束时间:</i>{{queEvaData.endtime?queEvaData.endtime:'--'}}</span>
<span><i class="lable">评价选项:</i>{{queEvaData.option_id}}</span> <span><i class="lable">评价选项:</i>{{queEvaData.option_id?queEvaData.option_id:'--'}}</span>
<span><i class="lable">评价时间:</i>{{queEvaData.pj_time}}</span> <span><i class="lable">评价时间:</i>{{queEvaData.pj_time?queEvaData.pj_time:'--'}}</span>
<span style="width:100%"><i class="lable">评价指标:</i> <span style="width:100%"><i class="lable">评价指标:</i>
<i class="pjzb" v-for="(item,index) in queEvaData.content" :key="index">{{item}}</i> <i class="pjzb" v-for="(item,index) in queEvaData.content" :key="index">{{item}}</i>
<!-- <span v-if="queEvaData.content.length==0">--</span> -->
</span> </span>
<span><i class="lable">评价来源:</i>{{queEvaData.source}}</span> <span><i class="lable">评价来源:</i>{{queEvaData.source?queEvaData.source:'--'}}</span>
<span><i class="lable">评价设备:</i>{{queEvaData.pj_name}}</span> <span><i class="lable">评价设备:</i>{{queEvaData.pj_name?queEvaData.pj_name:'--'}}</span>
<span><i class="lable">评价人照片:</i> <span><i class="lable">评价人照片:</i>
<a-avatar v-if="!queEvaData.idcardData_PhotoFileName" shape="square" :size="40" icon="user" /> <a-avatar v-if="!queEvaData.picture || !baseurl" shape="square" :size="40" icon="user" />
<img v-else :src="process.env.VUE_APP_API_BASE_URL+text" alt="" srcset=""> <img v-else :src="baseurl+'/'+queEvaData.picture" alt="" srcset="" style="max-width: 100px; max-height: 100px;">
</span> </span>
</div> </div>
</div> </div>
...@@ -132,21 +133,22 @@ ...@@ -132,21 +133,22 @@
slot="description" slot="description"
> >
<div class="details"> <div class="details">
<span><i class="lable">评价人:</i>{{queEvaData.idcard_Name}}</span> <span><i class="lable">评价人:</i>{{queEvaData.idcard_Name?queEvaData.idcard_Name:'--'}}</span>
<span><i class="lable">手机号:</i>{{queEvaData.phone}}</span> <span><i class="lable">手机号:</i>{{queEvaData.phone?queEvaData.phone:'--'}}</span>
<span><i class="lable">身份证号:</i>{{queEvaData.idcard_IDCardNo}}</span> <span><i class="lable">身份证号:</i>{{queEvaData.idcard_IDCardNo?queEvaData.idcard_IDCardNo:'--'}}</span>
<span><i class="lable">窗口编号:</i>{{queEvaData.window_fronum}}</span> <span><i class="lable">窗口编号:</i>{{queEvaData.window_fronum?queEvaData.window_fronum:'--'}}</span>
<span><i class="lable">评价选项:</i>{{queEvaData.option_id}}</span> <span><i class="lable">评价选项:</i>{{queEvaData.option_id?queEvaData.option_id:'--'}}</span>
<span><i class="lable">评价时间:</i>{{queEvaData.create_time}}</span> <span><i class="lable">评价时间:</i>{{queEvaData.create_time?queEvaData.create_time:'--'}}</span>
<span style="width:100%"><i class="lable">评价指标:</i> <span style="width:100%"><i class="lable">评价指标:</i>
<i class="pjzb" v-for="(item,index) in queEvaData.content" :key="index">{{item}}</i> <i class="pjzb" v-for="(item,index) in queEvaData.content" :key="index">{{item}}</i>
<!-- <span v-if="queEvaData.content.length==0">--</span> -->
</span> </span>
<span><i class="lable">评价来源:</i>{{queEvaData.source}}</span> <span><i class="lable">评价来源:</i>{{queEvaData.source?queEvaData.source:'--'}}</span>
<span><i class="lable">评价设备:</i>--</span> <span><i class="lable">评价设备:</i>--</span>
<span> <span>
<i class="lable">评价人照片:</i> <i class="lable">评价人照片:</i>
<a-avatar v-if="!queEvaData.idcardData_PhotoFileName" shape="square" :size="40" icon="user" /> <a-avatar v-if="!queEvaData.picture" shape="square" :size="40" icon="user" />
<img v-else :src="process.env.VUE_APP_API_BASE_URL+text" alt="" srcset=""> <img v-else :src="process.env.VUE_APP_API_BASE_URL+'/'+queEvaData.picture" alt="" srcset="" style="max-width: 100px; max-height: 100px;">
</span> </span>
</div> </div>
</div> </div>
...@@ -166,7 +168,8 @@ export default { ...@@ -166,7 +168,8 @@ export default {
data() { data() {
return { return {
queEvaData:{} queEvaData:{},
baseurl:'',
}; };
}, },
filters: { filters: {
...@@ -195,7 +198,9 @@ export default { ...@@ -195,7 +198,9 @@ export default {
}, },
mounted() {}, mounted() {},
methods: {}, created(){
this.baseurl = process.env.VUE_APP_API_PHP_URL
}
}; };
</script> </script>
......
...@@ -264,10 +264,6 @@ export default { ...@@ -264,10 +264,6 @@ export default {
}, },
//状态 //状态
style: [ style: [
{
key: 0,
name: "排队中",
},
{ {
key: 1, key: 1,
name: "办理中", name: "办理中",
...@@ -280,7 +276,6 @@ export default { ...@@ -280,7 +276,6 @@ export default {
//Form数据列表 //Form数据列表
tableList: [], tableList: [],
obj: { obj: {
0: "排队中",
1: "办理中", 1: "办理中",
4: "办理完成", 4: "办理完成",
}, },
...@@ -380,6 +375,7 @@ export default { ...@@ -380,6 +375,7 @@ export default {
//用户模态框 //用户模态框
async openDeclarant(item) { async openDeclarant(item) {
await getPeopleanalyse({ await getPeopleanalyse({
idcard: item.people_idcard,
peopleid: item.peopleid, peopleid: item.peopleid,
time: this.searchForm.time, time: this.searchForm.time,
}).then((res) => { }).then((res) => {
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
> >
<span <span
><i class="lable">叫号设备:</i ><i class="lable">叫号设备:</i
>{{ dataList.window_fromnum || "--" }}</span >{{ dataList.call_name || "--" }}</span
> >
</div> </div>
</div> </div>
......
<template> <template>
<div class="businessModal" ref="businessModal"> <div class="businessModal" ref="businessModal">
<a-modal :title="modalInfo.title" width="400px" :visible="modalInfo.visible" <a-modal :title="modalInfo.title" :visible="modalInfo.visible" :confirmLoading="modalInfo.confirmLoading"
:confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true" @cancel="modalClose" :centered="true" :destroyOnClose="true" :getContainer="() => $refs.businessModal">
:getContainer="() => $refs.businessModal">
<div class="content"> <div class="content">
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
<em v-if="dataList.matterlist">关联事项({{ dataList.matterlist.length }}</em> <em v-if="dataList.matterlist">关联事项({{ dataList.matterlist.length }}</em>
<p> <p>
<template v-for="item in dataList.matterlist"> <template v-for="item in dataList.matterlist">
<p>{{ item }}</p> <p>* {{ item }}</p>
</template> </template>
</p> </p>
<h4> <h4>
<span>受理次数<br /><i>{{ dataList.slcount }}</i></span> <span>受理次数<br /><i>{{ dataList.slcount }}</i></span>
<span>办结次数<br /><i>{{ dataList.bjcount }}</i></span> <span>办结次数<br /><i>{{ dataList.bjcount }}</i></span>
<span>好评率<br /><i>{{ dataList.hplv }}</i></span> <span>好评率<br /><i>{{ dataList.hplv }}%</i></span>
</h4> </h4>
</div> </div>
<template slot="footer"> <template slot="footer">
...@@ -50,7 +49,7 @@ export default { ...@@ -50,7 +49,7 @@ export default {
h1 { h1 {
font-size: 17px; font-size: 17px;
color: #139bfd; color: #139bfd;
padding: 20px; padding: 0 20px 20px 20px;
} }
em { em {
...@@ -64,10 +63,12 @@ export default { ...@@ -64,10 +63,12 @@ export default {
p { p {
padding: 3px 20px; padding: 3px 20px;
font-size: 16px; font-size: 16px;
width: 500px; width: 100%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
h4 { h4 {
......
<template> <template>
<div class="userModal" ref="userModal"> <div class="userModal" ref="userModal">
<a-modal <a-modal :title="modalInfo.title" :width="modalInfo.width" :visible="modalInfo.visible"
:title="modalInfo.title" :confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true"
:width="modalInfo.width" :getContainer="() => $refs.userModal">
:visible="modalInfo.visible"
:confirmLoading="modalInfo.confirmLoading"
@cancel="modalClose"
:centered="true"
:destroyOnClose="true"
:getContainer="() => $refs.userModal"
>
<div class="content"> <div class="content">
<h1>{{ dataList.people_name}}</h1> <h1>{{ dataList.people_name }}</h1>
<p> <p>
<span>{{ dataList.people_sex }}</span> <span>{{ dataList.people_sex }}</span>
<span>{{ dataList.age }}</span> <span>{{ dataList.age }}</span>
<span>{{ dataList.people_phone }}</span> <span>{{ dataList.people_phone }}</span>
</p> </p>
<h2> <h2>
<span <span>预约次数<br /><i>{{ dataList.ordernum }}</i></span>
>预约次数<br /><i>{{ dataList.ordernum }}</i></span <span>排队次数<br /><i>{{ dataList.quenum }}</i></span>
> <span>关联业务<br /><i>{{ dataList.bus_num }}</i></span>
<span
>排队次数<br /><i>{{ dataList.quenum }}</i></span
>
<span
>关联业务<br /><i>{{ dataList.bus_num}}</i></span
>
</h2> </h2>
</div> </div>
<template slot="footer"> <template slot="footer">
<a-button type="primary" ghost @click="openBlockchain">查看TA的数据画像</a-button> <a-button type="primary" ghost @click="openBlockchain">查看TA的数据画像</a-button>
<a-button type="primary" ghost @click="openBlockchain" <a-button type="primary" ghost @click="openBlockchain">区块链信息</a-button>
>区块链信息</a-button
>
</template> </template>
</a-modal> </a-modal>
<Blockchain ref="Blockchain" /> <Blockchain ref="Blockchain" />
...@@ -48,14 +33,14 @@ export default { ...@@ -48,14 +33,14 @@ export default {
name: "PortalAdminVueUserInfo", name: "PortalAdminVueUserInfo",
data() { data() {
return { return {
dataList:[], dataList: [],
}; };
}, },
components: { components: {
Blockchain, Blockchain,
}, },
mounted() {}, mounted() { },
methods: { methods: {
openBlockchain() { openBlockchain() {
// this.$refs.Blockchain.modalInfo.visible = true; // this.$refs.Blockchain.modalInfo.visible = true;
...@@ -69,30 +54,35 @@ export default { ...@@ -69,30 +54,35 @@ export default {
.userModal { .userModal {
.content { .content {
h1 { h1 {
padding: 20px; padding: 0 20px;
color: #3bacfd; color: #3bacfd;
font-size: 18px; font-size: 18px;
} }
p { p {
padding: 20px; padding: 20px;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
span { span {
& + span { &+span {
margin-left: 30px; margin-left: 30px;
} }
} }
} }
h2 { h2 {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 20px; padding: 20px;
background: #f3faff; background: #f3faff;
span { span {
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
i { i {
color: #3bacfd; color: #3bacfd;
font-style: normal; font-style: normal;
...@@ -100,6 +90,7 @@ export default { ...@@ -100,6 +90,7 @@ export default {
} }
} }
} }
.ant-modal-body { .ant-modal-body {
padding: 0 !important; padding: 0 !important;
min-height: 300px !important; min-height: 300px !important;
......
<template> <template>
<div class="workPeopleModal" ref="workPeopleModal"> <div class="workPeopleModal" ref="workPeopleModal">
<a-modal :title="modalInfo.title" width="500px" :visible="modalInfo.visible" <a-modal :title="modalInfo.title" :visible="modalInfo.visible" :confirmLoading="modalInfo.confirmLoading"
:confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true" @cancel="modalClose" :centered="true" :destroyOnClose="true" :getContainer="() => $refs.workPeopleModal">
:getContainer="() => $refs.workPeopleModal">
<div class="content"> <div class="content">
<div class="workInfo"> <div class="workInfo">
<div class="left"> <div class="left">
...@@ -15,14 +14,14 @@ ...@@ -15,14 +14,14 @@
<span><i class="lable">所属部门:</i>{{ infoData.deptName || "--" }}</span> <span><i class="lable">所属部门:</i>{{ infoData.deptName || "--" }}</span>
<span><i class="lable">政治面貌:</i>{{ $codeMap.politicalStatus[infoData.politicalstatus] || "--" }}</span> <span><i class="lable">政治面貌:</i>{{ $codeMap.politicalStatus[infoData.politicalstatus] || "--" }}</span>
<span><i class="lable">电话:</i>{{ infoData.mobile || "--" }}</span> <span><i class="lable">电话:</i>{{ infoData.mobile || "--" }}</span>
<span><i class="lable">星级:</i>{{ infoData.starlevel +'' || "--" }} </span> <span v-show="infoData.starlevel"><i class="lable">星级:</i>{{ infoData.starlevel + '' || "--" }} </span>
</div> </div>
</div> </div>
</div> </div>
<h2> <h2>
<span>受理业务<br /><i>{{ infoData.slbusiness || "0" }}</i></span> <span>受理业务<br /><i>{{ infoData.slbusiness || "0" }}</i></span>
<span>评价次数<br /><i>{{ infoData.pjnum || "0" }}</i></span> <span>评价次数<br /><i>{{ infoData.pjnum || "0" }}</i></span>
<span>好评率<br /><i>{{ infoData.hplv || "0" }}</i></span> <span>好评率<br /><i>{{ infoData.hplv + '%' || "--" }}</i></span>
</h2> </h2>
</div> </div>
<template slot="footer"> <template slot="footer">
...@@ -72,6 +71,7 @@ export default { ...@@ -72,6 +71,7 @@ export default {
width: 100px; width: 100px;
padding: 0 10px; padding: 0 10px;
img { img {
max-height: 120px; max-height: 120px;
width: 100%; width: 100%;
...@@ -94,6 +94,9 @@ export default { ...@@ -94,6 +94,9 @@ export default {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
padding: 2px 0; padding: 2px 0;
overflow: hidden; // 溢出部分隐藏
white-space: nowrap; // 文字不换行
text-overflow: ellipsis; // 显示省略号
.lable { .lable {
display: inline-block; display: inline-block;
......
...@@ -2,27 +2,17 @@ ...@@ -2,27 +2,17 @@
<div class="queueRecord-Container"> <div class="queueRecord-Container">
<div class="header_box"> <div class="header_box">
<div> <div>
<a-button <a-button :loading="btnLoading" type="success" @click="handleExportTable">
:loading="btnLoading"
type="success"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span> <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button> </a-button>
<b <b>取号次数:<i>{{ tablePagination.total }}</i></b>
>叫号次数:<i>{{ tablePagination.total }}</i></b
>
<sub>统计时间段:{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub> <sub>统计时间段:{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub>
</div> </div>
<span> <span>
<a-space> <a-space>
<a-select v-model="searchForm.id" style="width: 120px"> <a-select v-model="searchForm.id" style="width: 120px">
<a-select-option value=""> 全部设备 </a-select-option> <a-select-option value=""> 全部设备 </a-select-option>
<a-select-option <a-select-option v-for="item in deviceData" :key="item.id" :value="item.id">
v-for="item in deviceData"
:key="item.id"
:value="item.id"
>
{{ item.name }} {{ item.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
...@@ -34,10 +24,7 @@ ...@@ -34,10 +24,7 @@
</a-select> </a-select>
<a-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time"> <a-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time">
</a-range-picker> </a-range-picker>
<a-input <a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索">
v-model="searchForm.flownum"
placeholder="请输入排队编号搜索"
>
<a-icon slot="prefix" type="search" /> <a-icon slot="prefix" type="search" />
</a-input> </a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button> <a-button type="primary" @click="handleSearch">搜索</a-button>
...@@ -46,21 +33,11 @@ ...@@ -46,21 +33,11 @@
</span> </span>
</div> </div>
<div class="main"> <div class="main">
<a-table <a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{
size="small"
bordered
:row-key="(record) => record.id"
:row-selection="{
selectedRowKeys: tableSelectedKeys, selectedRowKeys: tableSelectedKeys,
onChange: onSelectChange, onChange: onSelectChange,
}" }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="changeTablePage" :loading="tableLoading"
:scroll="{ y: 590 }" :columns="tableHeaders" :dataSource="tableList">
:pagination="tablePagination"
@change="changeTablePage"
:loading="tableLoading"
:columns="tableHeaders"
:dataSource="tableList"
>
<!-- 序号 --> <!-- 序号 -->
<span slot="num" slot-scope="text, record, index">{{ <span slot="num" slot-scope="text, record, index">{{
(tablePagination.current - 1) * tablePagination.pageSize + index + 1 (tablePagination.current - 1) * tablePagination.pageSize + index + 1
...@@ -82,11 +59,7 @@ ...@@ -82,11 +59,7 @@
</template> </template>
<!-- 办理业务 --> <!-- 办理业务 -->
<template slot="business" slot-scope="text"> <template slot="business" slot-scope="text">
<a <a v-if="text.business" @click="openBusiness(text.business, text.businessid)">{{ text.business }}</a>
v-if="text.business"
@click="openBusiness(text.business, text.businessid)"
>{{ text.business }}</a
>
<span v-else>--</span> <span v-else>--</span>
</template> </template>
<!-- 办理开始时间 --> <!-- 办理开始时间 -->
...@@ -118,13 +91,11 @@ ...@@ -118,13 +91,11 @@
</template> </template>
<!-- 状态 --> <!-- 状态 -->
<template slot="style" slot-scope="text"> <template slot="style" slot-scope="text">
<span <span :class="{
:class="{
'stand-line': text.style === 0, 'stand-line': text.style === 0,
'on-transact': text.style === 1, 'on-transact': text.style === 1,
'on-end': text.style === 4, 'on-end': text.style === 4,
}" }">
>
{{ $codeMap.queueState[text.style] }} {{ $codeMap.queueState[text.style] }}
</span> </span>
</template> </template>
...@@ -381,6 +352,7 @@ export default { ...@@ -381,6 +352,7 @@ export default {
//用户模态框 //用户模态框
async openDeclarant(item) { async openDeclarant(item) {
await getPeopleanalyse({ await getPeopleanalyse({
idcard: item.people_idcard,
peopleid: item.peopleid, peopleid: item.peopleid,
time: this.searchForm.time, time: this.searchForm.time,
}).then((res) => { }).then((res) => {
......
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