|
@@ -8,13 +8,13 @@
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
- <a-form-item :label-col="{span:6}" label="工作日期" name="workDate">
|
|
|
|
|
|
+ <a-form-item :label-col="{span:6}" label="备忘日期" name="workDate">
|
|
<a-range-picker v-model:value="workDate" :placeholder="['开始日期', '结束日期']"
|
|
<a-range-picker v-model:value="workDate" :placeholder="['开始日期', '结束日期']"
|
|
format="YYYY-MM-DD" @change="onRangeChange"/>
|
|
format="YYYY-MM-DD" @change="onRangeChange"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
- <a-form-item :label-col="{span:6}" label="日志类型" name="doTypeID">
|
|
|
|
|
|
+ <a-form-item :label-col="{span:6}" label="备忘类型" name="doTypeID">
|
|
<a-select ref="select"
|
|
<a-select ref="select"
|
|
v-model:value="searchParams.doTypeID" :allow-clear="true"
|
|
v-model:value="searchParams.doTypeID" :allow-clear="true"
|
|
:field-names="{ label: 'name', value: 'value' }" :options="logTypeList" @change="onSearch">
|
|
:field-names="{ label: 'name', value: 'value' }" :options="logTypeList" @change="onSearch">
|
|
@@ -93,7 +93,7 @@
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<a-button functioncode="T01040202" html-type="submit" type="primary" @click='onAdd'>新增</a-button>
|
|
<a-button functioncode="T01040202" html-type="submit" type="primary" @click='onAdd'>新增</a-button>
|
|
- <BExportExcel :filename="'工作日志信息'"
|
|
|
|
|
|
+ <BExportExcel :filename="'备忘信息'"
|
|
:params="{...exportSearchParams, rows:100000,doWorkIDList:formState.selectedRowKeys.join(',')}"
|
|
:params="{...exportSearchParams, rows:100000,doWorkIDList:formState.selectedRowKeys.join(',')}"
|
|
:title="'导出'"
|
|
:title="'导出'"
|
|
:url="'taskAndLog/doWork/export'"></BExportExcel>
|
|
:url="'taskAndLog/doWork/export'"></BExportExcel>
|
|
@@ -205,13 +205,13 @@ export default defineComponent({
|
|
},
|
|
},
|
|
{title: '姓名', dataIndex: 'userName', key: 'userName', align: "center"},
|
|
{title: '姓名', dataIndex: 'userName', key: 'userName', align: "center"},
|
|
{
|
|
{
|
|
- title: '工作日期', dataIndex: 'workTime', key: 'workTime', width: 120, align: "center",
|
|
|
|
|
|
+ title: '工作备忘日期', dataIndex: 'workTime', key: 'workTime', width: 120, align: "center",
|
|
customRender: (item) => {
|
|
customRender: (item) => {
|
|
return item.record.workTime == null ? "" : (dayjs(item.record.workTime).format('YYYY-MM-DD'))
|
|
return item.record.workTime == null ? "" : (dayjs(item.record.workTime).format('YYYY-MM-DD'))
|
|
},
|
|
},
|
|
},
|
|
},
|
|
- {title: '日志类型', dataIndex: 'logTypeName', key: 'logTypeName', align: "center"},
|
|
|
|
- {title: '工作情况', dataIndex: 'workContent', key: 'workContent', align: "center"},
|
|
|
|
|
|
+ {title: '备忘类型', dataIndex: 'logTypeName', key: 'logTypeName', align: "center"},
|
|
|
|
+ {title: '工作备忘情况', dataIndex: 'workContent', key: 'workContent', align: "center"},
|
|
{title: '所属驿站', dataIndex: 'siteName', key: 'siteName', align: "center"},
|
|
{title: '所属驿站', dataIndex: 'siteName', key: 'siteName', align: "center"},
|
|
{title: '所属县区', dataIndex: 'regionName', key: 'regionName', align: "center"},
|
|
{title: '所属县区', dataIndex: 'regionName', key: 'regionName', align: "center"},
|
|
{title: '所属街道', dataIndex: 'streetName', key: 'streetName', align: "center", isDefaultClose: true},
|
|
{title: '所属街道', dataIndex: 'streetName', key: 'streetName', align: "center", isDefaultClose: true},
|