diff --git a/src/api/sales/GradeSystem/index.ts b/src/api/sales/GradeSystem/index.ts index c15461d..ad72f6e 100644 --- a/src/api/sales/GradeSystem/index.ts +++ b/src/api/sales/GradeSystem/index.ts @@ -15,7 +15,17 @@ enum Api { DataLog = '/sales/gradeSystem/datalog', } - +export async function getLngGradeSystemPageList(params: LngGradeSystemPageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.List, + params, + }, + { + errorMessageMode: mode, + }, + ); +} /** * @description: 查询LngGradeSystem分页列表 */ diff --git a/src/views/sales/Customer/components/createForm.vue b/src/views/sales/Customer/components/createForm.vue index 2daf203..287168a 100644 --- a/src/views/sales/Customer/components/createForm.vue +++ b/src/views/sales/Customer/components/createForm.vue @@ -615,6 +615,19 @@ }) return } + let arr = [] + dataBank.forEach(v => { + if (v.defaultSign == 'Y') { + arr.push(v) + } + }) + if (arr.length > 1 || !arr.length) { + notification.warning({ + message: 'Tip', + description: '默认银行有且仅有一个' + }) + return + } let arrCertificate = JSON.parse(JSON.stringify(dataCertificate)) arrCertificate.forEach(v => { v.dateFrom = v.dateFrom ? dayjs(v.dateFrom ).format('YYYY-MM-DD HH:mm:ss') : ''; diff --git a/src/views/sales/Customer/index.vue b/src/views/sales/Customer/index.vue index 0773d7c..51fa491 100644 --- a/src/views/sales/Customer/index.vue +++ b/src/views/sales/Customer/index.vue @@ -227,7 +227,7 @@ }); } else { router.push({ - path: '/form/Customer/0/createFormCustomer', + path: '/form/Customer/0/createForm', query: { formPath: 'sales/Customer', formName: formName, diff --git a/src/views/sales/ScoreCustomer/components/config.ts b/src/views/sales/ScoreCustomer/components/config.ts index f361419..ff4f1ee 100644 --- a/src/views/sales/ScoreCustomer/components/config.ts +++ b/src/views/sales/ScoreCustomer/components/config.ts @@ -6,31 +6,9 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ - { - field: 'cpCode', - label: '客户', - component: 'Input', - }, - { - field: 'gsId', - label: '评价体系', - component: 'XjrSelect', - componentProps: { - datasourceType: 'api', - apiConfig: { - path: 'CodeGeneration/selection', - method: 'GET', - apiId: '93d735dcb7364a0f8102188ec4d77ac7', - }, - labelField: 'label', - valueField: 'value', - - getPopupContainer: () => document.body, - }, - }, { field: 'dateGrade', - label: '日期选择', + label: '日期', component: 'RangePicker', componentProps: { format: 'YYYY-MM-DD HH:mm:ss', @@ -38,10 +16,9 @@ export const searchFormSchema: FormSchema[] = [ getPopupContainer: () => document.body, }, }, - { - field: 'score', - label: '分数合计', + field: 'cpCode', + label: '客户', component: 'Input', }, { @@ -57,11 +34,6 @@ export const searchFormSchema: FormSchema[] = [ getPopupContainer: () => document.body, }, }, - { - field: 'note', - label: '备注', - component: 'Input', - }, ]; export const columns: BasicColumn[] = [ @@ -82,20 +54,18 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { - dataIndex: 'dateGrade', - title: '日期选择', - componentType: 'date', + dataIndex: 'score', + title: '评价分数', + componentType: 'input', align: 'left', sorter: true, }, - { - dataIndex: 'score', - title: '分数合计', - componentType: 'input', + dataIndex: 'dateGrade', + title: '评价日期', + componentType: 'date', align: 'left', sorter: true, @@ -109,15 +79,6 @@ export const columns: BasicColumn[] = [ sorter: true, }, - - { - dataIndex: 'note', - title: '备注', - componentType: 'textarea', - align: 'left', - - sorter: true, - }, ]; //表单事件 export const formEventConfigs = { diff --git a/src/views/sales/ScoreCustomer/components/createForm.vue b/src/views/sales/ScoreCustomer/components/createForm.vue new file mode 100644 index 0000000..8c60c36 --- /dev/null +++ b/src/views/sales/ScoreCustomer/components/createForm.vue @@ -0,0 +1,271 @@ + + + + + diff --git a/src/views/secondDev/customFormConfig.ts b/src/views/secondDev/customFormConfig.ts index b1eb5e4..9fa945b 100644 --- a/src/views/secondDev/customFormConfig.ts +++ b/src/views/secondDev/customFormConfig.ts @@ -1,5 +1,5 @@ export const customFormConfig = { - codeList: ['addCustomer','addSupplier'], + codeList: ['addCustomer','addSupplier', 'addCustomerScore'], router: [ {code: 'addCustomer', src: ''} ] diff --git a/src/views/supplier/Supplier/components/config.ts b/src/views/supplier/Supplier/components/config.ts index 0e6800c..2cffc45 100644 --- a/src/views/supplier/Supplier/components/config.ts +++ b/src/views/supplier/Supplier/components/config.ts @@ -11,44 +11,30 @@ export const searchFormSchema: FormSchema[] = [ label: '供应商名称', component: 'Input', }, - { - field: 'suSname', - label: '供应商简称', - component: 'Input', - }, - { - field: 'natureCode', - label: '企业性质', - component: 'Input', - }, - { - field: 'typeCode', - label: '供应商类型', - component: 'Input', - }, - { - field: 'classCode', - label: '供应商分类', - component: 'Input', - }, - { - field: 'dI', - label: '国内/国外', - component: 'Input', - }, - { - field: 'valid', - label: '有效', - component: 'Input', - }, { field: 'approCode', label: '审批状态', - component: 'Input', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '1990669393069129729' }, + labelField: 'name', + valueField: 'value', + + getPopupContainer: () => document.body, + }, }, ]; export const columns: BasicColumn[] = [ + { + dataIndex: 'suCode', + title: '供应商编码', + componentType: 'input', + align: 'left', + + sorter: true, + }, { dataIndex: 'suName', title: '供应商名称', diff --git a/src/views/supplier/Supplier/components/createForm.vue b/src/views/supplier/Supplier/components/createForm.vue index ea7cf92..f7de1d3 100644 --- a/src/views/supplier/Supplier/components/createForm.vue +++ b/src/views/supplier/Supplier/components/createForm.vue @@ -285,7 +285,7 @@ suSname: [{ required: true, message: "该项为必填项", trigger: 'change' }], suMcode: [{ required: true, message: "该项为必填项", trigger: 'change' }], dI: [{ required: true, message: "该项为必填项", trigger: 'change' }], - cuName: [{ required: true, message: "该项为必填项", trigger: 'change'}], + suName: [{ required: true, message: "该项为必填项", trigger: 'change'}], natureCode: [{ required: true, message: "该项为必填项", trigger: 'change'}], classCode: [{ required: true, message: "该项为必填项", trigger: 'change'}], typeCode: [{ required: true, message: "该项为必填项", trigger: 'change'}], @@ -518,6 +518,19 @@ }) return } + let arr = [] + dataBank.forEach(v => { + if (v.defaultSign == 'Y') { + arr.push(v) + } + }) + if (arr.length > 1 || !arr.length) { + notification.warning({ + message: 'Tip', + description: '默认银行有且仅有一个' + }) + return + } let arrCertificate = JSON.parse(JSON.stringify(dataCertificate)) arrCertificate.forEach(v => { v.dateFrom = v.dateFrom ? dayjs(v.dateFrom ).format('YYYY-MM-DD HH:mm:ss') : ''; diff --git a/src/views/supplier/Supplier/index.vue b/src/views/supplier/Supplier/index.vue index f546a24..f10582f 100644 --- a/src/views/supplier/Supplier/index.vue +++ b/src/views/supplier/Supplier/index.vue @@ -159,7 +159,8 @@ query: { taskId: taskIds[0], formName: formName, - formId:currentRoute.value.meta.formId + formId:currentRoute.value.meta.formId, + id: record.id } }); } else if (schemaId && !taskIds && processId) { @@ -169,18 +170,33 @@ readonly: 1, taskId: '', formName: formName, - formId:currentRoute.value.meta.formId + formId:currentRoute.value.meta.formId, + id: record.id, + status } }); } else { - router.push({ - path: '/form/Supplier/' + record.id + '/viewForm', - query: { - formPath: 'supplier/Supplier', - formName: formName, - formId:currentRoute.value.meta.formId - } - }); + if (schemaIdComputedRef.value) { + router.push({ + path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow', + query: { + formPath: 'supplier/Supplier', + formName: formName, + formId:currentRoute.value.meta.formId, + type:'edit', + id: record.id, + disabled: 1, + } + }); + } + // router.push({ + // path: '/form/Supplier/' + record.id + '/viewForm', + // query: { + // formPath: 'supplier/Supplier', + // formName: formName, + // formId:currentRoute.value.meta.formId + // } + // }); } } @@ -211,15 +227,27 @@ } function handleEdit(record: Recordable) { - - router.push({ - path: '/form/Supplier/' + record.id + '/updateForm', - query: { + if (schemaIdComputedRef.value) { + router.push({ + path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow', + query: { formPath: 'supplier/Supplier', formName: formName, - formId:currentRoute.value.meta.formId - } - }); + formId:currentRoute.value.meta.formId, + type:'edit', + id: record.id + } + }); + } else { + router.push({ + path: '/form/Supplier/' + record.id + '/updateForm', + query: { + formPath: 'supplier/Supplier', + formName: formName, + formId:currentRoute.value.meta.formId + } + }); + } } function handleDelete(record: Recordable) { deleteList([record.id]);