diff --git a/src/api/oa/erp/contractOrder/index.ts b/src/api/oa/erp/contractOrder/index.ts index 87ec5ae..6470fe0 100644 --- a/src/api/oa/erp/contractOrder/index.ts +++ b/src/api/oa/erp/contractOrder/index.ts @@ -1,6 +1,19 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ProjectInfoVO, ProjectInfoForm } from '@/api/oa/erp/projectInfo/types'; +import { ProjectInfoVO, ProjectInfoForm, ProjectInfoQuery } from '@/api/oa/erp/projectInfo/types'; + +/** + * 查询合同订单列表 + * @param query + * @returns {*} + */ +export const listContractOrder = (query?: ProjectInfoQuery): AxiosPromise => { + return request({ + url: '/oa/erp/contractOrder/list', + method: 'get', + params: query + }); +}; /** * 暂存合同订单(项目信息) diff --git a/src/api/oa/erp/projectInfo/types.ts b/src/api/oa/erp/projectInfo/types.ts index d926a4c..a0a600b 100644 --- a/src/api/oa/erp/projectInfo/types.ts +++ b/src/api/oa/erp/projectInfo/types.ts @@ -116,6 +116,16 @@ export interface ProjectInfoVO { chargeName?: string; deputyName?: string; + + /** + * 合同编号 + */ + contractCode?: string; + + /** + * 合同名称 + */ + contractName?: string; } export interface ProjectInfoForm extends BaseEntity { diff --git a/src/views/oa/erp/contractInfo/contractOrderIndex.vue b/src/views/oa/erp/contractInfo/contractOrderIndex.vue new file mode 100644 index 0000000..1c2c43f --- /dev/null +++ b/src/views/oa/erp/contractInfo/contractOrderIndex.vue @@ -0,0 +1,379 @@ + + + diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue index b8d2780..703749d 100644 --- a/src/views/oa/erp/contractInfo/index.vue +++ b/src/views/oa/erp/contractInfo/index.vue @@ -309,7 +309,7 @@ const columns = ref([ { key: 3, label: `合同编号`, visible: true }, { key: 4, label: `合同名称`, visible: true }, { key: 5, label: `合同大类`, visible: true }, - { key: 6, label: `合同类型`, visible: true }, + { key: 6, label: `合同类型`, visible: false }, { key: 7, label: `业务方向`, visible: true }, { key: 8, label: `部门`, visible: true }, { key: 9, label: `合同签订日期`, visible: true }, diff --git a/src/views/oa/erp/contractInfo/orderActivate.vue b/src/views/oa/erp/contractInfo/orderActivate.vue index cff4a2b..ef2e7b5 100644 --- a/src/views/oa/erp/contractInfo/orderActivate.vue +++ b/src/views/oa/erp/contractInfo/orderActivate.vue @@ -17,13 +17,13 @@ - - + + - - + + @@ -33,13 +33,13 @@ - - - - - - - + + + + + + + @@ -48,12 +48,12 @@ - + @@ -151,7 +151,7 @@ 回款阶段 - + 添加阶段 @@ -161,7 +161,7 @@ @@ -174,7 +174,7 @@ value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" - :disabled="!isFormDisabled" + :disabled="isFormDisabled" /> @@ -186,13 +186,13 @@ value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" - :disabled="!isFormDisabled" + :disabled="isFormDisabled" /> @@ -206,7 +206,7 @@ :precision="2" controls-position="right" style="width: 100%" - :disabled="!isFormDisabled" + :disabled="isFormDisabled" /> @@ -218,7 +218,7 @@ - + @@ -230,13 +230,13 @@ value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" - :disabled="!isFormDisabled" + :disabled="isFormDisabled" /> - + @@ -247,26 +247,26 @@ - + - + - + - + @@ -421,10 +421,10 @@ const data = reactive<{ form: ProjectInfoFormEx; rules: any }>({ form: { ...initFormData }, rules: { contractFlag: [{ required: true, message: '有无合同不能为空', trigger: 'change' }], - projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }], + projectName: [{ required: true, message: '订单名称不能为空', trigger: 'blur' }], businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'change' }], - projectCategory: [{ required: true, message: '项目类别不能为空', trigger: 'change' }], - projectTypeId: [{ required: true, message: '项目类型不能为空', trigger: 'change' }], + projectCategory: [{ required: true, message: '订单类别不能为空', trigger: 'change' }], + projectTypeId: [{ required: true, message: '订单类型不能为空', trigger: 'change' }], deptId: [{ required: true, message: '部门不能为空', trigger: 'change' }], managerId: [{ required: true, message: '项目经理不能为空', trigger: 'change' }], ossId: [{ required: true, message: '请上传终版合同', trigger: 'change' }] diff --git a/src/views/oa/erp/projectInfo/index.vue b/src/views/oa/erp/projectInfo/index.vue index 143bcf3..f0e7b90 100644 --- a/src/views/oa/erp/projectInfo/index.vue +++ b/src/views/oa/erp/projectInfo/index.vue @@ -298,9 +298,6 @@ const getEditPathByCategory = (projectCategory?: string) => { } else if (projectCategory === '4') { // 预投项目 return '/project/projectInfo/preEdit'; - } else if (projectCategory === '5') { - // 合同订单 - return '/contract/contractInfo/orderActivate'; } else { // 其他项目(销售项目等) return '/project/projectInfo/edit';