diff --git a/.env.development b/.env.development index fe20df3..8aa5e08 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.159:8898' +VITE_APP_BASE_API = 'http://192.168.110.119:8898' # 无人机接口地址 diff --git a/src/api/materials/batchPlan/index.ts b/src/api/materials/batchPlan/index.ts new file mode 100644 index 0000000..20f8970 --- /dev/null +++ b/src/api/materials/batchPlan/index.ts @@ -0,0 +1,99 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types'; + +/** + * 查询物资-材料设备列表 + * @param query + * @returns {*} + */ + +export const listCailiaoshebei = (query?: any): AxiosPromise => { + return request({ + url: '/cailiaoshebei/materialbatchdemandplan/list', + method: 'get', + params: query + }); +}; + +/** + * 查询物资-材料设备详细 + * @param id + */ +export const getCailiaoshebei = (id: string | number): AxiosPromise => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/' + id, + method: 'get' + }); +}; + +/** + * 新增物资-材料设备 + * @param data + */ +export const addCailiaoshebei = (data: CailiaoshebeiForm) => { + return request({ + url: '/cailiaoshebei/materialbatchdemandplan', + method: 'post', + data: data + }); +}; + +/** + * 修改物资-材料设备 + * @param data + */ +export const updateCailiaoshebei = (data: CailiaoshebeiForm) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei', + method: 'put', + data: data + }); +}; + +/** + * 删除物资-材料设备 + * @param id + */ +export const delCailiaoshebei = (id: string | number | Array) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/remove/' + id, + method: 'delete' + }); +}; + +/** + * 查询物资-材料设备批次列表 + * @param query + * @returns {*} + */ +export const listBatch = (query?: any): AxiosPromise => { + return request({ + url: '/cailiaoshebei/materialbatchdemandplan/pcList', + method: 'get', + params: query + }); +}; + +/** + * 新增物资-材料设备批次 + * @param data + */ +export const getBatch = (data: any) => { + return request({ + url: '/cailiaoshebei/materialbatchdemandplan/pcAdd', + method: 'post', + data: data + }); +}; + +/** + * 删除物资-材料设备批次 + * @param ids + */ +export const delBatch = (ids: string | number | Array) => { + return request({ + url: '/cailiaoshebei/materialbatchdemandplan/' + ids, + method: 'delete' + }); +}; diff --git a/src/api/materials/batchPlan/types.ts b/src/api/materials/batchPlan/types.ts new file mode 100644 index 0000000..a60ab66 --- /dev/null +++ b/src/api/materials/batchPlan/types.ts @@ -0,0 +1,229 @@ +export interface CailiaoshebeiVO { + /** + * 主键ID + */ + id: string | number; + + /** + * 批次ID + */ + batchId: string | number; + + /** + * 供货商ID + */ + supplierId: string | number; + + /** + * 供货商 + */ + supplier: string; + + /** + * 设备材料名称 + */ + name: string; + + /** + * 供货来源(字典) + */ + supply: string; + + /** + * 规格型号 + */ + specification: string; + + /** + * 特征描述 + */ + signalment: string; + + /** + * 物料编码 + */ + materialCode: string; + + /** + * 计划到场时间 + */ + arrivalTime: string; + + /** + * 计划完成时间 + */ + finishTime: string; + + /** + * 计量单位 + */ + unit: string; + + /** + * 计划数量 + */ + plan: number; + + /** + * 实际数量 + */ + realQuantity: number; + + /** + * 备注 + */ + remark: string; +} + +export interface CailiaoshebeiForm extends BaseEntity { + /** + * 主键ID + */ + id?: string | number; + projectId?: string | number; + batchNumber?: string | number; + addDataList?: any[]; + approvalProject?: string; + /** + * 批次ID + */ + batchId?: string | number; + + /** + * 供货商ID + */ + supplierId?: string | number; + + /** + * 供货商 + */ + supplier?: string; + + /** + * 设备材料名称 + */ + name?: string; + + /** + * 供货来源(字典) + */ + supply?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 特征描述 + */ + signalment?: string; + + /** + * 物料编码 + */ + materialCode?: string; + + /** + * 计划到场时间 + */ + arrivalTime?: string; + + /** + * 计划完成时间 + */ + finishTime?: string; + + /** + * 计量单位 + */ + unit?: string; + + /** + * 计划数量 + */ + plan?: number; + + /** + * 实际数量 + */ + realQuantity?: number; + + /** + * 备注 + */ + remark?: string; +} + +export interface CailiaoshebeiQuery extends PageQuery { + /** + * 批次ID + */ + batchId?: string | number; + projectId?: string | number; + batchNumber?: string; + /** + * 供货商ID + */ + supplierId?: string | number; + + /** + * 供货商 + */ + supplier?: string; + + /** + * 设备材料名称 + */ + name?: string; + + /** + * 供货来源(字典) + */ + supply?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 特征描述 + */ + signalment?: string; + + /** + * 物料编码 + */ + materialCode?: string; + + /** + * 计划到场时间 + */ + arrivalTime?: string; + + /** + * 计划完成时间 + */ + finishTime?: string; + + /** + * 计量单位 + */ + unit?: string; + + /** + * 计划数量 + */ + plan?: number; + + /** + * 实际数量 + */ + realQuantity?: number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/materials/cailiaoshebei/index.ts b/src/api/materials/cailiaoshebei/index.ts index 50c303c..38b924b 100644 --- a/src/api/materials/cailiaoshebei/index.ts +++ b/src/api/materials/cailiaoshebei/index.ts @@ -86,3 +86,14 @@ export const getBatch = (data: any) => { data: data }); }; + +/** + * 删除物资-材料设备批次 + * @param ids + */ +export const delBatch = (ids: string | number | Array) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/pcDelete/' + ids, + method: 'delete' + }); +}; diff --git a/src/api/materials/cailiaoshebei/types.ts b/src/api/materials/cailiaoshebei/types.ts index d3be5f9..df7b40b 100644 --- a/src/api/materials/cailiaoshebei/types.ts +++ b/src/api/materials/cailiaoshebei/types.ts @@ -82,7 +82,7 @@ export interface CailiaoshebeiForm extends BaseEntity { id?: string | number; projectId?: string | number; batchNumber?: string | number; - + approvalDesign?: string; /** * 批次ID */ diff --git a/src/api/materials/orderEquipment/index.ts b/src/api/materials/orderEquipment/index.ts new file mode 100644 index 0000000..434f40a --- /dev/null +++ b/src/api/materials/orderEquipment/index.ts @@ -0,0 +1,99 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types'; + +/** + * 查询物资-材料设备列表 + * @param query + * @returns {*} + */ + +export const listCailiaoshebei = (query?: any): AxiosPromise => { + return request({ + url: '/cailiaoshebei/materialsorder/list', + method: 'get', + params: query + }); +}; + +/** + * 查询物资-材料设备详细 + * @param id + */ +export const getCailiaoshebei = (id: string | number): AxiosPromise => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/' + id, + method: 'get' + }); +}; + +/** + * 新增物资-材料设备 + * @param data + */ +export const addCailiaoshebei = (data: CailiaoshebeiForm) => { + return request({ + url: '/cailiaoshebei/materialsorder/modifyTheOrderForm', + method: 'put', + data: data + }); +}; + +/** + * 修改物资-材料设备 + * @param data + */ +export const updateCailiaoshebei = (data: CailiaoshebeiForm) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei', + method: 'put', + data: data + }); +}; + +/** + * 删除物资-材料设备 + * @param id + */ +export const delCailiaoshebei = (id: string | number | Array) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/remove/' + id, + method: 'delete' + }); +}; + +/** + * 查询物资-材料设备批次列表 + * @param query + * @returns {*} + */ +export const listBatch = (query?: any): AxiosPromise => { + return request({ + url: '/cailiaoshebei/materialsorder/pcPlanList', + method: 'get', + params: query + }); +}; + +/** + * 新增物资-材料设备批次 + * @param data + */ +export const getBatch = (data: any) => { + return request({ + url: '/cailiaoshebei/materialbatchdemandplan/pcAdd', + method: 'post', + data: data + }); +}; + +/** + * 删除物资-材料设备批次 + * @param ids + */ +export const delBatch = (ids: string | number | Array) => { + return request({ + url: '/cailiaoshebei/materialbatchdemandplan/' + ids, + method: 'delete' + }); +}; diff --git a/src/api/materials/orderEquipment/types.ts b/src/api/materials/orderEquipment/types.ts new file mode 100644 index 0000000..50503f7 --- /dev/null +++ b/src/api/materials/orderEquipment/types.ts @@ -0,0 +1,229 @@ +export interface CailiaoshebeiVO { + /** + * 主键ID + */ + id: string | number; + + /** + * 批次ID + */ + batchId: string | number; + + /** + * 供货商ID + */ + supplierId: string | number; + + /** + * 供货商 + */ + supplier: string; + + /** + * 设备材料名称 + */ + name: string; + + /** + * 供货来源(字典) + */ + supply: string; + + /** + * 规格型号 + */ + specification: string; + + /** + * 特征描述 + */ + signalment: string; + + /** + * 物料编码 + */ + materialCode: string; + + /** + * 计划到场时间 + */ + arrivalTime: string; + + /** + * 计划完成时间 + */ + finishTime: string; + + /** + * 计量单位 + */ + unit: string; + + /** + * 计划数量 + */ + plan: number; + + /** + * 实际数量 + */ + realQuantity: number; + + /** + * 备注 + */ + remark: string; +} + +export interface CailiaoshebeiForm extends BaseEntity { + /** + * 主键ID + */ + id?: string | number; + projectId?: string | number; + batchNumber?: string | number; + addDataList?: any[]; + + /** + * 批次ID + */ + batchId?: string | number; + + /** + * 供货商ID + */ + supplierId?: string | number; + + /** + * 供货商 + */ + supplier?: string; + + /** + * 设备材料名称 + */ + name?: string; + + /** + * 供货来源(字典) + */ + supply?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 特征描述 + */ + signalment?: string; + + /** + * 物料编码 + */ + materialCode?: string; + + /** + * 计划到场时间 + */ + arrivalTime?: string; + + /** + * 计划完成时间 + */ + finishTime?: string; + + /** + * 计量单位 + */ + unit?: string; + + /** + * 计划数量 + */ + plan?: number; + + /** + * 实际数量 + */ + realQuantity?: number; + + /** + * 备注 + */ + remark?: string; +} + +export interface CailiaoshebeiQuery extends PageQuery { + /** + * 批次ID + */ + batchId?: string | number; + projectId?: string | number; + batchNumber?: string; + /** + * 供货商ID + */ + supplierId?: string | number; + + /** + * 供货商 + */ + supplier?: string; + + /** + * 设备材料名称 + */ + name?: string; + + /** + * 供货来源(字典) + */ + supply?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 特征描述 + */ + signalment?: string; + + /** + * 物料编码 + */ + materialCode?: string; + + /** + * 计划到场时间 + */ + arrivalTime?: string; + + /** + * 计划完成时间 + */ + finishTime?: string; + + /** + * 计量单位 + */ + unit?: string; + + /** + * 计划数量 + */ + plan?: number; + + /** + * 实际数量 + */ + realQuantity?: number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/materials/orderMaterials/index.ts b/src/api/materials/orderMaterials/index.ts new file mode 100644 index 0000000..c09c953 --- /dev/null +++ b/src/api/materials/orderMaterials/index.ts @@ -0,0 +1,99 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types'; + +/** + * 查询物资-材料设备列表 + * @param query + * @returns {*} + */ + +export const listCailiaoshebei = (query?: CailiaoshebeiQuery): AxiosPromise => { + return request({ + url: '/cailiaoshebei/materialsorder/planExecutionTrackingList', + method: 'get', + params: query + }); +}; + +/** + * 查询物资-材料设备详细 + * @param id + */ +export const getCailiaoshebei = (id: string | number): AxiosPromise => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/' + id, + method: 'get' + }); +}; + +/** + * 新增物资-材料设备 + * @param data + */ +export const addCailiaoshebei = (data: CailiaoshebeiForm) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei', + method: 'post', + data: data + }); +}; + +/** + * 修改物资-材料设备 + * @param data + */ +export const updateCailiaoshebei = (data: CailiaoshebeiForm) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei', + method: 'put', + data: data + }); +}; + +/** + * 删除物资-材料设备 + * @param id + */ +export const delCailiaoshebei = (id: string | number | Array) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/remove/' + id, + method: 'delete' + }); +}; + +/** + * 查询物资-材料设备批次列表 + * @param query + * @returns {*} + */ +export const listBatch = (query?: any): AxiosPromise => { + return request({ + url: '/cailiaoshebei/materialsorder/trackPcPlanList', + method: 'get', + params: query + }); +}; + +/** + * 新增物资-材料设备批次 + * @param data + */ +export const getBatch = (data: any) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/pcAdd', + method: 'post', + data: data + }); +}; + +/** + * 删除物资-材料设备批次 + * @param ids + */ +export const delBatch = (ids: string | number | Array) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/pcDelete/' + ids, + method: 'delete' + }); +}; diff --git a/src/api/materials/suppliesprice/index.ts b/src/api/materials/suppliesprice/index.ts new file mode 100644 index 0000000..87d4264 --- /dev/null +++ b/src/api/materials/suppliesprice/index.ts @@ -0,0 +1,99 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types'; + +/** + * 查询物资-材料设备列表 + * @param query + * @returns {*} + */ + +export const listCailiaoshebei = (query?: CailiaoshebeiQuery): AxiosPromise => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/listPlan', + method: 'get', + params: query + }); +}; + +/** + * 查询物资-材料设备详细 + * @param id + */ +export const getCailiaoshebei = (id: string | number): AxiosPromise => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/getInfoPlanSon/' + id, + method: 'get' + }); +}; + +/** + * 新增物资-材料设备 + * @param data + */ +export const addCailiaoshebei = (data: CailiaoshebeiForm) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei', + method: 'post', + data: data + }); +}; + +/** + * 修改物资-材料设备 + * @param data + */ +export const updateCailiaoshebei = (data: CailiaoshebeiForm) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/editPlanSon', + method: 'put', + data: data + }); +}; + +/** + * 删除物资-材料设备 + * @param id + */ +export const delCailiaoshebei = (id: string | number | Array) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/remove/' + id, + method: 'delete' + }); +}; + +/** + * 查询物资-材料设备批次列表 + * @param query + * @returns {*} + */ +export const listBatch = (query?: any): AxiosPromise => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/pcPlanList', + method: 'get', + params: query + }); +}; + +/** + * 新增物资-材料设备批次 + * @param data + */ +export const getBatch = (data: any) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/pcAdd', + method: 'post', + data: data + }); +}; + +/** + * 删除物资-材料设备批次 + * @param ids + */ +export const delBatch = (ids: string | number | Array) => { + return request({ + url: '/cailiaoshebei/cailiaoshebei/pcDelete/' + ids, + method: 'delete' + }); +}; diff --git a/src/api/materials/suppliesprice/types.ts b/src/api/materials/suppliesprice/types.ts new file mode 100644 index 0000000..d3be5f9 --- /dev/null +++ b/src/api/materials/suppliesprice/types.ts @@ -0,0 +1,228 @@ +export interface CailiaoshebeiVO { + /** + * 主键ID + */ + id: string | number; + + /** + * 批次ID + */ + batchId: string | number; + + /** + * 供货商ID + */ + supplierId: string | number; + + /** + * 供货商 + */ + supplier: string; + + /** + * 设备材料名称 + */ + name: string; + + /** + * 供货来源(字典) + */ + supply: string; + + /** + * 规格型号 + */ + specification: string; + + /** + * 特征描述 + */ + signalment: string; + + /** + * 物料编码 + */ + materialCode: string; + + /** + * 计划到场时间 + */ + arrivalTime: string; + + /** + * 计划完成时间 + */ + finishTime: string; + + /** + * 计量单位 + */ + unit: string; + + /** + * 计划数量 + */ + plan: number; + + /** + * 实际数量 + */ + realQuantity: number; + + /** + * 备注 + */ + remark: string; +} + +export interface CailiaoshebeiForm extends BaseEntity { + /** + * 主键ID + */ + id?: string | number; + projectId?: string | number; + batchNumber?: string | number; + + /** + * 批次ID + */ + batchId?: string | number; + + /** + * 供货商ID + */ + supplierId?: string | number; + + /** + * 供货商 + */ + supplier?: string; + + /** + * 设备材料名称 + */ + name?: string; + + /** + * 供货来源(字典) + */ + supply?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 特征描述 + */ + signalment?: string; + + /** + * 物料编码 + */ + materialCode?: string; + + /** + * 计划到场时间 + */ + arrivalTime?: string; + + /** + * 计划完成时间 + */ + finishTime?: string; + + /** + * 计量单位 + */ + unit?: string; + + /** + * 计划数量 + */ + plan?: number; + + /** + * 实际数量 + */ + realQuantity?: number; + + /** + * 备注 + */ + remark?: string; +} + +export interface CailiaoshebeiQuery extends PageQuery { + /** + * 批次ID + */ + batchId?: string | number; + projectId?: string | number; + batchNumber?: string; + /** + * 供货商ID + */ + supplierId?: string | number; + + /** + * 供货商 + */ + supplier?: string; + + /** + * 设备材料名称 + */ + name?: string; + + /** + * 供货来源(字典) + */ + supply?: string; + + /** + * 规格型号 + */ + specification?: string; + + /** + * 特征描述 + */ + signalment?: string; + + /** + * 物料编码 + */ + materialCode?: string; + + /** + * 计划到场时间 + */ + arrivalTime?: string; + + /** + * 计划完成时间 + */ + finishTime?: string; + + /** + * 计量单位 + */ + unit?: string; + + /** + * 计划数量 + */ + plan?: number; + + /** + * 实际数量 + */ + realQuantity?: number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/out/monthPlan/index.ts b/src/api/out/monthPlan/index.ts index 2efc0c9..b902124 100644 --- a/src/api/out/monthPlan/index.ts +++ b/src/api/out/monthPlan/index.ts @@ -74,3 +74,27 @@ export const getMonth = (query: any): AxiosPromise => { params: query }); }; + +/** + * 检查月度产值计划是否提交 + * @param id + * @returns {*} + */ +export const isSubmit = (id): AxiosPromise => { + return request({ + url: '/out/monthPlan/isSubmit/' + id, + method: 'get' + }); +}; + +/** + * 查询月度产值计划详细(审批) + * @param id + */ +export const getMonthInfo = (query): AxiosPromise => { + return request({ + url: '/out/monthPlan/monthInfo', + method: 'get', + params: query + }); +}; diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts index fd8a7e4..254e520 100644 --- a/src/api/workflow/workflowCommon/index.ts +++ b/src/api/workflow/workflowCommon/index.ts @@ -9,7 +9,9 @@ export default { path: routerJumpVo.formPath ? '/' + routerJumpVo.formPath : routerJumpVo.formPath, query: { id: routerJumpVo.businessId, + businessId: routerJumpVo.businessId, type: routerJumpVo.type, + planMonth: routerJumpVo.planMonth, taskId: routerJumpVo.taskId } }); diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue index 01db986..f7e0e97 100644 --- a/src/components/Process/approvalRecord.vue +++ b/src/components/Process/approvalRecord.vue @@ -83,6 +83,8 @@ const init = async (businessId: string | number) => { loading.value = true; tabActiveName.value = 'image'; historyList.value = []; + console.log('🚀 ~ init ~ businessId:', businessId); + flowHisTaskList(businessId).then((resp) => { if (resp.data) { historyList.value = resp.data.list; diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue new file mode 100644 index 0000000..9e7e7c6 --- /dev/null +++ b/src/views/materials/batchPlan/index.vue @@ -0,0 +1,396 @@ + + + diff --git a/src/views/materials/batchPlan/indexEdit.vue b/src/views/materials/batchPlan/indexEdit.vue new file mode 100644 index 0000000..e87fbf8 --- /dev/null +++ b/src/views/materials/batchPlan/indexEdit.vue @@ -0,0 +1,401 @@ + + + + diff --git a/src/views/materials/cailiaoshebei/index.vue b/src/views/materials/cailiaoshebei/index.vue index dfacbad..84266c1 100644 --- a/src/views/materials/cailiaoshebei/index.vue +++ b/src/views/materials/cailiaoshebei/index.vue @@ -53,14 +53,16 @@ --> - + @@ -82,10 +84,11 @@ v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getBatchList" + layout="prev, pager, next,jumper" /> - + - + + + + @@ -97,6 +99,7 @@ import { listMonthPlan, getMonthPlan, delMonthPlan, addMonthPlan, updateMonthPla import { MonthPlanVO, MonthPlanQuery, MonthPlanForm } from '@/api/out/monthPlan/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { out_value_type } = toRefs(proxy?.useDict('out_value_type')); +const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status')); import { useUserStoreHook } from '@/store/modules/user'; // 获取用户 store @@ -265,6 +268,14 @@ onMounted(() => { getList(); }); +/** 审核按钮操作 */ +const handleAudit = async (row?: MonthPlanVO) => { + proxy?.$tab.openPage('/out/designCompletion/indexEdit', '审核设计完工产值', { + id: row?.id, + type: 'update' + }); +}; + //监听项目id刷新数据 // const listeningProject = watch( // () => currentProject.value.id, diff --git a/src/views/out/designCompletion/indexEdit.vue b/src/views/out/designCompletion/indexEdit.vue new file mode 100644 index 0000000..5a14d76 --- /dev/null +++ b/src/views/out/designCompletion/indexEdit.vue @@ -0,0 +1,356 @@ + + + + diff --git a/src/views/out/monthPlan/index.vue b/src/views/out/monthPlan/index.vue index 093c2d3..88a00d5 100644 --- a/src/views/out/monthPlan/index.vue +++ b/src/views/out/monthPlan/index.vue @@ -58,14 +58,16 @@ - + + + + @@ -102,6 +104,7 @@ import { listMonthPlan, getMonthPlan, delMonthPlan, addMonthPlan, updateMonthPla import { MonthPlanVO, MonthPlanQuery, MonthPlanForm } from '@/api/out/monthPlan/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { out_value_type } = toRefs(proxy?.useDict('out_value_type')); +const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status')); import { useUserStoreHook } from '@/store/modules/user'; // 获取用户 store @@ -221,6 +224,7 @@ const handleUpdate = async (row?: MonthPlanVO) => { /** 提交按钮 */ const submitForm = () => { + form.value.projectId = currentProject.value.id; monthPlanFormRef.value?.validate(async (valid: boolean) => { if (valid) { buttonLoading.value = true; @@ -245,6 +249,14 @@ const handleDelete = async (row?: MonthPlanVO) => { await getList(); }; +/** 审核按钮操作 */ +const handleAudit = async (row?: MonthPlanVO) => { + proxy?.$tab.openPage('/out/monthPlan/indexEdit', '审核月度产值计划', { + planMonth: row?.planMonth, + type: 'update' + }); +}; + /** 导出按钮操作 */ const handleExport = () => { proxy?.download( diff --git a/src/views/out/monthPlan/indexEdit.vue b/src/views/out/monthPlan/indexEdit.vue new file mode 100644 index 0000000..54a9b73 --- /dev/null +++ b/src/views/out/monthPlan/indexEdit.vue @@ -0,0 +1,368 @@ + + + + diff --git a/src/views/workflows/task/taskWaiting.vue b/src/views/workflows/task/taskWaiting.vue index d4225c5..02aac32 100644 --- a/src/views/workflows/task/taskWaiting.vue +++ b/src/views/workflows/task/taskWaiting.vue @@ -160,6 +160,7 @@ const handleOpen = async (row: FlowTaskVO) => { taskId: row.id, type: 'approval', formCustom: row.formCustom, + planMonth: row.businessId.split('_')[1], formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy);