Skip to content

A
admin
提交 eb5953d4 authored 作者: 袁伟伟's avatar 袁伟伟
浏览文件
操作

Merge branch 'master' of http://git.xinwangdao.com/china-resources-surgical/admin

上级 d9e3bdb7 216150fc
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 698 行增加 和 373 行删除
src/commonSchemaProperty/index.ts
浏览文件 @ eb5953d4
......@@ -3,6 +3,7 @@
*/
import * as DistributorApi from '/@/api/system/distributorApi';
import get from 'lodash.get';
import * as HospitalApi from '/@/api/system/hospitalApi';
const getDistributorId = ({ colProps }) => {
return {
......@@ -10,6 +11,9 @@ const getDistributorId = ({ colProps }) => {
label: '经销商',
defaultValue: undefined,
form: {
itemProps: {
validateTrigger: 'blur',
},
componentProps: {
labelInValue: true,
api: DistributorApi.all,
......@@ -19,6 +23,8 @@ const getDistributorId = ({ colProps }) => {
valueField: 'id',
allowClear: false,
placeholder: '经销商',
optionFilterProp: 'label',
showSearch: true,
},
colProps,
component: 'ApiSelect',
......@@ -30,4 +36,35 @@ const getDistributorId = ({ colProps }) => {
};
};
export { getDistributorId };
const getHospitalId = ({ colProps }) => {
return {
field: 'hospitalId',
label: '医院',
defaultValue: undefined,
form: {
itemProps: {
validateTrigger: 'blur',
},
componentProps: {
labelInValue: true,
api: HospitalApi.all,
params: {},
resultField: 'records',
labelField: 'name',
valueField: 'id',
allowClear: false,
placeholder: '医院',
optionFilterProp: 'label',
showSearch: true,
},
colProps,
component: 'ApiSelect',
rules: [{ required: true, type: 'object', message: '请选择医院！' }],
},
table: {
customRender: ({ text, record }) => get(record, 'hospital.name') || text,
},
};
};
export { getDistributorId, getHospitalId };
src/components/Drawer/src/components/DrawerFooter.vue
浏览文件 @ eb5953d4
......@@ -42,7 +42,6 @@
},
emits: ['ok', 'close'],
setup(props, { emit }) {
console.log('props', props);
const { prefixCls } = useDesign('basic-drawer-footer');
const getStyle = computed((): CSSProperties => {
......
src/store/modules/user.ts
浏览文件 @ eb5953d4
......@@ -61,6 +61,13 @@ export const useUserStore = defineStore({
getLastUpdateTime(): number {
return this.lastUpdateTime;
},
/**
* @description 是否是华润供应商
* @return true是 , false不是 ,null用户信息为空
*/
getIsSupplier(): boolean | null {
return this.userInfo?.distributorId === 0 || getAuthCache<User>(USER_INFO_KEY)?.distributorId === 0 || null;
},
},
actions: {
setToken(info: string | undefined) {
......
src/views/order/batch-order-detail/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/order/batch-order-detail/schema.ts
浏览文件 @ eb5953d4
......@@ -44,8 +44,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入ID系统自动生成！' }],
},
table: {
},
table: {},
},
{
field: 'distributorId',
......@@ -60,8 +59,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入经销商id！' }],
},
table: {
},
table: {},
},
{
field: 'batchOrderId',
......@@ -76,8 +74,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入oms_batch_order.id！' }],
},
table: {
},
table: {},
},
{
field: 'goodsId',
......@@ -115,8 +112,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入名称！' }],
},
table: {
},
table: {},
},
{
field: 'goodsType',
......@@ -134,7 +130,7 @@ export const schema = {
},
table: {
customRender: ({ text }) => {
const option = GoodsTypeEnumOptions.find((item) => item.value === text)
const option = GoodsTypeEnumOptions.find((item) => item.value === text);
return option ? option.label : text;
},
},
......@@ -152,8 +148,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入单价！' }],
},
table: {
},
table: {},
},
{
field: 'discountPrice',
......@@ -168,8 +163,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入折扣价！' }],
},
table: {
},
table: {},
},
{
field: 'quantity',
......@@ -184,12 +178,11 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入数量！' }],
},
table: {
},
table: {},
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -202,12 +195,11 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入CreateTime！' }],
},
table: {
},
table: {},
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -220,18 +212,63 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入UpdateTime！' }],
},
table: {
},
table: {},
},
],
};
const queryFields = ['id','distributorId','batchOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const editFields = ['distributorId','batchOrderId','goodsId','name','goodsType','price','discountPrice','quantity'];
const tableFields = ['id','distributorId','batchOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const descriptionFields = ['id','distributorId','batchOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const queryFields = [
'id',
'distributorId',
'batchOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
const editFields = [
'distributorId',
'batchOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
];
const tableFields = [
'id',
'distributorId',
'batchOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
const descriptionFields = [
'id',
'distributorId',
'batchOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
.map(
({ field, label, form: { rules = [], ...formProps } }) =>
({
......@@ -243,7 +280,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
} as FormSchema),
);
export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
.map(
({ field, label, defaultValue, form }) =>
({
......@@ -255,17 +293,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
} as FormSchema),
);
export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
.map(
({ field, label, table }) =>
({
dataIndex: field,
title: label,
...table,
} as BasicColumn)
} as BasicColumn),
);
export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
.map(
({ field, label, table }) =>
({
......
src/views/order/batch-order/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/order/batch-order/schema.ts
浏览文件 @ eb5953d4
......@@ -42,8 +42,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入ID系统自动生成！' }],
},
table: {
},
table: {},
},
{
field: 'distributorId',
......@@ -58,8 +57,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入经销商id！' }],
},
table: {
},
table: {},
},
{
field: 'orderSn',
......@@ -74,8 +72,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入订单编号！' }],
},
table: {
},
table: {},
},
{
field: 'exWarehouse',
......@@ -89,8 +86,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'distributorName',
......@@ -104,8 +100,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'ownOrderSn',
......@@ -120,8 +115,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入自有订单编号！' }],
},
table: {
},
table: {},
},
{
field: 'saleUserId',
......@@ -135,8 +129,7 @@ export const schema = {
colProps,
component: 'InputNumber',
},
table: {
},
table: {},
},
{
field: 'saleUserName',
......@@ -150,8 +143,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'invoicingCompany',
......@@ -165,8 +157,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'logisticsMode',
......@@ -180,8 +171,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'receiveName',
......@@ -195,8 +185,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'receivePhone',
......@@ -210,8 +199,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'address',
......@@ -225,8 +213,7 @@ export const schema = {
component: 'InputTextArea',
colProps: { span: 24 },
},
table: {
},
table: {},
},
{
field: 'remark',
......@@ -240,8 +227,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'deleteStatus',
......@@ -258,7 +244,7 @@ export const schema = {
},
table: {
customRender: ({ text }) => {
const option = YesNoEnumOptions.find((item) => item.value === text)
const option = YesNoEnumOptions.find((item) => item.value === text);
return option ? option.label : text;
},
},
......@@ -276,8 +262,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入操作人ID！' }],
},
table: {
},
table: {},
},
{
field: 'editorName',
......@@ -292,12 +277,11 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入操作人！' }],
},
table: {
},
table: {},
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -310,12 +294,11 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入CreateTime！' }],
},
table: {
},
table: {},
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -328,18 +311,92 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入UpdateTime！' }],
},
table: {
},
table: {},
},
],
};
const queryFields = ['id','distributorId','orderSn','exWarehouse','distributorName','ownOrderSn','saleUserId','saleUserName','invoicingCompany','logisticsMode','receiveName','receivePhone','remark','deleteStatus','editorId','editorName','createTime','updateTime'];
const editFields = ['distributorId','orderSn','exWarehouse','distributorName','ownOrderSn','saleUserId','saleUserName','invoicingCompany','logisticsMode','receiveName','receivePhone','address','remark','deleteStatus'];
const tableFields = ['id','distributorId','orderSn','exWarehouse','distributorName','ownOrderSn','saleUserId','saleUserName','invoicingCompany','logisticsMode','receiveName','receivePhone','address','remark','deleteStatus','editorId','editorName','createTime','updateTime'];
const descriptionFields = ['id','distributorId','orderSn','exWarehouse','distributorName','ownOrderSn','saleUserId','saleUserName','invoicingCompany','logisticsMode','receiveName','receivePhone','address','remark','deleteStatus','editorId','editorName','createTime','updateTime'];
const queryFields = [
'id',
'distributorId',
'orderSn',
'exWarehouse',
'distributorName',
'ownOrderSn',
'saleUserId',
'saleUserName',
'invoicingCompany',
'logisticsMode',
'receiveName',
'receivePhone',
'remark',
'deleteStatus',
'editorId',
'editorName',
'createTime',
'updateTime',
];
const editFields = [
'distributorId',
'orderSn',
'exWarehouse',
'distributorName',
'ownOrderSn',
'saleUserId',
'saleUserName',
'invoicingCompany',
'logisticsMode',
'receiveName',
'receivePhone',
'address',
'remark',
'deleteStatus',
];
const tableFields = [
'id',
'distributorId',
'orderSn',
'exWarehouse',
'distributorName',
'ownOrderSn',
'saleUserId',
'saleUserName',
'invoicingCompany',
'logisticsMode',
'receiveName',
'receivePhone',
'address',
'remark',
'deleteStatus',
'editorId',
'editorName',
'createTime',
'updateTime',
];
const descriptionFields = [
'id',
'distributorId',
'orderSn',
'exWarehouse',
'distributorName',
'ownOrderSn',
'saleUserId',
'saleUserName',
'invoicingCompany',
'logisticsMode',
'receiveName',
'receivePhone',
'address',
'remark',
'deleteStatus',
'editorId',
'editorName',
'createTime',
'updateTime',
];
export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
.map(
({ field, label, form: { rules = [], ...formProps } }) =>
({
......@@ -351,7 +408,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
} as FormSchema),
);
export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
.map(
({ field, label, defaultValue, form }) =>
({
......@@ -363,17 +421,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
} as FormSchema),
);
export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
.map(
({ field, label, table }) =>
({
dataIndex: field,
title: label,
...table,
} as BasicColumn)
} as BasicColumn),
);
export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
.map(
({ field, label, table }) =>
({
......
src/views/order/batch-work-order-detail/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/order/batch-work-order-detail/schema.ts
浏览文件 @ eb5953d4
......@@ -44,8 +44,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入ID系统自动生成！' }],
},
table: {
},
table: {},
},
{
field: 'distributorId',
......@@ -60,8 +59,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入经销商id！' }],
},
table: {
},
table: {},
},
{
field: 'batchWorkOrderId',
......@@ -76,8 +74,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入oms_operation_work_order.id！' }],
},
table: {
},
table: {},
},
{
field: 'goodsId',
......@@ -115,8 +112,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入名称！' }],
},
table: {
},
table: {},
},
{
field: 'goodsType',
......@@ -134,7 +130,7 @@ export const schema = {
},
table: {
customRender: ({ text }) => {
const option = GoodsTypeEnumOptions.find((item) => item.value === text)
const option = GoodsTypeEnumOptions.find((item) => item.value === text);
return option ? option.label : text;
},
},
......@@ -152,8 +148,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入单价！' }],
},
table: {
},
table: {},
},
{
field: 'discountPrice',
......@@ -168,8 +163,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入折扣价！' }],
},
table: {
},
table: {},
},
{
field: 'quantity',
......@@ -184,12 +178,11 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入数量！' }],
},
table: {
},
table: {},
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -202,12 +195,11 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入CreateTime！' }],
},
table: {
},
table: {},
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -220,18 +212,63 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入UpdateTime！' }],
},
table: {
},
table: {},
},
],
};
const queryFields = ['id','distributorId','batchWorkOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const editFields = ['distributorId','batchWorkOrderId','goodsId','name','goodsType','price','discountPrice','quantity'];
const tableFields = ['id','distributorId','batchWorkOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const descriptionFields = ['id','distributorId','batchWorkOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const queryFields = [
'id',
'distributorId',
'batchWorkOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
const editFields = [
'distributorId',
'batchWorkOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
];
const tableFields = [
'id',
'distributorId',
'batchWorkOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
const descriptionFields = [
'id',
'distributorId',
'batchWorkOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
.map(
({ field, label, form: { rules = [], ...formProps } }) =>
({
......@@ -243,7 +280,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
} as FormSchema),
);
export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
.map(
({ field, label, defaultValue, form }) =>
({
......@@ -255,17 +293,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
} as FormSchema),
);
export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
.map(
({ field, label, table }) =>
({
dataIndex: field,
title: label,
...table,
} as BasicColumn)
} as BasicColumn),
);
export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
.map(
({ field, label, table }) =>
({
......
src/views/order/batch-work-order/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/order/operation-order-detail/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/order/operation-order-detail/schema.ts
浏览文件 @ eb5953d4
......@@ -44,8 +44,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入ID系统自动生成！' }],
},
table: {
},
table: {},
},
{
field: 'distributorId',
......@@ -60,8 +59,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入经销商id！' }],
},
table: {
},
table: {},
},
{
field: 'operationOrderId',
......@@ -76,8 +74,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入oms_operation_order.id！' }],
},
table: {
},
table: {},
},
{
field: 'goodsId',
......@@ -115,8 +112,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入名称！' }],
},
table: {
},
table: {},
},
{
field: 'goodsType',
......@@ -134,7 +130,7 @@ export const schema = {
},
table: {
customRender: ({ text }) => {
const option = GoodsTypeEnumOptions.find((item) => item.value === text)
const option = GoodsTypeEnumOptions.find((item) => item.value === text);
return option ? option.label : text;
},
},
......@@ -152,8 +148,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入单价！' }],
},
table: {
},
table: {},
},
{
field: 'discountPrice',
......@@ -168,8 +163,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入折扣价！' }],
},
table: {
},
table: {},
},
{
field: 'quantity',
......@@ -184,12 +178,11 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入数量！' }],
},
table: {
},
table: {},
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -202,12 +195,11 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入CreateTime！' }],
},
table: {
},
table: {},
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -220,18 +212,63 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入UpdateTime！' }],
},
table: {
},
table: {},
},
],
};
const queryFields = ['id','distributorId','operationOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const editFields = ['distributorId','operationOrderId','goodsId','name','goodsType','price','discountPrice','quantity'];
const tableFields = ['id','distributorId','operationOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const descriptionFields = ['id','distributorId','operationOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const queryFields = [
'id',
'distributorId',
'operationOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
const editFields = [
'distributorId',
'operationOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
];
const tableFields = [
'id',
'distributorId',
'operationOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
const descriptionFields = [
'id',
'distributorId',
'operationOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
.map(
({ field, label, form: { rules = [], ...formProps } }) =>
({
......@@ -243,7 +280,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
} as FormSchema),
);
export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
.map(
({ field, label, defaultValue, form }) =>
({
......@@ -255,17 +293,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
} as FormSchema),
);
export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
.map(
({ field, label, table }) =>
({
dataIndex: field,
title: label,
...table,
} as BasicColumn)
} as BasicColumn),
);
export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
.map(
({ field, label, table }) =>
({
......
src/views/order/operation-order/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/order/operation-work-order-detail/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/order/operation-work-order-detail/schema.ts
浏览文件 @ eb5953d4
......@@ -44,8 +44,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入ID系统自动生成！' }],
},
table: {
},
table: {},
},
{
field: 'distributorId',
......@@ -60,8 +59,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入经销商id！' }],
},
table: {
},
table: {},
},
{
field: 'operationWorkOrderId',
......@@ -76,8 +74,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入oms_operation_work_order.id！' }],
},
table: {
},
table: {},
},
{
field: 'goodsId',
......@@ -115,8 +112,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入名称！' }],
},
table: {
},
table: {},
},
{
field: 'goodsType',
......@@ -134,7 +130,7 @@ export const schema = {
},
table: {
customRender: ({ text }) => {
const option = GoodsTypeEnumOptions.find((item) => item.value === text)
const option = GoodsTypeEnumOptions.find((item) => item.value === text);
return option ? option.label : text;
},
},
......@@ -152,8 +148,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入单价！' }],
},
table: {
},
table: {},
},
{
field: 'discountPrice',
......@@ -168,8 +163,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入折扣价！' }],
},
table: {
},
table: {},
},
{
field: 'quantity',
......@@ -184,12 +178,11 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入数量！' }],
},
table: {
},
table: {},
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -202,12 +195,11 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入CreateTime！' }],
},
table: {
},
table: {},
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -220,18 +212,63 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入UpdateTime！' }],
},
table: {
},
table: {},
},
],
};
const queryFields = ['id','distributorId','operationWorkOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const editFields = ['distributorId','operationWorkOrderId','goodsId','name','goodsType','price','discountPrice','quantity'];
const tableFields = ['id','distributorId','operationWorkOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const descriptionFields = ['id','distributorId','operationWorkOrderId','goodsId','name','goodsType','price','discountPrice','quantity','createTime','updateTime'];
const queryFields = [
'id',
'distributorId',
'operationWorkOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
const editFields = [
'distributorId',
'operationWorkOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
];
const tableFields = [
'id',
'distributorId',
'operationWorkOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
const descriptionFields = [
'id',
'distributorId',
'operationWorkOrderId',
'goodsId',
'name',
'goodsType',
'price',
'discountPrice',
'quantity',
'createTime',
'updateTime',
];
export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
.map(
({ field, label, form: { rules = [], ...formProps } }) =>
({
......@@ -243,7 +280,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
} as FormSchema),
);
export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
.map(
({ field, label, defaultValue, form }) =>
({
......@@ -255,17 +293,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
} as FormSchema),
);
export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
.map(
({ field, label, table }) =>
({
dataIndex: field,
title: label,
...table,
} as BasicColumn)
} as BasicColumn),
);
export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
.map(
({ field, label, table }) =>
({
......
src/views/order/operation-work-order/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/product/goods-category-relation/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/product/product-goods-relation/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/product/product/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/product/product/schema.ts
浏览文件 @ eb5953d4
......@@ -10,7 +10,6 @@ import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import get from 'lodash.get';
const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } };
const colPropsInDrawer = { span: 24 };
......@@ -31,8 +30,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入ID系统自动生成！' }],
},
table: {
},
table: {},
},
{
field: 'distributorId',
......@@ -47,8 +45,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入经销商id！' }],
},
table: {
},
table: {},
},
{
field: 'thirdProductId',
......@@ -63,8 +60,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入第三方产品id！' }],
},
table: {
},
table: {},
},
{
field: 'remark',
......@@ -78,8 +74,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'editorId',
......@@ -94,8 +89,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入操作人ID！' }],
},
table: {
},
table: {},
},
{
field: 'editorName',
......@@ -110,12 +104,11 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入操作人！' }],
},
table: {
},
table: {},
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -128,12 +121,11 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入CreateTime！' }],
},
table: {
},
table: {},
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -146,18 +138,45 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入UpdateTime！' }],
},
table: {
},
table: {},
},
],
};
const queryFields = ['id','distributorId','thirdProductId','remark','editorId','editorName','createTime','updateTime'];
const editFields = ['distributorId','thirdProductId','remark'];
const tableFields = ['id','distributorId','thirdProductId','remark','editorId','editorName','createTime','updateTime'];
const descriptionFields = ['id','distributorId','thirdProductId','remark','editorId','editorName','createTime','updateTime'];
const queryFields = [
'id',
'distributorId',
'thirdProductId',
'remark',
'editorId',
'editorName',
'createTime',
'updateTime',
];
const editFields = ['distributorId', 'thirdProductId', 'remark'];
const tableFields = [
'id',
'distributorId',
'thirdProductId',
'remark',
'editorId',
'editorName',
'createTime',
'updateTime',
];
const descriptionFields = [
'id',
'distributorId',
'thirdProductId',
'remark',
'editorId',
'editorName',
'createTime',
'updateTime',
];
export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
.map(
({ field, label, form: { rules = [], ...formProps } }) =>
({
......@@ -169,7 +188,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
} as FormSchema),
);
export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
.map(
({ field, label, defaultValue, form }) =>
({
......@@ -181,17 +201,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
} as FormSchema),
);
export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
.map(
({ field, label, table }) =>
({
dataIndex: field,
title: label,
...table,
} as BasicColumn)
} as BasicColumn),
);
export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
.map(
({ field, label, table }) =>
({
......
src/views/system/distributor-product-line/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/distributor-product-line/schema.ts
浏览文件 @ eb5953d4
......@@ -10,7 +10,6 @@ import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import get from 'lodash.get';
const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } };
const colPropsInDrawer = { span: 24 };
......@@ -31,8 +30,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入ID系统自动生成！' }],
},
table: {
},
table: {},
},
{
field: 'distributorId',
......@@ -47,8 +45,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入经销商表id！' }],
},
table: {
},
table: {},
},
{
field: 'name',
......@@ -63,8 +60,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入名称！' }],
},
table: {
},
table: {},
},
{
field: 'thirdId',
......@@ -78,8 +74,7 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'remark',
......@@ -93,12 +88,11 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -111,12 +105,11 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入CreateTime！' }],
},
table: {
},
table: {},
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -129,18 +122,18 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入UpdateTime！' }],
},
table: {
},
table: {},
},
],
};
const queryFields = ['id','distributorId','name','thirdId','remark','createTime','updateTime'];
const editFields = ['distributorId','name','thirdId','remark'];
const tableFields = ['id','distributorId','name','thirdId','remark','createTime','updateTime'];
const descriptionFields = ['id','distributorId','name','thirdId','remark','createTime','updateTime'];
const queryFields = ['id', 'distributorId', 'name', 'thirdId', 'remark', 'createTime', 'updateTime'];
const editFields = ['distributorId', 'name', 'thirdId', 'remark'];
const tableFields = ['id', 'distributorId', 'name', 'thirdId', 'remark', 'createTime', 'updateTime'];
const descriptionFields = ['id', 'distributorId', 'name', 'thirdId', 'remark', 'createTime', 'updateTime'];
export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
.map(
({ field, label, form: { rules = [], ...formProps } }) =>
({
......@@ -152,7 +145,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
} as FormSchema),
);
export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
.map(
({ field, label, defaultValue, form }) =>
({
......@@ -164,17 +158,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
} as FormSchema),
);
export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
.map(
({ field, label, table }) =>
({
dataIndex: field,
title: label,
...table,
} as BasicColumn)
} as BasicColumn),
);
export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
.map(
({ field, label, table }) =>
({
......
src/views/system/distributor/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/distributor/schema.ts
浏览文件 @ eb5953d4
......@@ -44,8 +44,7 @@ export const schema = {
component: 'InputNumber',
rules: [{ required: true, message: '请输入ID系统自动生成！' }],
},
table: {
},
table: {},
},
{
field: 'name',
......@@ -60,8 +59,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入名称！' }],
},
table: {
},
table: {},
},
{
field: 'price',
......@@ -75,8 +73,7 @@ export const schema = {
colProps,
component: 'InputNumber',
},
table: {
},
table: {},
},
{
field: 'usedPrice',
......@@ -90,8 +87,7 @@ export const schema = {
colProps,
component: 'InputNumber',
},
table: {
},
table: {},
},
{
field: 'liablePeople',
......@@ -106,8 +102,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入负责人！' }],
},
table: {
},
table: {},
},
{
field: 'mobile',
......@@ -122,8 +117,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入联系方式！' }],
},
table: {
},
table: {},
},
{
field: 'address',
......@@ -138,8 +132,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入地址！' }],
},
table: {
},
table: {},
},
{
field: 'licenseNumber',
......@@ -154,8 +147,7 @@ export const schema = {
component: 'Input',
rules: [{ required: true, message: '请输入工商营业执照代码！' }],
},
table: {
},
table: {},
},
{
field: 'licensePic',
......@@ -170,8 +162,7 @@ export const schema = {
component: 'Upload',
rules: [{ required: true, message: '请输入工商营业执照图片！' }],
},
table: {
},
table: {},
},
{
field: 'licenseExpireTime',
......@@ -188,8 +179,7 @@ export const schema = {
},
rules: [{ required: true, message: '请输入有效期！' }],
},
table: {
},
table: {},
},
{
field: 'status',
......@@ -207,7 +197,7 @@ export const schema = {
},
table: {
customRender: ({ text }) => {
const option = StatusEnumOptions.find((item) => item.value === text)
const option = StatusEnumOptions.find((item) => item.value === text);
return option ? option.label : text;
},
},
......@@ -224,12 +214,11 @@ export const schema = {
colProps,
component: 'Input',
},
table: {
},
table: {},
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -242,12 +231,11 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入CreateTime！' }],
},
table: {
},
table: {},
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -260,18 +248,74 @@ export const schema = {
component: 'RangePicker',
rules: [{ required: true, message: '请输入UpdateTime！' }],
},
table: {
},
table: {},
},
],
};
const queryFields = ['id','name','price','usedPrice','liablePeople','mobile','address','licenseNumber','licenseExpireTime','status','remark','createTime','updateTime'];
const editFields = ['name','price','usedPrice','liablePeople','mobile','address','licenseNumber','licensePic','licenseExpireTime','status','remark'];
const tableFields = ['id','name','price','usedPrice','liablePeople','mobile','address','licenseNumber','licensePic','licenseExpireTime','status','remark','createTime','updateTime'];
const descriptionFields = ['id','name','price','usedPrice','liablePeople','mobile','address','licenseNumber','licensePic','licenseExpireTime','status','remark','createTime','updateTime'];
const queryFields = [
'id',
'name',
'price',
'usedPrice',
'liablePeople',
'mobile',
'address',
'licenseNumber',
'licenseExpireTime',
'status',
'remark',
'createTime',
'updateTime',
];
const editFields = [
'name',
'price',
'usedPrice',
'liablePeople',
'mobile',
'address',
'licenseNumber',
'licensePic',
'licenseExpireTime',
'status',
'remark',
];
const tableFields = [
'id',
'name',
'price',
'usedPrice',
'liablePeople',
'mobile',
'address',
'licenseNumber',
'licensePic',
'licenseExpireTime',
'status',
'remark',
'createTime',
'updateTime',
];
const descriptionFields = [
'id',
'name',
'price',
'usedPrice',
'liablePeople',
'mobile',
'address',
'licenseNumber',
'licensePic',
'licenseExpireTime',
'status',
'remark',
'createTime',
'updateTime',
];
export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
.map(
({ field, label, form: { rules = [], ...formProps } }) =>
({
......@@ -283,7 +327,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
} as FormSchema),
);
export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
.map(
({ field, label, defaultValue, form }) =>
({
......@@ -295,17 +340,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
} as FormSchema),
);
export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
.map(
({ field, label, table }) =>
({
dataIndex: field,
title: label,
...table,
} as BasicColumn)
} as BasicColumn),
);
export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
.map(
({ field, label, table }) =>
({
......
src/views/system/doctor/detail.vue
浏览文件 @ eb5953d4
......@@ -45,10 +45,14 @@
const displayProps: ComputedRef<Array<any>> = computed(() => {
if (!data.isOver) return {};
console.log('descriptionColumns', descriptionColumns);
console.log('data.detail11', data.detail);
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/doctor/index.vue
浏览文件 @ eb5953d4
......@@ -24,12 +24,10 @@
</a-alert>
</template>
<template #toolbar>
<a-button v-auth="'AUTH_SYSTEM_DOCTOR:ADD'" type="primary" @click="handleCreate"> 新增</a-button>
<a-button v-auth="'AUTH_SYSTEM_DOCTOR:ADD'" type="primary" @click="handleCreate"> 新增医生</a-button>
<a-button v-auth="'AUTH_SYSTEM_DOCTOR:IMPORT'" type="primary" @click="handleImport"> 批量导入医生</a-button>
</template>
<template #bodyCell="{ column, record, text }">
<template v-if="column.dataIndex === 'id'">
<a @click="handleView(record)"> {{ record.id }} </a>
</template>
<template v-if="[].includes(column.dataIndex)">
<img :src="text" class="photo" alt="图片" v-if="!!text" />
</template>
......@@ -42,6 +40,11 @@
onClick: handleEdit.bind(null, record),
ifShow: hasPermission('AUTH_SYSTEM_DOCTOR:EDIT'),
},
{
tooltip: '详情',
icon: 'ant-design:eye-outlined',
onClick: handleView.bind(null, record),
},
{
tooltip: '删除',
icon: 'ant-design:delete-outlined',
......@@ -104,7 +107,7 @@
canResize: false,
rowKey: (record: any) => record.id,
actionColumn: {
width: 80,
width: 120,
title: '操作',
dataIndex: 'action',
......@@ -136,6 +139,9 @@
return handledParams;
};
//todo 医生管理-批量导入医生
const handleImport = () => {};
const handleCreate = () => {
openDrawer(true, {
isUpdate: false,
......@@ -166,6 +172,6 @@
};
const handleView = (record) => {
go('/system/doctor/' + record.id);
go('/main/system/doctor/' + record.id);
};
</script>
src/views/system/doctor/schema.ts
浏览文件 @ eb5953d4
......@@ -8,9 +8,7 @@
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import get from 'lodash.get';
import * as HospitalApi from '/@/api/system/hospitalApi';
import { getDistributorId } from '/@/commonSchemaProperty';
import { getDistributorId, getHospitalId } from '/@/commonSchemaProperty';
export enum SexEnum {
MALE = '男',
......@@ -60,29 +58,7 @@ export const schema = {
table: {},
},
getDistributorId({ colProps }),
{
field: 'hospitalId',
label: '医院id',
defaultValue: undefined,
form: {
componentProps: {
labelInValue: true,
api: HospitalApi.all,
params: {},
resultField: 'records',
labelField: 'name',
valueField: 'id',
allowClear: false,
placeholder: '医院id',
},
colProps,
component: 'ApiSelect',
rules: [{ required: true, type: 'object', message: '请输入医院id！' }],
},
table: {
customRender: ({ text, record }) => get(record, 'hospital.name') || text,
},
},
getHospitalId({ colProps }),
{
field: 'name',
label: '医生名称',
......@@ -110,7 +86,7 @@ export const schema = {
},
colProps,
component: 'Select',
rules: [{ required: true, message: '请输入性别！' }],
rules: [{ required: false, message: '请输入性别！' }],
},
table: {
customRender: ({ text }) => {
......@@ -130,7 +106,7 @@ export const schema = {
},
colProps,
component: 'Input',
rules: [{ required: true, message: '请输入手机号！' }],
rules: [{ required: false, message: '请输入手机号！' }],
},
table: {},
},
......@@ -229,7 +205,7 @@ export const schema = {
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -246,7 +222,7 @@ export const schema = {
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -280,7 +256,7 @@ const queryFields = [
'createTime',
'updateTime',
];
const editFields = ['distributorId', 'hospitalId', 'name', 'sex', 'mobile', 'code', 'job', 'bed', 'status'];
const editFields = ['hospitalId', 'name', 'sex', 'mobile', 'code', 'job', 'bed'];
const tableFields = [
'id',
'distributorId',
......
src/views/system/hospital/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/hospital/index.vue
浏览文件 @ eb5953d4
......@@ -28,9 +28,6 @@
<a-button v-auth="'AUTH_SYSTEM_HOSPITAL:IMPORT'" type="primary" @click="handleImport"> 批量导入医院</a-button>
</template>
<template #bodyCell="{ column, record, text }">
<template v-if="column.dataIndex === 'id'">
<a @click="handleView(record)"> {{ record.id }} </a>
</template>
<template v-if="['licensePic'].includes(column.dataIndex)">
<img :src="text" class="photo" alt="图片" v-if="!!text" />
</template>
......@@ -47,7 +44,6 @@
tooltip: '详情',
icon: 'ant-design:eye-outlined',
onClick: handleView.bind(null, record),
// ifShow: hasPermission('AUTH_SYSTEM_HOSPITAL:DETAIL'),
},
{
tooltip: '删除',
......
src/views/system/hospital/schema.ts
浏览文件 @ eb5953d4
......@@ -303,7 +303,7 @@ export const schema = {
};
const queryFields = [
'distributorId',
// 'distributorId',
'name',
'abbreviationName',
'code',
......@@ -315,7 +315,7 @@ const queryFields = [
'licenseNumber',
'licenseExpireTime',
'status',
'editorId',
// 'editorId',
'editorName',
'createTime',
'updateTime',
......@@ -335,7 +335,7 @@ const editFields = [
'status',
];
const tableFields = [
'distributorId',
// 'distributorId',
'name',
'abbreviationName',
'code',
......@@ -348,14 +348,14 @@ const tableFields = [
'licensePic',
'licenseExpireTime',
'status',
'editorId',
// 'editorId',
'editorName',
'createTime',
'updateTime',
];
const descriptionFields = [
'id',
'distributorId',
// 'distributorId',
'name',
'abbreviationName',
'code',
......
src/views/system/receiver/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/receiver/schema.ts
浏览文件 @ eb5953d4
......@@ -6,23 +6,23 @@
* @Date: 2022-06-28 11:50:00
*/
import { BasicColumn } from '/@/components/Table'
import { FormSchema } from '/@/components/Table'
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
export enum YesNoEnum {
YES = '是',
NO = '否',
}
export const YesNoEnumOptions: any[] = []
export const YesNoEnumOptions: any[] = [];
for (const key in YesNoEnum) {
YesNoEnumOptions.push({
value: key,
label: YesNoEnum[key],
})
});
}
const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } }
const colPropsInDrawer = { span: 24 }
const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } };
const colPropsInDrawer = { span: 24 };
export const schema = {
model: 'Receiver',
......@@ -129,8 +129,8 @@ export const schema = {
},
table: {
customRender: ({ text }) => {
const option = YesNoEnumOptions.find((item) => item.value === text)
return option ? option.label : text
const option = YesNoEnumOptions.find((item) => item.value === text);
return option ? option.label : text;
},
},
},
......@@ -180,7 +180,7 @@ export const schema = {
},
{
field: 'createTime',
label: 'CreateTime',
label: '创建时间',
defaultValue: undefined,
form: {
colProps,
......@@ -197,7 +197,7 @@ export const schema = {
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......@@ -213,7 +213,7 @@ export const schema = {
table: {},
},
],
}
};
const queryFields = [
'id',
......@@ -227,8 +227,8 @@ const queryFields = [
'editorName',
'createTime',
'updateTime',
]
const editFields = ['distributorId', 'logisticsMode', 'receiveName', 'receivePhone', 'address', 'status', 'remark']
];
const editFields = ['distributorId', 'logisticsMode', 'receiveName', 'receivePhone', 'address', 'status', 'remark'];
const tableFields = [
'id',
'distributorId',
......@@ -242,7 +242,7 @@ const tableFields = [
'editorName',
'createTime',
'updateTime',
]
];
const descriptionFields = [
'id',
'distributorId',
......@@ -256,7 +256,7 @@ const descriptionFields = [
'editorName',
'createTime',
'updateTime',
]
];
export const searchFormSchema: FormSchema[] = schema.properties
.filter((item) => queryFields.includes(item.field))
......@@ -269,7 +269,7 @@ export const searchFormSchema: FormSchema[] = schema.properties
rules: rules.filter((r) => !r.required),
...formProps,
} as FormSchema),
)
);
export const formSchema: FormSchema[] = schema.properties
.filter((item) => editFields.includes(item.field))
......@@ -282,7 +282,7 @@ export const formSchema: FormSchema[] = schema.properties
...form,
colProps: colPropsInDrawer,
} as FormSchema),
)
);
export const columns: BasicColumn[] = schema.properties
.filter((item) => tableFields.includes(item.field))
......@@ -293,7 +293,7 @@ export const columns: BasicColumn[] = schema.properties
title: label,
...table,
} as BasicColumn),
)
);
export const descriptionColumns: BasicColumn[] = schema.properties
.filter((item) => descriptionFields.includes(item.field))
......@@ -304,4 +304,4 @@ export const descriptionColumns: BasicColumn[] = schema.properties
title: label,
...table,
} as BasicColumn),
)
);
src/views/system/role-authority/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/setting/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/user-role/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/user/detail.vue
浏览文件 @ eb5953d4
......@@ -48,7 +48,9 @@
const display: any = descriptionColumns.map(({ title, dataIndex = '', customRender }) => ({
key: dataIndex,
title,
value: customRender ? customRender(data.detail[dataIndex], data.detail) : data.detail[dataIndex],
value: customRender
? customRender({ text: data.detail[dataIndex], record: data.detail })
: data.detail[dataIndex],
}));
return display;
});
......
src/views/system/user/schema.ts
浏览文件 @ eb5953d4
......@@ -8,9 +8,8 @@
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import get from 'lodash.get';
import * as RoleApi from '/@/api/system/roleApi';
import * as DistributorApi from '/@/api/system/distributorApi';
import { getDistributorId } from '/@/commonSchemaProperty';
export enum StatusEnum {
PENDING_REVIEW = '待审核',
......@@ -59,29 +58,7 @@ export const schema = {
},
table: {},
},
{
field: 'distributorId',
label: '经销商',
defaultValue: undefined,
form: {
componentProps: {
labelInValue: true,
api: DistributorApi.all,
params: {},
resultField: 'records',
labelField: 'name',
valueField: 'id',
allowClear: false,
placeholder: '经销商',
},
colProps,
component: 'ApiSelect',
rules: [{ required: true, type: 'object', message: '请选择经销商！' }],
},
table: {
customRender: ({ text, record }) => get(record, 'distributor.name') || text,
},
},
getDistributorId({ colProps }),
{
field: 'username',
label: '用户名',
......@@ -264,7 +241,7 @@ export const schema = {
},
{
field: 'updateTime',
label: 'UpdateTime',
label: '更新时间',
defaultValue: undefined,
form: {
colProps,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论