diff --git a/.env.development b/.env.development index 764306d..beee2bd 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_APP_ENV = 'development' # 开发环境 # 李陈杰 209 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 # VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 罗成 diff --git a/src/views/design/billofQuantities/indexEdit3.vue b/src/views/design/billofQuantities/indexEdit3.vue index 2e5eacd..094df79 100644 --- a/src/views/design/billofQuantities/indexEdit3.vue +++ b/src/views/design/billofQuantities/indexEdit3.vue @@ -113,7 +113,7 @@ const approvalRecordRef = ref>(); //按钮组件 const flowCodeOptions = [ { - value: currentProject.value?.id + '_materialsPlans', + value: currentProject.value?.id + '_equipmentList', label: '物资设备清单审核' } ]; diff --git a/src/views/progress/plan/component/createDailyRate.vue b/src/views/progress/plan/component/createDailyRate.vue index 6546c08..bbbd05d 100644 --- a/src/views/progress/plan/component/createDailyRate.vue +++ b/src/views/progress/plan/component/createDailyRate.vue @@ -161,7 +161,7 @@ :total="detailTotalWork" v-model:page="detailQueryParamsWork.pageNum" v-model:limit="detailQueryParamsWork.pageSize" - @pagination="getPvModuleList" + @pagination="getDailyBookList" layout="total, sizes, prev, pager, next" :isSmall="5" /> @@ -436,10 +436,10 @@ const handleView = (row: any, obj: any) => { // 获取已填日报 const getDailyBookList = (doneTime: string) => { - detialWordList.value = []; + // detialWordList.value = []; getDailyBook({ id: formDetail.value.id, - ...detailQueryParams.value + ...detailQueryParamsWork.value }).then((res: any) => { if (res.code === 200) { detialWordList.value = res.rows || [];