diff --git a/.env.base b/.env.base index a8c77b2..1c695ec 100644 --- a/.env.base +++ b/.env.base @@ -4,8 +4,8 @@ VITE_NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://47.98.161.246:48080' -# VITE_BASE_URL='http://114.215.207.150:48080' +# VITE_BASE_URL='http://47.98.161.246:48080' +VITE_BASE_URL='http://114.215.207.150:48080' # 高德地图key密钥 # 1寻驾 diff --git a/src/hooks/web/useCrudSchemas.ts b/src/hooks/web/useCrudSchemas.ts index 2050aaf..5708a67 100644 --- a/src/hooks/web/useCrudSchemas.ts +++ b/src/hooks/web/useCrudSchemas.ts @@ -266,7 +266,6 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For // 过滤 descriptions 结构 const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[] => { const descriptionsSchema: FormSchema[] = [] - eachTree(crudSchema, (schemaItem: CrudSchema) => { // 判断是否显示 if (schemaItem?.isDetail !== false && schemaItem.detail?.show !== false) { @@ -275,6 +274,9 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[ field: schemaItem.field, label: schemaItem.detail?.label || schemaItem.label } + if (schemaItem.form?.component == 'Editor') { + descriptionsSchemaItem.span = 2 + } if (schemaItem.dictType) { descriptionsSchemaItem.dictType = schemaItem.dictType } diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue index 656d59d..bb71ec7 100644 --- a/src/views/Clue/Order/Comp/DialogOrder.vue +++ b/src/views/Clue/Order/Comp/DialogOrder.vue @@ -198,13 +198,14 @@ function getFields() { if (it.label.includes('日期')) { it.dateFormat = 'YYYY-MM-DD' } + if (it.field == 'receivedMoney') { checkPermi(['clue:order:return-list']) && arr.push(it) } else { arr.push(it) } }) - if (arr.length % 2 != 0) { + if (arr.filter((item) => item.span != 2).length % 2 != 0) { arr.push({}) } orderSchema.value = [