diff --git a/src/api/service/dailyTaskPackage.js b/src/api/service/dailyTaskPackage.js index b99fcc4..e19d8e1 100644 --- a/src/api/service/dailyTaskPackage.js +++ b/src/api/service/dailyTaskPackage.js @@ -13,7 +13,7 @@ export function getSelectPage(params) { // 自定义分页查询 export function selectPagezdy(params) { return request({ - url: api + 'tbZdxlFgxlrw/selectPagezdy', + url: api + '/tbZdxlFgxlrw/selectPagezdy', method: 'GET', params }) diff --git a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue index 4979c45..2eaa584 100644 --- a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue +++ b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue @@ -21,20 +21,17 @@ - - {{ form?.fgYjjqsl }} + + {{ form?.fgRwbt }} - - {{ form?.fgYjgfsd }} - - - {{ form?.fgJqtjLx }} + + {{ form?.fgRwnr }} {{ form?.rwRq }} - - {{ form?.fgJqtjXsLabel }} + + {{ form?.xlghSjKs }}-{{form?.xlghSjJs}} @@ -56,10 +53,10 @@ v-model="form.xlghXllc"> 公里 - +
追加打卡
diff --git a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue index b7c1a7d..bcca2e4 100644 --- a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue +++ b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue @@ -6,9 +6,9 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue"; import Search from "@/components/aboutTable/Search.vue"; import MyTable from "@/components/aboutTable/MyTable.vue"; import Pages from "@/components/aboutTable/Pages.vue"; -import EditAddFormDialog from "@/views/backOfficeSystem/service/taskPage/dailyTaskPackage/editAddFormDialog.vue"; +import EditAddFormDialog from "./editAddFormDialog.vue"; import Export from "@/components/export/index.vue"; -import { fetchIssueData, selectPagezdy } from "@/api/service/dailyTaskPackage"; +import { fetchIssueData, getSelectPage } from "@/api/service/dailyTaskPackage"; const searchConfiger = reactive([ { @@ -85,10 +85,6 @@ const pageData = reactive({ prop: "xlghXllc", showSolt:true }, - { - label: "下发巡组", - prop: "xfxz", - }, { label: "每个打卡点", prop: "bddListLabel", @@ -129,9 +125,7 @@ const handleIssueAll = () => { const handleIssue = async (ids = []) => { try { await proxy.$confirm("是否进行下发操作", "警告", {type: "warning"}) - const res = await fetchIssueData({ ids: ids?.join(',') }) - if (res) { proxy.$message({type: "success", message: "下发成功" }); handleFilter() @@ -198,7 +192,8 @@ const parseAndJoinLx = (jsonString, type = 'lx') => { const getListData = async (params = {}) => { pageData.tableConfiger.loading = true try { - const res = await selectPagezdy({ + const res = await getSelectPage({ + rwlx:'2', ...pageData.pageConfiger, ...params }) diff --git a/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue b/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue index f119cd1..64bab75 100644 --- a/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue +++ b/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue @@ -208,6 +208,7 @@ const getListData = async (params = {}) => { pageData.tableConfiger.loading = true try { const res = await getSelectPage({ + rwlx:'1', ...pageData.pageConfiger, ...params })