tangning 1 năm trước cách đây
mục cha
commit
1b483c7644

+ 3 - 1
src/design/theme.less

@@ -26,7 +26,9 @@ html[data-theme='light'] {
     background-color: @layout-body-background !important;
   }
 }
-
+// .ant-select-selector{
+//   max-width: 249px;
+// }
 [data-theme='dark'] {
   .text-secondary {
     color: #8b949e;

+ 1 - 0
src/locales/lang/en/code.ts

@@ -35,6 +35,7 @@ export default {
     '50054': 'Scene calculation in process, cannot be copied!',
     '50055': 'Replicated scenes do not enable transfer.',
     '50056': 'Duplicated scenes do not support recalculation.',
+    '50066': 'The original resource has been frozen, recalculation failed!',
     '50071': 'Duplicated scenes do not support recalculation.',
     '5037': 'Calculating,please wait.',
   },

+ 1 - 0
src/locales/lang/zh-CN/code.ts

@@ -35,6 +35,7 @@ export default {
     '50055': '复制的场景不支持迁移',
     '50056': '复制的场景不支持重算!',
     '50034': 'sn码不存在!',
+    '50066': '原始资源已冻结,重算失败!',
     '50071': '复制的场景不支持重算!',
     '5037': '场景正在计算中,请待计算完成后再操作。',
   },

+ 21 - 17
src/views/finance/data.tsx

@@ -87,23 +87,6 @@ export const searchForm: Partial<FormProps> = {
   labelWidth: isEn.value ? 140 : 100,
   schemas: [
     {
-      field: 'subAgentId',
-      component: 'ApiSelect',
-      label: t('routes.finance.agentName'),
-      componentProps: {
-        maxLength: 50,
-        api: getSubAgent,
-        numberToString: true,
-        labelField: 'name',
-        valueField: 'id',
-        immediate: true,
-      },
-      colProps: {
-        xl: 8,
-        xxl: 8,
-      },
-    },
-    {
       field: 'type',
       label: t('routes.equity.Type'),
       component: 'ApiSelect',
@@ -174,6 +157,27 @@ export const searchForm: Partial<FormProps> = {
       },
     },
     {
+      field: 'subAgentId',
+      component: 'ApiSelect',
+      label: t('routes.finance.agentName'),
+      componentProps: {
+        maxLength: 50,
+        api: getSubAgent,
+        numberToString: true,
+        labelField: 'name',
+        valueField: 'id',
+        immediate: true,
+        params: {
+          type: 1,
+        },
+        style: 'max-width: 250px',
+      },
+      colProps: {
+        xl: 8,
+        xxl: 8,
+      },
+    },
+    {
       field: 'timeList',
       label: t('routes.equity.timeList'),
       component: 'RangePicker',