dev-cl^2
qsh 1 week ago
parent e3ccfd9721
commit 240224823e
  1. 4
      .env.base
  2. 4
      src/hooks/web/useCrudSchemas.ts
  3. 3
      src/views/Clue/Order/Comp/DialogOrder.vue

@ -4,8 +4,8 @@ VITE_NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
VITE_BASE_URL='http://47.98.161.246:48080' # VITE_BASE_URL='http://47.98.161.246:48080'
# VITE_BASE_URL='http://114.215.207.150:48080' VITE_BASE_URL='http://114.215.207.150:48080'
# 高德地图key密钥 # 高德地图key密钥
# 1寻驾 # 1寻驾

@ -266,7 +266,6 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
// 过滤 descriptions 结构 // 过滤 descriptions 结构
const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[] => { const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[] => {
const descriptionsSchema: FormSchema[] = [] const descriptionsSchema: FormSchema[] = []
eachTree(crudSchema, (schemaItem: CrudSchema) => { eachTree(crudSchema, (schemaItem: CrudSchema) => {
// 判断是否显示 // 判断是否显示
if (schemaItem?.isDetail !== false && schemaItem.detail?.show !== false) { if (schemaItem?.isDetail !== false && schemaItem.detail?.show !== false) {
@ -275,6 +274,9 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
field: schemaItem.field, field: schemaItem.field,
label: schemaItem.detail?.label || schemaItem.label label: schemaItem.detail?.label || schemaItem.label
} }
if (schemaItem.form?.component == 'Editor') {
descriptionsSchemaItem.span = 2
}
if (schemaItem.dictType) { if (schemaItem.dictType) {
descriptionsSchemaItem.dictType = schemaItem.dictType descriptionsSchemaItem.dictType = schemaItem.dictType
} }

@ -198,13 +198,14 @@ function getFields() {
if (it.label.includes('日期')) { if (it.label.includes('日期')) {
it.dateFormat = 'YYYY-MM-DD' it.dateFormat = 'YYYY-MM-DD'
} }
if (it.field == 'receivedMoney') { if (it.field == 'receivedMoney') {
checkPermi(['clue:order:return-list']) && arr.push(it) checkPermi(['clue:order:return-list']) && arr.push(it)
} else { } else {
arr.push(it) arr.push(it)
} }
}) })
if (arr.length % 2 != 0) { if (arr.filter((item) => item.span != 2).length % 2 != 0) {
arr.push({}) arr.push({})
} }
orderSchema.value = [ orderSchema.value = [

Loading…
Cancel
Save