fix: 增加字典许&下拉支持搜索

sanmu
1 parent d68f5b09
Showing 12 changed files with 34 additions and 24 deletions
src/api/sys/config.ts
src/store/modules/order.ts
src/views/project/account/index.vue
src/views/project/config/TablePanel.vue
src/views/project/order/FieldDetail.vue
src/views/project/order/FormDetail/BaseFormPanel.vue
src/views/project/order/FormDetail/InspectionFormPanel.vue
src/views/project/order/FormDetail/ProfitFormPanel.vue
src/views/project/order/FormDetail/ReportFormPanel.vue
src/views/project/order/FormDetail/TrackFormPanel.vue
src/views/project/order/index.vue
src/views/project/order/tableData.tsx
@@ -11,8 +11,8 @@ enum Api {
   DELETE = '/order/erp/system_setting/delete_by_id',
 }
-export function getList(params: LoginParams, mode: ErrorMessageMode = 'modal') {
-  return defHttp.post<LoginResultModel>(
+export async function getList(params: LoginParams, mode: ErrorMessageMode = 'modal') {
+  const res = await defHttp.post<LoginResultModel>(
     {
       url: Api.LIST,
       params,
@@ -21,6 +21,12 @@ export function getList(params: LoginParams, mode: ErrorMessageMode = &#39;modal&#39;) {
       errorMessageMode: mode,
     },
   );
+
+  return new Promise((resolve) => {
+    resolve({
+      items: res?.sort((a, b) => a.settingValue.localeCompare(b.settingValue)) || [],
+    });
+  });
 }
 export function saveConfig(params: LoginParams) {
   return defHttp.post<LoginResultModel>(
@@ -89,11 +89,19 @@ export const useOrderStore = defineStore({
     /**
      * @description: login
      */
-    async getDict(): Promise<GetUserInfoModel | null> {
+    async getDict() {
       try {
         const data = await getInitDictData();
+        const newData = groupBy(data, 'dictCode');
+        // 遍历对象的每个键
+        Object.keys(newData).forEach((key) => {
+          // 对每个数组按照字典序排序
+          newData[key].sort((x, y) => {
+            return x.dictValue.localeCompare(y.dictValue);
+          });
+        });
-        this.dicts = groupBy(data, 'dictCode');
+        this.dicts = newData;
       } catch (error) {
         return Promise.reject(error);
       }
@@ -15,8 +15,8 @@
               //   onClick: handleView.bind(null, record),
               // },
               {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑用户资料',
+                label: '编辑',
+                // tooltip: '编辑用户资料',
                 onClick: handleEdit.bind(null, record),
               },
               // {
@@ -34,8 +34,8 @@
   const [registerTable, { reload }] = useTable({
     api: getList,
-    searchInfo: props.searchInfo,
-
+    searchInfo: { ...props.searchInfo, pageSize: 1000 },
+    pagination: false,
     columns: COLUMNS[props.column!],
     rowKey: 'id',
     actionColumn: {
@@ -116,7 +116,10 @@
         setTimeout(async () => {
           const res = await dictList({ dictCode: key.value });
-          dataSource.value = res.records;
+          dataSource.value =
+            res.records?.sort((x, y) => {
+              return x.dictValue.localeCompare(y.dictValue);
+            }) || [];
           reload();
         }, 300);
       }
@@ -48,11 +48,6 @@
         // businessPerson,
       } = useOrderInfo(orderStore);
-      console.log(
-        '%c [ productionDepartment ]-57',
-        'font-size:13px; background:pink; color:#bf2c9f;',
-        productionDepartment,
-      );
       var schemas = computed(() => {
         const options = {
@@ -95,17 +90,11 @@
             };
           }
-          console.log(
-            '%c [  ]-98',
-            'font-size:13px; background:pink; color:#bf2c9f;',
-            item.field,
-            options[item.field],
-          );
-
           return {
             ...item,
             field: `${item.field}`,
             componentProps: {
+              ...(item.component === 'Select' && { showSearch: true }),
               ...(item.component === 'Select' && { options: options[item.field] }),
               disabled: getBaseDisable(item.field, get(fields.value, `${item.field}`), props.id),
             },
@@ -37,6 +37,7 @@
           return {
             ...item,
             componentProps: {
+              ...(item.component === 'Select' && { showSearch: true }),
               ...(item.component === 'Select' && { options: options[item.field] }),
               disabled: getDisable(
                 get(fields.value, item.field),
@@ -42,6 +42,7 @@
             field: `${item.field}`,
             componentProps: {
               ...item.componentProps,
+              ...(item.component === 'Select' && { showSearch: true }),
               ...(item.component === 'Select' &&
                 !item.componentProps?.options?.length && { options: options[item.field] }),
               disabled: getProfitDisable(
@@ -50,6 +50,7 @@
             ...item,
             field: `${item.field}`,
             componentProps: {
+              ...(item.component === 'Select' && { showSearch: true }),
               ...(item.component === 'Select' && { options: options[optionsField] }),
               disabled: getDisable(
                 get(fields.value, `${item.field}`),
@@ -30,6 +30,7 @@
           ...item,
           componentProps: {
             ...item.componentProps,
+            ...(item.component === 'Select' && { showSearch: true }),
             disabled: getDisable(
               get(fields.value, `${item.field}`),
               props.id,
@@ -5,7 +5,7 @@
         <!-- <template v-if="column.key === 'address1'">
           <span class="flex items-center justify-center"> 自定义字段列11 </span>
         </template> -->
-        <template v-if="SELECT_FIELD_COLUMNS.includes(column.key)">
+        <template v-if="SELECT_FIELD_COLUMNS.includes(column.key) && role === ROLE.ADMIN">
           <span class="flex items-center justify-center">
             {{ column.customTitle }}
             <FormOutlined class="ml-2 cursor-pointer" @click="handleFieldVisible(column)" />
@@ -1254,7 +1254,7 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
       },
       {
         field: `productionDepartmentConsignStartTime`,
-        label: `生成科拖货开始时间`,
+        label: `生产科拖货开始时间`,
         component: 'DatePicker',
         colProps: {
           span: 6,
@@ -1263,7 +1263,7 @@ export function getFormConfig(): Partial&lt;FormProps&gt; {
       },
       {
         field: `productionDepartmentConsignEndTime`,
-        label: `生成科拖货结束时间`,
+        label: `生产科拖货结束时间`,
         component: 'DatePicker',
         colProps: {
           span: 6,