diff --git a/src/views/home/dialog/detailWork.vue b/src/views/home/dialog/detailWork.vue index e1a2972..aa59950 100644 --- a/src/views/home/dialog/detailWork.vue +++ b/src/views/home/dialog/detailWork.vue @@ -376,6 +376,7 @@ watch( form.value = props.form; form.value.time = [form.value.startTime, form.value.endTime]; getCheckDangers(form.value.workId || uuid.value) + getCompanyList(form.value.workId); } } ); @@ -383,7 +384,7 @@ watch( () => props.readonly, (val) => { if (val) { - getCompanyList(props.form.workId); + // getCompanyList(props.form.workId); } } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index decfc9e..9c3f874 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -691,7 +691,7 @@ const clickRadio = () => { const getList = () => { workcurrentPage.value = 1; getWkInfoReceive(); - getWkInfoFinishStatistic(); + // getWkInfoFinishStatistic(); }; //工作完成统计 const worktenementRef = ref(); diff --git a/src/views/system/base/service-rating/index.vue b/src/views/system/base/service-rating/index.vue index bac1004..64a6df4 100644 --- a/src/views/system/base/service-rating/index.vue +++ b/src/views/system/base/service-rating/index.vue @@ -70,17 +70,17 @@
+ value-format="YYYY-MM-DD" @change="refresh" />
+ value-format="YYYY-MM-DD" @change="refresh" />
{ form.value = {}; getList(); }; +const refresh = () => { + getWkAllFinishStats(); + getList(); +} //获取列表 const tableDataloading = ref(false); const getList = () => { @@ -266,9 +270,13 @@ const workOptions = ref([]); const getWkAllFinishStats = () => { let params = { userId: userId.value, - endTime: "", - startTime: "", + startTime: search.value.startTime, + endTime: search.value.endTime, + areaCode:'', }; + if (search.value.areaCode) { + params.areaCode = search.value.areaCode[search.value.areaCode.length - 1]; + } wkAllFinishStats(params).then((res: any) => { workOptions.value = res.data; }); diff --git a/src/views/system/log/domicile-log/details.vue b/src/views/system/log/domicile-log/details.vue new file mode 100644 index 0000000..5a70270 --- /dev/null +++ b/src/views/system/log/domicile-log/details.vue @@ -0,0 +1,93 @@ + + + + + \ No newline at end of file diff --git a/src/views/system/log/domicile-log/index.vue b/src/views/system/log/domicile-log/index.vue index 88a9db8..e46e5bc 100644 --- a/src/views/system/log/domicile-log/index.vue +++ b/src/views/system/log/domicile-log/index.vue @@ -72,13 +72,30 @@ 3 ? '删除' : scope.row.operationType == 4 ? '注销' : '恢复' }} - - - + + + + + + + + { + dialogVisible.value = false; + form.value = {}; + getList(); +} + const tableData = ref([]); const currentPage = ref(1); const pageSize = ref(10); @@ -122,6 +149,7 @@ const getList = () => { }; crLogPageList(params).then((res: any) => { tableData.value = res.data.list; + // tableData.value = [{},{}]; total.value = res.data.total; tableDataloading.value = false; });