Merge branch 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-admin into develop

* 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-admin:
  fix：细节修复

# Conflicts:
#	src/pages/company/list/show/$id.tsx

src/pages/common/positions/index.tsx

@@ -43,11 +43,11 @@ export default function Index({ title = '岗位库' }) {
             dataIndex: 'name',
             width: 200,
           },
-          {
-            title: '岗位编号',
-            dataIndex: 'code',
-            width: 200,
-          },
+          // {
+          //   title: '岗位编号',
+          //   dataIndex: 'code',
+          //   width: 200,
+          // },
           {
             title: '岗位说明',
             dataIndex: 'remark',

src/pages/common/positions/modals/Create.tsx

@@ -45,12 +45,12 @@ export default function Create(props: MyBetaModalFormProps) {
           colProps: { span: 24 },
           formItemProps: { ...rulesHelper.text },
         },
-        {
-          key: 'code',
-          title: '岗位编号',
-          colProps: { span: 24 },
-          formItemProps: { ...rulesHelper.text },
-        },
+        // {
+        //   key: 'code',
+        //   title: '岗位编号',
+        //   colProps: { span: 24 },
+        //   formItemProps: { ...rulesHelper.text },
+        // },
         {
           key: 'remark',
           title: '岗位说明',

src/pages/common/positions/modals/Update.tsx

@@ -46,12 +46,12 @@ export default function Update(props: MyBetaModalFormProps) {
           colProps: { span: 24 },
           formItemProps: { ...rulesHelper.text },
         },
-        {
-          key: 'code',
-          title: '岗位编号',
-          colProps: { span: 24 },
-          formItemProps: { ...rulesHelper.text },
-        },
+        // {
+        //   key: 'code',
+        //   title: '岗位编号',
+        //   colProps: { span: 24 },
+        //   formItemProps: { ...rulesHelper.text },
+        // },
         {
           key: 'remark',
           title: '岗位说明',

src/pages/company/apps/modals/AppCreate.tsx

@@ -63,7 +63,7 @@ export default function Create(props: MyBetaModalFormProps) {
           name: ['app_type'],
           valueType: 'dependency',
           columns: ({ app_type }: any) => {
-            return app_type === 'MiniProgram'
+            return app_type !== 'MpOfficial'
               ? [
                   MyFormItems.EnumRadio({
                     key: 'module',

src/pages/company/employees/modals/EmployeeCreate.tsx

@@ -35,7 +35,7 @@ export default function Create(props: MyBetaModalFormProps) {
         })
           .then(() => {
             props.reload?.();
-            message.success('编辑成功');
+            message.success('添加成功');
             return true;
           })
           .catch(() => false)

src/pages/company/organizations/modals/OrganizationCreate.tsx

@@ -31,7 +31,7 @@ export default function Create(props: MyBetaModalFormProps) {
       onFinish={async (values: any) =>
         Apis.Company.Organizations.Store({
           ...values,
-          companies_id: values?.companies_id || props?.item?.companies_id,
+          companies_id: values?.companies_id || props?.item?.id,
           parent_id: values?.parent_id?.[values.parent_id.length - 1],
         })
           .then(() => {