diff --git a/src/layouts/default/header/components/notify/index.vue b/src/layouts/default/header/components/notify/index.vue index 795f834..2084819 100644 --- a/src/layouts/default/header/components/notify/index.vue +++ b/src/layouts/default/header/components/notify/index.vue @@ -121,7 +121,7 @@ class="opr" style=" color: #02a7f0;" :to="{ - path: item.key=='1'? '/oaNews':'/OaNotice', + path: item.key=='1'? '/dataconfig/oaNews/news':'/system/systemNotice/index', }" > diff --git a/src/views/price/PriceSalesPngApp/components/config.ts b/src/views/price/PriceSalesPngApp/components/config.ts index ca40b17..802956c 100644 --- a/src/views/price/PriceSalesPngApp/components/config.ts +++ b/src/views/price/PriceSalesPngApp/components/config.ts @@ -25,7 +25,15 @@ export const searchFormSchema: FormSchema[] = [ { field: 'approCode', label: '审批状态', - component: 'Input', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '1990669393069129729' }, + labelField: 'name', + valueField: 'value', + + getPopupContainer: () => document.body, + }, }, ]; @@ -41,7 +49,7 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'priceTypeCode', + dataIndex: 'priceTypeName', title: '定价类型', componentType: 'input', align: 'left', diff --git a/src/views/price/PriceSalesPngApp/index.vue b/src/views/price/PriceSalesPngApp/index.vue index 7185b57..99cbaf8 100644 --- a/src/views/price/PriceSalesPngApp/index.vue +++ b/src/views/price/PriceSalesPngApp/index.vue @@ -472,4 +472,12 @@ .hide{ display: none !important; } + +:deep( .ant-col-8:nth-child(1)) { + width: 320px !important; + max-width: 320px !important;; +} +:deep(.ant-col-8:nth-child(1) .ant-form-item-label) { + width: 80px !important; +} \ No newline at end of file diff --git a/src/views/ship/MeaPurInt/index.vue b/src/views/ship/MeaPurInt/index.vue index d3b35ad..74d250e 100644 --- a/src/views/ship/MeaPurInt/index.vue +++ b/src/views/ship/MeaPurInt/index.vue @@ -124,7 +124,7 @@ }, ], - fieldMapToTime: [], + fieldMapToTime: [['dateEta', ['startDate', 'endDate'], 'YYYY-MM-DD']], showResetButton: true, }, immediate: false,