自动填充组件api搜索

代码生成路径大小写修正
折叠组件样式修改
信息体组件可带出部门
详情页子表样式调整：按钮下移
栅格字段栅格数配置不生效
自动编号页面样式修正、增加编号配置可排序用于修改编号配置生成规则、修正自动编号编辑缺陷
列表页样式修正
详情页按钮间距修正

src/views/dataconfig/codeRule/components/CodeModal.vue

@@ -87,13 +87,18 @@
     {
       title: t('步长'),
       dataIndex: 'stepValue',
-      width: 120,
+      width: 100,
     },
     {
       title: t('初始值'),
       dataIndex: 'initValue',
-      width: 120,
+      width: 100,
     },
+      {
+          title: t('排序'),
+          dataIndex: 'sortNum',
+          width: 100,
+      },
     {
       title: t('说明'),
       dataIndex: 'description',
@@ -128,7 +133,13 @@
       setFieldsValue({
         ...record,
       });
-      setTableData(JSON.parse({ ...record }.formatJson));
+      let datas=JSON.parse({ ...record }.formatJson);
+      datas.forEach((data)=>{
+          if(!data.sortNum){
+              data.sortNum=0;
+          }
+      });
+      setTableData(datas);
     } else {
       setTableData([]);
     }
@@ -147,6 +158,10 @@
       dataIndex: 'action',
       slots: { customRender: 'action' },
     },
+      formConfig: {
+          showResetButton: false,
+          showSubmitButton: false
+      }
   });
 
   const getTitle = computed(() => (!unref(isUpdate) ? t('新增单据编码') : t('编辑单据编码')));
@@ -154,7 +169,11 @@
   async function handleSubmit() {
     try {
       const values = await validate();
-      values.formatJson = JSON.stringify(getDataSource());
+      let data=getDataSource();
+      data.sort((a,b)=>{
+         return a.sortNum-b.sortNum;
+      });
+      values.formatJson = JSON.stringify(data);
       setModalProps({ confirmLoading: true });
       if (values.formatJson === '[]') {
         notification.warning({

src/views/dataconfig/codeRule/components/RuleModal.vue

@@ -173,6 +173,15 @@
         return values.itemType === '2' ? [{ required: true, message: t('请输入初始') }] : [];
       },
     },
+      {
+          field: 'sortNum',
+          label: t('排序'),
+          component: 'InputNumber',
+          colProps: { span: 24 },
+          componentProps: {
+              allowClear: false,
+          },
+      },
     {
       field: 'description',
       label: t('说明'),
@@ -206,6 +215,8 @@
       rowId.value = data.record.key;
 
       const val = data.record.itemType;
+      itemTypeName.value=data.record.itemTypeName;
+      formatStr.value=data.record.formatStr;
       if (val !== '0') {
         formatStrOptions = val ? formatStrOptionsData[val] : [];
         updateSchema({
@@ -258,8 +269,8 @@
         isUpdate: unref(isUpdate),
         record: {
           ...values,
-          itemTypeName: unref(itemTypeName),
-          formatStr: unref(formatStr),
+            itemTypeName:unref(itemTypeName),
+            formatStr:unref(formatStr),
           key: rowId.value,
         },
       });

src/views/dataconfig/codeRule/index.vue

@@ -113,7 +113,7 @@
         gutter: 16,
       },
       schemas: searchFormSchema,
-      showResetButton: false,
+      showResetButton: false
     },
     useSearchForm: true,
     striped: false,

src/views/secondDev/formCreatePage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page-bg-wrap">
         <div class="top-toolbar">
-            <a-space :size="10" wrap>
+            <a-space :size="10" wrap style="gap:0">
                 <a-button style="margin-right: 10px" @click="close">
                     <slot name="icon">
                         <close-outlined />

src/views/workflow/task/components/ApprovalProcess.vue

@@ -404,7 +404,7 @@
           circulateConfigs: approvalData.circulateConfigs,
           stampId: values.stampId,
           stampPassword: values.password,
-          isOldSystem: system,
+          isOldSystem: system
         };
         let res = await postApproval(params);
         // 下一节点审批人