diff --git a/src/api/mdm/Currency/index.ts b/src/api/mdm/Currency/index.ts index b6e69e0..2fd3d03 100644 --- a/src/api/mdm/Currency/index.ts +++ b/src/api/mdm/Currency/index.ts @@ -9,6 +9,11 @@ enum Api { LngBCurrency = '/mdm/currency', + + Enable = '/mdm/currency/enable', + Disable= '/mdm/currency/disable', + + DataLog = '/mdm/currency/datalog', } /** @@ -84,4 +89,51 @@ export async function deleteLngBCurrency(ids: string[], mode: ErrorMessageMode = errorMessageMode: mode, }, ); -} \ No newline at end of file +} + + +/** + * @description: 启用数据LngBCurrency + */ +export async function enableLngBCurrency(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.Enable, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} +/** + * @description: 作废数据LngBCurrency + */ +export async function disableLngBCurrency(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.Disable, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} + + + + /** + * @description: 获取数据日志LngBCurrency + */ + export async function getDataLogLngBCurrency(id: string, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.Datalog, + data: id, + }, + { + errorMessageMode: mode, + }, + ); + } \ No newline at end of file diff --git a/src/api/mdm/Currency/model/CurrencyModel.ts b/src/api/mdm/Currency/model/CurrencyModel.ts index 94bc47b..c0857af 100644 --- a/src/api/mdm/Currency/model/CurrencyModel.ts +++ b/src/api/mdm/Currency/model/CurrencyModel.ts @@ -4,18 +4,14 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; * @description: LngBCurrency分页参数 模型 */ export interface LngBCurrencyPageParams extends BasicPageParams { - code: string; - fullName: string; - currSymbol: string; + valid: string; + + code: string; localSign: string; - sort: string; - - valid: string; - note: string; } @@ -29,12 +25,8 @@ export interface LngBCurrencyPageModel { fullName: string; - currSymbol: string; - localSign: string; - sort: string; - valid: string; note: string; diff --git a/src/api/mdm/PriceTerms/index.ts b/src/api/mdm/PriceTerms/index.ts index 30ed520..3448a5e 100644 --- a/src/api/mdm/PriceTerms/index.ts +++ b/src/api/mdm/PriceTerms/index.ts @@ -9,6 +9,11 @@ enum Api { LngBPriceTerm = '/mdm/priceTerms', + + Enable = '/mdm/priceTerms/enable', + Disable= '/mdm/priceTerms/disable', + + DataLog = '/mdm/priceTerms/datalog', } /** @@ -84,4 +89,51 @@ export async function deleteLngBPriceTerm(ids: string[], mode: ErrorMessageMode errorMessageMode: mode, }, ); -} \ No newline at end of file +} + + +/** + * @description: 启用数据LngBPriceTerm + */ +export async function enableLngBPriceTerm(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.Enable, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} +/** + * @description: 作废数据LngBPriceTerm + */ +export async function disableLngBPriceTerm(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.Disable, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} + + + + /** + * @description: 获取数据日志LngBPriceTerm + */ + export async function getDataLogLngBPriceTerm(id: string, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.Datalog, + data: id, + }, + { + errorMessageMode: mode, + }, + ); + } \ No newline at end of file diff --git a/src/api/mdm/PriceTerms/model/PriceTermsModel.ts b/src/api/mdm/PriceTerms/model/PriceTermsModel.ts index 871ce35..06ce803 100644 --- a/src/api/mdm/PriceTerms/model/PriceTermsModel.ts +++ b/src/api/mdm/PriceTerms/model/PriceTermsModel.ts @@ -4,19 +4,9 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; * @description: LngBPriceTerm分页参数 模型 */ export interface LngBPriceTermPageParams extends BasicPageParams { - code: string; - fullName: string; - freightSign: string; - - insuranceSign: string; - - sort: string; - valid: string; - - note: string; } /** @@ -33,49 +23,12 @@ export interface LngBPriceTermPageModel { insuranceSign: string; - sort: string; - valid: string; note: string; } -/** - * @description: LngBPriceTerm表类型 - */ -export interface LngBPriceTermModel { - id: number; - - code: string; - - fullName: string; - - freightSign: string; - - insuranceSign: string; - - sort: number; - - valid: string; - - note: string; - - createUserId: number; - - createDate: string; - - modifyUserId: number; - - modifyDate: string; - - deleteMark: number; - - tenantId: number; - - deptId: number; - - ruleUserId: number; -} +0; /** * @description: LngBPriceTerm分页返回值结构 diff --git a/src/views/mdm/Currency/components/CurrencyModal.vue b/src/views/mdm/Currency/components/CurrencyModal.vue index 8cfa7cf..168dd47 100644 --- a/src/views/mdm/Currency/components/CurrencyModal.vue +++ b/src/views/mdm/Currency/components/CurrencyModal.vue @@ -1,108 +1,110 @@ + } + + function handleClose() { + formRef.value.resetFields(); + } + \ No newline at end of file diff --git a/src/views/mdm/Currency/components/Form.vue b/src/views/mdm/Currency/components/Form.vue index cb1c1dc..290109f 100644 --- a/src/views/mdm/Currency/components/Form.vue +++ b/src/views/mdm/Currency/components/Form.vue @@ -1,198 +1,224 @@ + } + // 辅助设置表单数据 + function setFieldsValue(record) { + systemFormRef.value.setFieldsValue(record); + } + // 重置表单数据 + async function resetFields() { + await systemFormRef.value.resetFields(); + } + // 设置表单数据全部为Disabled 【查看】 + async function setDisabledForm(isDisabled) { + data.formDataProps.schemas = changeSchemaDisabled(cloneDeep(data.formDataProps.schemas),isDisabled); + } + // 获取行键值 + function getRowKey() { + return RowKey; + } + // 更新api表单数据 + async function update({ values, rowId }) { + try { + values[RowKey] = rowId; + state.formModel = values; + let saveVal = await updateLngBCurrency(values); + await submitFormEvent(customFormEventConfigs, state.formModel, + systemFormRef.value, + formProps.schemas); //表单事件:提交表单 + return saveVal; + } catch (error) {} + } + // 新增api表单数据 + async function add(values) { + try { + state.formModel = values; + let saveVal = await addLngBCurrency(values); + await submitFormEvent(customFormEventConfigs, state.formModel, + systemFormRef.value, + formProps.schemas); //表单事件:提交表单 + return saveVal; + } catch (error) {} + } + // 根据工作流页面权限,设置表单属性(必填,禁用,显示) + async function setWorkFlowForm(obj: WorkFlowFormParams) { + try { + const cloneProps=cloneDeep(formProps); + customFormEventConfigs=cloneDeep(formEventConfigs); + if (formConfig.useCustomConfig) { + const parts = obj.formConfigKey.split('_'); + const formId=parts[1]; + cloneProps.schemas=await mergeFormSchemas({formSchema:cloneProps.schemas!,formId:formId}); + customFormEventConfigs=await mergeFormEventConfigs({formEventConfigs:customFormEventConfigs,formId:formId}); + } + + let flowData = changeWorkFlowForm(cloneProps, obj); + let { buildOptionJson, uploadComponentIds, formModels, isViewProcess } = flowData; + data.formDataProps = buildOptionJson; + emits('changeUploadComponentIds', uploadComponentIds); //工作流中必须保存上传组件id【附件汇总需要】 + if (isViewProcess) { + setDisabledForm(); //查看 + } + state.formModel = formModels; + if(formModels[RowKey]) { + setFormDataFromId(formModels[RowKey], false) + } else { + setFieldsValue(formModels) + } + } catch (error) {} + await createFormEvent(customFormEventConfigs, state.formModel, + systemFormRef.value, + formProps.schemas); //表单事件:初始化表单 + await loadFormEvent(customFormEventConfigs, state.formModel, + systemFormRef.value, + formProps.schemas); //表单事件:加载表单 + } + function getFormModel() { + return systemFormRef.value.formModel + } + async function handleDelete(id) { + return await deleteLngBCurrency([id]); + } + defineExpose({ + setFieldsValue, + resetFields, + validate, + add, + update, + setFormDataFromId, + setDisabledForm, + setMenuPermission, + setWorkFlowForm, + getRowKey, + getFormModel, + handleDelete + }); + \ No newline at end of file diff --git a/src/views/mdm/Currency/components/config.ts b/src/views/mdm/Currency/components/config.ts index 88e9296..7e692ca 100644 --- a/src/views/mdm/Currency/components/config.ts +++ b/src/views/mdm/Currency/components/config.ts @@ -6,39 +6,11 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ - { - field: 'code', - label: '编码', - component: 'Input', - }, { field: 'fullName', label: '名称', component: 'Input', }, - { - field: 'currSymbol', - label: '符号', - component: 'Input', - }, - { - field: 'localSign', - label: '是否本币', - component: 'XjrSelect', - componentProps: { - datasourceType: 'dic', - params: { itemId: '1978056598125330433' }, - labelField: 'name', - valueField: 'value', - - getPopupContainer: () => document.body, - }, - }, - { - field: 'sort', - label: '显示顺序', - component: 'Input', - }, { field: 'valid', label: '有效标志', @@ -52,6 +24,24 @@ export const searchFormSchema: FormSchema[] = [ getPopupContainer: () => document.body, }, }, + { + field: 'code', + label: '编码', + component: 'Input', + }, + { + field: 'localSign', + label: '是否本币', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '1978056598125330433' }, + labelField: 'name', + valueField: 'value', + + getPopupContainer: () => document.body, + }, + }, { field: 'note', label: '备注', @@ -78,15 +68,6 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { - dataIndex: 'currSymbol', - title: '符号', - componentType: 'input', - align: 'left', - - sorter: true, - }, - { dataIndex: 'localSign', title: '是否本币', @@ -96,15 +77,6 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { - dataIndex: 'sort', - title: '显示顺序', - componentType: 'input', - align: 'left', - - sorter: true, - }, - { dataIndex: 'valid', title: '有效标志', @@ -117,7 +89,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'note', title: '备注', - componentType: 'input', + componentType: 'textarea', align: 'left', sorter: true, @@ -193,7 +165,7 @@ export const formProps: FormProps = { size: 'default', schemas: [ { - key: '8bdc5b8468004f54904d30bf03e445cc', + key: '216e1018f11a4d4aa5ad0879dd4d8209', field: 'code', label: '编码', type: 'input', @@ -209,15 +181,14 @@ export const formProps: FormProps = { responsive: false, respNewRow: false, placeholder: '请输入编码', - maxlength: null, prefix: '', suffix: '', addonBefore: '', addonAfter: '', disabled: false, - allowClear: false, + allowClear: true, showLabel: true, - required: false, + required: true, rules: [], events: {}, isSave: false, @@ -227,7 +198,7 @@ export const formProps: FormProps = { }, }, { - key: '866d9f66d886441990702205e50214ae', + key: '6074c6c1ac8b4f528fa421f8464e6e73', field: 'fullName', label: '名称', type: 'input', @@ -243,15 +214,14 @@ export const formProps: FormProps = { responsive: false, respNewRow: false, placeholder: '请输入名称', - maxlength: null, prefix: '', suffix: '', addonBefore: '', addonAfter: '', disabled: false, - allowClear: false, + allowClear: true, showLabel: true, - required: false, + required: true, rules: [], events: {}, isSave: false, @@ -261,41 +231,7 @@ export const formProps: FormProps = { }, }, { - key: 'afe4e7d3e0f34542baa38a7201d987f0', - field: 'currSymbol', - label: '符号', - type: 'input', - component: 'Input', - colProps: { span: 24 }, - defaultValue: '', - componentProps: { - width: '100%', - span: '', - defaultValue: '', - labelWidthMode: 'fix', - labelFixWidth: 120, - responsive: false, - respNewRow: false, - placeholder: '请输入符号', - maxlength: null, - prefix: '', - suffix: '', - addonBefore: '', - addonAfter: '', - disabled: false, - allowClear: false, - showLabel: true, - required: false, - rules: [], - events: {}, - isSave: false, - isShow: true, - scan: false, - style: { width: '100%' }, - }, - }, - { - key: '1270794f304d4a2dbc0f4b9428979900', + key: '477dc52fa33b402f94146203c9ffcdc7', field: 'localSign', label: '是否本币', type: 'select', @@ -314,13 +250,12 @@ export const formProps: FormProps = { showSearch: false, clearable: false, disabled: false, - mode: 'multiple', + mode: '', staticOptions: [ { key: 1, label: 'Option 1', value: 'Option 1' }, { key: 2, label: 'Option 2', value: 'Option 2' }, { key: 3, label: 'Option 3', value: 'Option 3' }, ], - defaultSelect: null, datasourceType: 'dic', params: { itemId: '1978056598125330433' }, labelField: 'name', @@ -331,7 +266,7 @@ export const formProps: FormProps = { apiId: '93d735dcb7364a0f8102188ec4d77ac7', }, dicOptions: [], - required: false, + required: true, rules: [], events: {}, isShow: true, @@ -340,41 +275,7 @@ export const formProps: FormProps = { }, }, { - key: 'eaa4d5c8eda64cd897bd7fd99bc7c583', - field: 'sort', - label: '显示顺序', - type: 'input', - component: 'Input', - colProps: { span: 24 }, - defaultValue: '', - componentProps: { - width: '100%', - span: '', - defaultValue: '', - labelWidthMode: 'fix', - labelFixWidth: 120, - responsive: false, - respNewRow: false, - placeholder: '请输入显示顺序', - maxlength: null, - prefix: '', - suffix: '', - addonBefore: '', - addonAfter: '', - disabled: false, - allowClear: false, - showLabel: true, - required: false, - rules: [], - events: {}, - isSave: false, - isShow: true, - scan: false, - style: { width: '100%' }, - }, - }, - { - key: '601920889e184a83b2838b9959afd477', + key: '7940a5fbdf024f44b18d063c2023ee46', field: 'valid', label: '有效标志', type: 'select', @@ -392,14 +293,13 @@ export const formProps: FormProps = { showLabel: true, showSearch: false, clearable: false, - disabled: false, - mode: 'multiple', + disabled: true, + mode: '', staticOptions: [ { key: 1, label: 'Option 1', value: 'Option 1' }, { key: 2, label: 'Option 2', value: 'Option 2' }, { key: 3, label: 'Option 3', value: 'Option 3' }, ], - defaultSelect: null, datasourceType: 'dic', params: { itemId: '1978057078528327681' }, labelField: 'name', @@ -419,11 +319,11 @@ export const formProps: FormProps = { }, }, { - key: '3c877465ed7c43239afbf22889098695', + key: '45d20cfa03a747b2a1e1ebb0cb8198c5', field: 'note', label: '备注', - type: 'input', - component: 'Input', + type: 'textarea', + component: 'InputTextArea', colProps: { span: 24 }, defaultValue: '', componentProps: { @@ -433,22 +333,19 @@ export const formProps: FormProps = { labelWidthMode: 'fix', labelFixWidth: 120, responsive: false, - respNewRow: false, + respNewRow: true, placeholder: '请输入备注', - maxlength: null, - prefix: '', - suffix: '', - addonBefore: '', - addonAfter: '', + maxlength: 400, + rows: 4, + autoSize: false, + showCount: true, disabled: false, - allowClear: false, showLabel: true, + allowClear: false, required: false, + isShow: true, rules: [], events: {}, - isSave: false, - isShow: true, - scan: false, style: { width: '100%' }, }, }, diff --git a/src/views/mdm/Currency/components/workflowPermission.ts b/src/views/mdm/Currency/components/workflowPermission.ts index 43ae616..5267e74 100644 --- a/src/views/mdm/Currency/components/workflowPermission.ts +++ b/src/views/mdm/Currency/components/workflowPermission.ts @@ -11,7 +11,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'input', - key: '8bdc5b8468004f54904d30bf03e445cc', + key: '216e1018f11a4d4aa5ad0879dd4d8209', children: [], }, { @@ -26,22 +26,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'input', - key: '866d9f66d886441990702205e50214ae', - children: [], - }, - { - required: true, - view: true, - edit: true, - disabled: false, - isSaveTable: false, - tableName: '', - fieldName: '符号', - fieldId: 'currSymbol', - isSubTable: false, - showChildren: true, - type: 'input', - key: 'afe4e7d3e0f34542baa38a7201d987f0', + key: '6074c6c1ac8b4f528fa421f8464e6e73', children: [], }, { @@ -56,22 +41,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'select', - key: '1270794f304d4a2dbc0f4b9428979900', - children: [], - }, - { - required: true, - view: true, - edit: true, - disabled: false, - isSaveTable: false, - tableName: '', - fieldName: '显示顺序', - fieldId: 'sort', - isSubTable: false, - showChildren: true, - type: 'input', - key: 'eaa4d5c8eda64cd897bd7fd99bc7c583', + key: '477dc52fa33b402f94146203c9ffcdc7', children: [], }, { @@ -86,7 +56,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'select', - key: '601920889e184a83b2838b9959afd477', + key: '7940a5fbdf024f44b18d063c2023ee46', children: [], }, { @@ -100,8 +70,8 @@ export const permissionList = [ fieldId: 'note', isSubTable: false, showChildren: true, - type: 'input', - key: '3c877465ed7c43239afbf22889098695', + type: 'textarea', + key: '45d20cfa03a747b2a1e1ebb0cb8198c5', children: [], }, ]; \ No newline at end of file diff --git a/src/views/mdm/Currency/index.vue b/src/views/mdm/Currency/index.vue index 9d2830f..56f6053 100644 --- a/src/views/mdm/Currency/index.vue +++ b/src/views/mdm/Currency/index.vue @@ -1,294 +1,356 @@ + :deep(.ant-table-selection-col) { + width: 50px; + } + .show{ + display: flex; + } + .hide{ + display: none !important; + } + \ No newline at end of file diff --git a/src/views/mdm/PriceTerms/components/Form.vue b/src/views/mdm/PriceTerms/components/Form.vue index 0f93ceb..96617c7 100644 --- a/src/views/mdm/PriceTerms/components/Form.vue +++ b/src/views/mdm/PriceTerms/components/Form.vue @@ -1,198 +1,224 @@ + } + // 辅助设置表单数据 + function setFieldsValue(record) { + systemFormRef.value.setFieldsValue(record); + } + // 重置表单数据 + async function resetFields() { + await systemFormRef.value.resetFields(); + } + // 设置表单数据全部为Disabled 【查看】 + async function setDisabledForm(isDisabled) { + data.formDataProps.schemas = changeSchemaDisabled(cloneDeep(data.formDataProps.schemas),isDisabled); + } + // 获取行键值 + function getRowKey() { + return RowKey; + } + // 更新api表单数据 + async function update({ values, rowId }) { + try { + values[RowKey] = rowId; + state.formModel = values; + let saveVal = await updateLngBPriceTerm(values); + await submitFormEvent(customFormEventConfigs, state.formModel, + systemFormRef.value, + formProps.schemas); //表单事件:提交表单 + return saveVal; + } catch (error) {} + } + // 新增api表单数据 + async function add(values) { + try { + state.formModel = values; + let saveVal = await addLngBPriceTerm(values); + await submitFormEvent(customFormEventConfigs, state.formModel, + systemFormRef.value, + formProps.schemas); //表单事件:提交表单 + return saveVal; + } catch (error) {} + } + // 根据工作流页面权限,设置表单属性(必填,禁用,显示) + async function setWorkFlowForm(obj: WorkFlowFormParams) { + try { + const cloneProps=cloneDeep(formProps); + customFormEventConfigs=cloneDeep(formEventConfigs); + if (formConfig.useCustomConfig) { + const parts = obj.formConfigKey.split('_'); + const formId=parts[1]; + cloneProps.schemas=await mergeFormSchemas({formSchema:cloneProps.schemas!,formId:formId}); + customFormEventConfigs=await mergeFormEventConfigs({formEventConfigs:customFormEventConfigs,formId:formId}); + } + + let flowData = changeWorkFlowForm(cloneProps, obj); + let { buildOptionJson, uploadComponentIds, formModels, isViewProcess } = flowData; + data.formDataProps = buildOptionJson; + emits('changeUploadComponentIds', uploadComponentIds); //工作流中必须保存上传组件id【附件汇总需要】 + if (isViewProcess) { + setDisabledForm(); //查看 + } + state.formModel = formModels; + if(formModels[RowKey]) { + setFormDataFromId(formModels[RowKey], false) + } else { + setFieldsValue(formModels) + } + } catch (error) {} + await createFormEvent(customFormEventConfigs, state.formModel, + systemFormRef.value, + formProps.schemas); //表单事件:初始化表单 + await loadFormEvent(customFormEventConfigs, state.formModel, + systemFormRef.value, + formProps.schemas); //表单事件:加载表单 + } + function getFormModel() { + return systemFormRef.value.formModel + } + async function handleDelete(id) { + return await deleteLngBPriceTerm([id]); + } + defineExpose({ + setFieldsValue, + resetFields, + validate, + add, + update, + setFormDataFromId, + setDisabledForm, + setMenuPermission, + setWorkFlowForm, + getRowKey, + getFormModel, + handleDelete + }); + \ No newline at end of file diff --git a/src/views/mdm/PriceTerms/components/PriceTermsModal.vue b/src/views/mdm/PriceTerms/components/PriceTermsModal.vue index 8cfa7cf..168dd47 100644 --- a/src/views/mdm/PriceTerms/components/PriceTermsModal.vue +++ b/src/views/mdm/PriceTerms/components/PriceTermsModal.vue @@ -1,108 +1,110 @@ + } + + function handleClose() { + formRef.value.resetFields(); + } + \ No newline at end of file diff --git a/src/views/mdm/PriceTerms/components/config.ts b/src/views/mdm/PriceTerms/components/config.ts index b203cbd..6d8ac1c 100644 --- a/src/views/mdm/PriceTerms/components/config.ts +++ b/src/views/mdm/PriceTerms/components/config.ts @@ -6,47 +6,11 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ - { - field: 'code', - label: '编码', - component: 'Input', - }, { field: 'fullName', label: '名称', component: 'Input', }, - { - field: 'freightSign', - label: '是否承担运费', - component: 'XjrSelect', - componentProps: { - datasourceType: 'dic', - params: { itemId: '1978056598125330433' }, - labelField: 'name', - valueField: 'value', - - getPopupContainer: () => document.body, - }, - }, - { - field: 'insuranceSign', - label: '是否承担保险', - component: 'XjrSelect', - componentProps: { - datasourceType: 'dic', - params: { itemId: '1978056598125330433' }, - labelField: 'name', - valueField: 'value', - - getPopupContainer: () => document.body, - }, - }, - { - field: 'sort', - label: '显示顺序', - component: 'Input', - }, { field: 'valid', label: '有效标志', @@ -60,11 +24,6 @@ export const searchFormSchema: FormSchema[] = [ getPopupContainer: () => document.body, }, }, - { - field: 'note', - label: '备注', - component: 'Input', - }, ]; export const columns: BasicColumn[] = [ @@ -104,15 +63,6 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { - dataIndex: 'sort', - title: '显示顺序', - componentType: 'input', - align: 'left', - - sorter: true, - }, - { dataIndex: 'valid', title: '有效标志', @@ -125,7 +75,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'note', title: '备注', - componentType: 'input', + componentType: 'textarea', align: 'left', sorter: true, @@ -201,7 +151,7 @@ export const formProps: FormProps = { size: 'default', schemas: [ { - key: 'd35dce42c1e44fb0a865ce284729b071', + key: 'e5b395b24d214214a16951d8df4e2004', field: 'code', label: '编码', type: 'input', @@ -225,7 +175,7 @@ export const formProps: FormProps = { disabled: false, allowClear: false, showLabel: true, - required: false, + required: true, rules: [], events: {}, isSave: false, @@ -235,7 +185,7 @@ export const formProps: FormProps = { }, }, { - key: 'a5fcbf1205f3405f9a377cdacbfe2360', + key: '86536f9d2e8c473b8821c9216c765c9c', field: 'fullName', label: '名称', type: 'input', @@ -259,7 +209,7 @@ export const formProps: FormProps = { disabled: false, allowClear: false, showLabel: true, - required: false, + required: true, rules: [], events: {}, isSave: false, @@ -269,7 +219,7 @@ export const formProps: FormProps = { }, }, { - key: 'fe4977ec486f4e949e13656d0614af30', + key: '38c7f7488fe24254a1a939fa9b445657', field: 'freightSign', label: '是否承担运费', type: 'select', @@ -288,7 +238,7 @@ export const formProps: FormProps = { showSearch: false, clearable: false, disabled: false, - mode: 'multiple', + mode: '', staticOptions: [ { key: 1, label: 'Option 1', value: 'Option 1' }, { key: 2, label: 'Option 2', value: 'Option 2' }, @@ -305,7 +255,7 @@ export const formProps: FormProps = { apiId: '93d735dcb7364a0f8102188ec4d77ac7', }, dicOptions: [], - required: false, + required: true, rules: [], events: {}, isShow: true, @@ -314,7 +264,7 @@ export const formProps: FormProps = { }, }, { - key: 'fb97e7c3e4a64c8aacdbc2e12f6b31c4', + key: '10bfa57236b74a5f9a680e9bc5861d55', field: 'insuranceSign', label: '是否承担保险', type: 'select', @@ -333,7 +283,7 @@ export const formProps: FormProps = { showSearch: false, clearable: false, disabled: false, - mode: 'multiple', + mode: '', staticOptions: [ { key: 1, label: 'Option 1', value: 'Option 1' }, { key: 2, label: 'Option 2', value: 'Option 2' }, @@ -350,7 +300,7 @@ export const formProps: FormProps = { apiId: '93d735dcb7364a0f8102188ec4d77ac7', }, dicOptions: [], - required: false, + required: true, rules: [], events: {}, isShow: true, @@ -359,41 +309,7 @@ export const formProps: FormProps = { }, }, { - key: 'edf99f70403b49399daf3df6e956e0e9', - field: 'sort', - label: '显示顺序', - type: 'input', - component: 'Input', - colProps: { span: 24 }, - defaultValue: '', - componentProps: { - width: '100%', - span: '', - defaultValue: '', - labelWidthMode: 'fix', - labelFixWidth: 120, - responsive: false, - respNewRow: false, - placeholder: '请输入显示顺序', - maxlength: null, - prefix: '', - suffix: '', - addonBefore: '', - addonAfter: '', - disabled: false, - allowClear: false, - showLabel: true, - required: false, - rules: [], - events: {}, - isSave: false, - isShow: true, - scan: false, - style: { width: '100%' }, - }, - }, - { - key: '34054c282479487ba146136da7b81ceb', + key: 'd1feff0a3b454fa4a29c53355ab6c9cd', field: 'valid', label: '有效标志', type: 'select', @@ -411,7 +327,7 @@ export const formProps: FormProps = { showLabel: true, showSearch: false, clearable: false, - disabled: false, + disabled: true, mode: 'multiple', staticOptions: [ { key: 1, label: 'Option 1', value: 'Option 1' }, @@ -438,11 +354,11 @@ export const formProps: FormProps = { }, }, { - key: '8c025f7b82754e5e84204a316e305ba8', + key: '297be674c3e84930a81ec6d92600e896', field: 'note', label: '备注', - type: 'input', - component: 'Input', + type: 'textarea', + component: 'InputTextArea', colProps: { span: 24 }, defaultValue: '', componentProps: { @@ -452,22 +368,19 @@ export const formProps: FormProps = { labelWidthMode: 'fix', labelFixWidth: 120, responsive: false, - respNewRow: false, + respNewRow: true, placeholder: '请输入备注', - maxlength: null, - prefix: '', - suffix: '', - addonBefore: '', - addonAfter: '', + maxlength: 400, + rows: 4, + autoSize: false, + showCount: true, disabled: false, - allowClear: false, showLabel: true, + allowClear: false, required: false, + isShow: true, rules: [], events: {}, - isSave: false, - isShow: true, - scan: false, style: { width: '100%' }, }, }, diff --git a/src/views/mdm/PriceTerms/components/workflowPermission.ts b/src/views/mdm/PriceTerms/components/workflowPermission.ts index 24af2c9..02de0aa 100644 --- a/src/views/mdm/PriceTerms/components/workflowPermission.ts +++ b/src/views/mdm/PriceTerms/components/workflowPermission.ts @@ -11,7 +11,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'input', - key: 'd35dce42c1e44fb0a865ce284729b071', + key: 'e5b395b24d214214a16951d8df4e2004', children: [], }, { @@ -26,7 +26,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'input', - key: 'a5fcbf1205f3405f9a377cdacbfe2360', + key: '86536f9d2e8c473b8821c9216c765c9c', children: [], }, { @@ -41,7 +41,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'select', - key: 'fe4977ec486f4e949e13656d0614af30', + key: '38c7f7488fe24254a1a939fa9b445657', children: [], }, { @@ -56,22 +56,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'select', - key: 'fb97e7c3e4a64c8aacdbc2e12f6b31c4', - children: [], - }, - { - required: true, - view: true, - edit: true, - disabled: false, - isSaveTable: false, - tableName: '', - fieldName: '显示顺序', - fieldId: 'sort', - isSubTable: false, - showChildren: true, - type: 'input', - key: 'edf99f70403b49399daf3df6e956e0e9', + key: '10bfa57236b74a5f9a680e9bc5861d55', children: [], }, { @@ -86,7 +71,7 @@ export const permissionList = [ isSubTable: false, showChildren: true, type: 'select', - key: '34054c282479487ba146136da7b81ceb', + key: 'd1feff0a3b454fa4a29c53355ab6c9cd', children: [], }, { @@ -100,8 +85,8 @@ export const permissionList = [ fieldId: 'note', isSubTable: false, showChildren: true, - type: 'input', - key: '8c025f7b82754e5e84204a316e305ba8', + type: 'textarea', + key: '297be674c3e84930a81ec6d92600e896', children: [], }, ]; \ No newline at end of file diff --git a/src/views/mdm/PriceTerms/index.vue b/src/views/mdm/PriceTerms/index.vue index 928dc53..533a2ab 100644 --- a/src/views/mdm/PriceTerms/index.vue +++ b/src/views/mdm/PriceTerms/index.vue @@ -1,294 +1,356 @@ + :deep(.ant-table-selection-col) { + width: 50px; + } + .show{ + display: flex; + } + .hide{ + display: none !important; + } + \ No newline at end of file