|
@@ -3,18 +3,18 @@
|
|
|
<a-form ref="formRef" name="advanced_search" class="ant-advanced-search-form" :model="searchParams">
|
|
|
<a-row :gutter="24">
|
|
|
<a-col :span="6">
|
|
|
- <a-form-item label="姓名" :label-col="{span:6}" name="name">
|
|
|
- <a-input v-model:value="searchParams.name" placeholder=""/>
|
|
|
+ <a-form-item label="姓名" :label-col="{span:6}" name="UserName">
|
|
|
+ <a-input v-model:value="searchParams.userName" placeholder=""/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="6">
|
|
|
- <a-form-item label="工作日期" :label-col="{span:6}" name="name">
|
|
|
+ <a-form-item label="工作日期" :label-col="{span:6}" name="WorkTime">
|
|
|
<a-range-picker format="YYYY-MM-DD" :placeholder="['开始日期', '结束日期']" @change="onRangeChange"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="6">
|
|
|
- <a-form-item label="日志类型" :label-col="{span:6}" name="name">
|
|
|
- <a-input v-model:value="searchParams.name" placeholder="" />
|
|
|
+ <a-form-item label="日志类型" :label-col="{span:6}" name="DoType">
|
|
|
+ <a-input v-model:value="searchParams.doTypeID" placeholder="" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="5" style="text-align: right">
|
|
@@ -30,7 +30,7 @@
|
|
|
:options="regionList"
|
|
|
:field-names="{ label: 'name', value: 'code' }"
|
|
|
:allow-clear="true"
|
|
|
- @change="loadData"
|
|
|
+ @change="changeRegion"
|
|
|
>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
@@ -43,7 +43,7 @@
|
|
|
:options="streetList"
|
|
|
:field-names="{ label: 'name', value: 'code' }"
|
|
|
:allow-clear="true"
|
|
|
- @change="loadData"
|
|
|
+ @change="onSearch"
|
|
|
>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
@@ -63,12 +63,12 @@
|
|
|
:loading="formState.loading"
|
|
|
@change="handleTableChange"
|
|
|
:row-selection="{ selectedRowKeys: formState.selectedRowKeys, onChange: onSelectChange}"
|
|
|
- :row-key="record=>record.institutionID"
|
|
|
+ :row-key="record=>record.doWorkID"
|
|
|
bordered>
|
|
|
<template #bodyCell="{ column, text, record }">
|
|
|
<template v-if="column.key === 'operation'">
|
|
|
<div class="table-operation">
|
|
|
- <a-button type="link" size="small" @click='onOperates(record.institutionID,"修改",false)'>编辑</a-button>
|
|
|
+ <a-button type="link" size="small" @click='onOperates(record.doWorkID,"修改",false)'>编辑</a-button>
|
|
|
<a-button type="link" size="small" @click="onDel(record)">删除</a-button>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -79,12 +79,12 @@
|
|
|
</template>
|
|
|
|
|
|
<script lang="ts">
|
|
|
-import {get} from '@/api/common';
|
|
|
import {reactive, ref, computed, defineComponent} from 'vue';
|
|
|
import {DownOutlined, UpOutlined} from '@ant-design/icons-vue';
|
|
|
import type {FormInstance,SelectProps} from 'ant-design-vue';
|
|
|
import type {TableColumnsType, TableProps} from 'ant-design-vue';
|
|
|
import {getList} from '@/api/taskAndLog/dowork';
|
|
|
+import {getRegionCodeList,getStreetCodeList} from '@/api/system/area/index';
|
|
|
import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
|
|
|
import {getPaginationTotalTitle} from "@/utils/common";
|
|
|
import {message} from "ant-design-vue";
|
|
@@ -117,16 +117,17 @@ export default defineComponent({
|
|
|
key: 'LogId',
|
|
|
customRender: item => `${searchParams.pageSize * (searchParams.pageIndex - 1) + item.index + 1}`
|
|
|
},
|
|
|
- {title: '姓名', dataIndex: 'pageName', key: 'pageName', align: "center"},
|
|
|
- {title: '工作日期', dataIndex: 'logTime', key: 'logTime', width: 120, align: "center"},
|
|
|
+ {title: '姓名', dataIndex: 'userName', key: 'userName', align: "center"},
|
|
|
{
|
|
|
- title: '日志类型', dataIndex: 'actionName', key: 'actionName', align: "center", customRender: (item) => {
|
|
|
- return item.record.finishTime==null?"": (dayjs(item.record.finishTime).format('YYYY-MM-DD'))
|
|
|
- }
|
|
|
+ title: '工作日期', dataIndex: 'workTime', key: 'workTime', width: 120, align: "center",
|
|
|
+ customRender: (item) => {
|
|
|
+ return item.record.workTime==null?"": (dayjs(item.record.workTime).format('YYYY-MM-DD'))
|
|
|
+ },
|
|
|
},
|
|
|
- {title: '工作情况', dataIndex: 'workName', key: 'workName', align: "center"},
|
|
|
- {title: '所属县区', dataIndex: 'regionName', key: 'regionName', align: "center"},
|
|
|
- {title: '所属街道', dataIndex: 'streetName', key: 'streetName', align: "center"},
|
|
|
+ {title: '日志类型', dataIndex: 'doTypeID', key: 'doTypeID', align: "center"},
|
|
|
+ {title: '工作情况', dataIndex: 'workContent', key: 'workContent', align: "center"},
|
|
|
+ {title: '所属县区', dataIndex: 'regionCode', key: 'regionCode', align: "center"},
|
|
|
+ {title: '所属街道', dataIndex: 'streetCode', key: 'streetCode', align: "center"},
|
|
|
{title: '操作', key: 'operation', fixed: 'right', width: 170, align: "center"},
|
|
|
];
|
|
|
const pagination = computed(() => ({
|
|
@@ -139,14 +140,19 @@ export default defineComponent({
|
|
|
|
|
|
const regionList = ref<SelectProps['options']>();
|
|
|
const streetList = ref<SelectProps['options']>();
|
|
|
- const taskTypeList = ref<SelectProps['options']>();
|
|
|
const dataList = ref([]);
|
|
|
|
|
|
- get('system/area/getCityList',{}).then(data=>{
|
|
|
- console.log(data);
|
|
|
- regionList.value=data;
|
|
|
- console.log(regionList.value);
|
|
|
- });
|
|
|
+ const getRegionList = async function(){
|
|
|
+ const regionResult: any = await getRegionCodeList();
|
|
|
+ console.log('regionResult',regionResult);
|
|
|
+ regionList.value = regionResult;
|
|
|
+ }
|
|
|
+
|
|
|
+ const changeRegion = async function(){
|
|
|
+ const streetResult: any = await getStreetCodeList(searchParams.regionCode);
|
|
|
+ console.log('streetResult',streetResult);
|
|
|
+ streetList.value = streetResult;
|
|
|
+ }
|
|
|
|
|
|
const loadData = async function () {
|
|
|
formState.loading = true;
|
|
@@ -180,7 +186,7 @@ export default defineComponent({
|
|
|
|
|
|
const onDel = (item: any) => {
|
|
|
if (item) {
|
|
|
- formState.selectedRowKeys.push(item.InstitutionID as never)
|
|
|
+ formState.selectedRowKeys.push(item.doWorkID as never)
|
|
|
}
|
|
|
|
|
|
if (formState.selectedRowKeys.length <= 0) {
|
|
@@ -203,7 +209,6 @@ export default defineComponent({
|
|
|
return {
|
|
|
regionList,
|
|
|
streetList,
|
|
|
- taskTypeList,
|
|
|
formRef,
|
|
|
searchParams,
|
|
|
formState,
|
|
@@ -218,14 +223,18 @@ export default defineComponent({
|
|
|
exportPost,
|
|
|
onDel,
|
|
|
onRangeChange,
|
|
|
- loadData
|
|
|
+ loadData,
|
|
|
+ getRegionList,
|
|
|
+ changeRegion
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
+ this.getRegionList();
|
|
|
this.loadData();
|
|
|
},
|
|
|
activated() {
|
|
|
if (history.state.params?.reload)
|
|
|
+ this.getRegionList();
|
|
|
this.loadData();
|
|
|
}
|
|
|
});
|