diff --git a/.env.development b/.env.development index 99ac997..fa440a2 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ NODE_ENV = 'development' -VITE_APP_BASE_URL = 'http://192.168.1.29:8000' +VITE_APP_BASE_URL = '' # # VITE_APP_BASE_URL = 'https://ceshi-worker-task.lihaink.cn' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..e1c1120 Binary files /dev/null and b/dist.zip differ diff --git a/src/api/newTask.ts b/src/api/newTask.ts new file mode 100644 index 0000000..6436a23 --- /dev/null +++ b/src/api/newTask.ts @@ -0,0 +1,15 @@ +import request from '@/utils/request' + +//添加任务 +export function addTask(params: any) { + return request.post({ url: '/task/addTask', params }) +} +//任务列表 +export function taskList(params: any) { + return request.get({ url: '/task/taskList', params }) +} + +//任务列表 +export function editTask(params: any) { + return request.post({ url: '/task/editTask', params }) +} \ No newline at end of file diff --git a/src/api/user_information_threshold.ts b/src/api/user_information_threshold.ts new file mode 100644 index 0000000..86971c8 --- /dev/null +++ b/src/api/user_information_threshold.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 村或社区人员建档目标数列表 +export function apiUserInformationThresholdLists(params: any) { + return request.get({ url: '/user_information_threshold/lists', params }) +} + +// 添加村或社区人员建档目标数 +export function apiUserInformationThresholdAdd(params: any) { + return request.post({ url: '/user_information_threshold/add', params }) +} + +// 编辑村或社区人员建档目标数 +export function apiUserInformationThresholdEdit(params: any) { + return request.post({ url: '/user_information_threshold/edit', params }) +} + +// 删除村或社区人员建档目标数 +export function apiUserInformationThresholdDelete(params: any) { + return request.post({ url: '/user_information_threshold/delete', params }) +} + +// 村或社区人员建档目标数详情 +export function apiUserInformationThresholdDetail(params: any) { + return request.get({ url: '/user_information_threshold/detail', params }) +} \ No newline at end of file diff --git a/src/views/consumer/lists/detail.vue b/src/views/consumer/lists/detail.vue index 4d6e639..b9a4bd9 100644 --- a/src/views/consumer/lists/detail.vue +++ b/src/views/consumer/lists/detail.vue @@ -1,22 +1,15 @@ @@ -467,7 +311,10 @@ import { apiCityList, apiAreaList, apiStreetList, + apiVillageList, apiProvinceList, + apiBrigadeList + } from "@/api/common"; import { dictDataLists } from "@/api/setting/dict"; import DialogIndex from "@/components/dialog_index.vue"; @@ -487,16 +334,26 @@ const formData = reactive({ sex: "", id_card: "", nickname: "", + group_id: "", + company_id: 0, + user_information_count: "", + company_name: "", + deposit_date: "", + deposit: "", province: "", city: "", area: "", street: "", + village: "", + brigade: "", + province_name: "", + city_name: "", + area_name: "", + street_name: "", + village_name: "", + brigade_name: "", address: "", account: "", - is_contract: 0, - // 签约方 - party_b_name: "", - party_b: "", qualification: { id_card: "", id_card_b: "", @@ -505,14 +362,8 @@ const formData = reactive({ bank_account: "", bank_account_b: "", }, - // 合同类型 - contract_type: "", - file: "", avatar: "", multipoint_login: 1, - contract: { - url: "", - }, }); const disabledPartyA = ref(false); @@ -526,8 +377,10 @@ const datas: any = reactive({ cityOptions: [], areaOptions: [], streetOptions: [], + villageOptions:[], dictTypeLists: [], contract_type: [], + brigadeOptions:[], contract: [], }); @@ -562,6 +415,7 @@ const getDetails = async () => { formData[key] = data[key]; }); mode.value = route.query.mode; + formData.brigade=Number(formData.brigade) formData.contract_type = data.contract?.contract_type; formData.party_b_name = data.contract?.party_b_name; @@ -576,6 +430,10 @@ const getDetails = async () => { await getCityList(); await getAreaList(); await getStreetList(); + await getVillageList() + await getBrigadeList() + + }; const handleEdit = async (value: string, field: string) => { @@ -692,6 +550,11 @@ function area_change(value: string) { function street_change(value: string) { formData.street = value; } +function brigadeChange(value: string) { + // getVillageList() + formData.brigade = value; + console.log(value) +} const getProvinceList = async () => { const data = await apiProvinceList({}); datas["provinceOptions"] = data; @@ -708,6 +571,18 @@ const getStreetList = async () => { const data = await apiStreetList({ street: formData.area }); datas["streetOptions"] = data; }; +const getVillageList = async () => { + const data = await apiVillageList({ village: formData.street }); + datas["villageOptions"] = data; + + // datas["streetOptions"] = data; +}; +const getBrigadeList = async () => { + const data = await apiBrigadeList({ brigade: formData.village }); + datas["brigadeOptions"] = data; + + // datas["streetOptions"] = data; +}; const handleAdjust = (value: string) => { adjustState.show = true; adjustState.value = value; diff --git a/src/views/consumer/lists/edit.vue b/src/views/consumer/lists/edit.vue index 4dff0db..520aa4b 100644 --- a/src/views/consumer/lists/edit.vue +++ b/src/views/consumer/lists/edit.vue @@ -4,23 +4,12 @@ - +
基本信息创建
- + @@ -29,7 +18,7 @@
- + + - + - + + + + + + + + + - - + + - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - + + + - - + + + + - - + + + + + @@ -212,39 +221,19 @@
资质信息
- - - + + + - - + + @@ -252,41 +241,21 @@
- - - + + + - - + + @@ -296,39 +265,18 @@
- - + + - - + + @@ -340,16 +288,12 @@ - +
- - + diff --git a/src/views/user_information_threshold/edit.vue b/src/views/user_information_threshold/edit.vue new file mode 100644 index 0000000..9151815 --- /dev/null +++ b/src/views/user_information_threshold/edit.vue @@ -0,0 +1,109 @@ + + + diff --git a/src/views/user_information_threshold/index.vue b/src/views/user_information_threshold/index.vue new file mode 100644 index 0000000..898512d --- /dev/null +++ b/src/views/user_information_threshold/index.vue @@ -0,0 +1,129 @@ + + + + diff --git a/vite.config.ts b/vite.config.ts index c88173c..f6adf5f 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -14,7 +14,7 @@ import vueSetupExtend from 'vite-plugin-vue-setup-extend' export default defineConfig({ base: '/admin/', server: { - host: '0.0.0.0' + host: '0.0.0.0', }, plugins: [ vue(),