diff --git a/.env.development b/.env.development index 3d7f5d8..9bd05ca 100644 --- a/.env.development +++ b/.env.development @@ -4,4 +4,5 @@ VITE_PASSWORD_SECRET_KEY===ad-distribute= VITE_IMAGE_DOMAIN=https://hccake-img.oss-cn-shanghai.aliyuncs.com # 用来回显图片 # http://39.100.77.21:8001 -VITE_SERVERURL=https://byffp.top \ No newline at end of file +VITE_SERVERURL=https://byffp.top +# VITE_SERVERURL=http://39.100.77.21:8001 \ No newline at end of file diff --git a/package.json b/package.json index 1506b1c..1b293e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { - "name": "ballcat-ui-vue3", - "version": "0.0.0", + "name": "byhl-zt", + "version": "0.0.1", + "description": "线索分发系统", "packageManager": "pnpm@8.2.0", "scripts": { "dev": "vite --host", diff --git a/src/api/geopoliticalCustomers/index.ts b/src/api/geopoliticalCustomers/index.ts index f588f8b..c1120f2 100644 --- a/src/api/geopoliticalCustomers/index.ts +++ b/src/api/geopoliticalCustomers/index.ts @@ -144,9 +144,11 @@ export function selectedReviewerList() { return httpClient.get('/system/user/review/list') } /** - * 分发 - * @param customerDto 提交后分发 + * 撤回-以分发 + * @param */ -// export function updatedistribute(customerDto: CustomerDTO) { -// return httpClient.post>('/custom/auditDistribute', customerDto) -// } +export function customRecallForm(id: number) { + return httpClient.get('/custom/recallForm', { + params: { id } + }) +} diff --git a/src/views/customermanagement/customerList/customerListEditModal.vue b/src/views/customermanagement/customerList/customerListEditModal.vue index 4cc0ee5..932f727 100644 --- a/src/views/customermanagement/customerList/customerListEditModal.vue +++ b/src/views/customermanagement/customerList/customerListEditModal.vue @@ -111,7 +111,6 @@ const stepItemClick = (record: clueStageItem) => { formModel.clueId = resourcesId.value formModel.clueStageName = record.name formModel.clueStageId = record.clueStageId - console.log(formModel, 'formModel') } //标签组列表 @@ -275,13 +274,7 @@ const clueStageCurrentId = ref() defineExpose({ async open(newFormAction: FormAction, record: CustomerListRecord, tabIndex: string) { - // activeKey.value = tabIndex - openModal() resetFields() - // if (newFormAction === FormAction.CREATE) { - // title.value = '新建菜单' - // } else { - title.value = '编辑' resourcesId.value = record.clueId formModel.clueId = record.clueId formModel.customInformation = record.customInformation @@ -290,6 +283,8 @@ defineExpose({ clueStage.length = 0 await doRequest(getResourcesDetail(toRaw(resourcesId.value)), { onSuccess: (res: any) => { + openModal() + title.value = '编辑' const a = res.data.clueStageEntities.map((item: any) => { return { name: item.name, sort: item.sort, clueStageId: item.clueStageId } }) @@ -330,8 +325,8 @@ defineExpose({ // // } // }) // } - console.log(res.data.clueLabelName, 'res.data.clueLabelName') - console.log(formModel.clueLabelList, 'formModel.clueLabelList') + // console.log(res.data.clueLabelName, 'res.data.clueLabelName') + // console.log(formModel.clueLabelList, 'formModel.clueLabelList') // formModel.clueLabelList.length = 0 // formModel.clueLabelList.push(...b) clueStageCurrentId.value = res.data.clueStageId diff --git a/src/views/qualityInspectionDistribution/inspectionIndex.vue b/src/views/qualityInspectionDistribution/inspectionIndex.vue index 87e2c9c..ad06d91 100644 --- a/src/views/qualityInspectionDistribution/inspectionIndex.vue +++ b/src/views/qualityInspectionDistribution/inspectionIndex.vue @@ -25,6 +25,7 @@ @click="handleEditView(record)" >审核 + 撤回 @@ -35,18 +36,19 @@