Merge pull request 'fix：更新优化' (#27) from develop into main

Reviewed-on: #27

.umirc.ts

@@ -17,8 +17,8 @@ export default defineConfig({
   },
   proxy: {
     '/api/': {
-      // target: 'http://10.39.13.78:8002/',
+      target: 'http://10.39.13.78:8002/',
-      target: 'http://test-company.linyikj.com.cn/',
+      // target: 'http://test-company.linyikj.com.cn/',
       // target: 'https://company.linyikj.com.cn/',
       changeOrigin: true,
       pathRewrite: { '^': '' },

src/common/components/schema/MyColumns.tsx

@@ -243,7 +243,7 @@ export const MyColumns = {
       ...rest,
     };
   },
-  EnumTag({ ...rest }: ReturnType): ReturnType {
+  EnumTag({ ...rest }: ReturnType & { is_color?: boolean }): ReturnType {
     return {
       align: 'left',
       renderText(text: any) {
@@ -255,9 +255,17 @@ export const MyColumns = {
         //颜色底，白字
         // return <Tag color={item?.color}>{item.text}</Tag>;
         //灰底，颜色字
+        if (rest?.is_color) {
+          return (
+            <Tag style={{ backgroundColor: item?.color, color: '#fff' }}>
+              {item.text}
+            </Tag>
+          );
+        } else {
+          return <Tag style={{ color: '#333' }}>{item.text}</Tag>;
+        }
         // return <Tag style={{ backgroundColor: item?.color }}>{item.text}</Tag>;
         //灰底，黑字
-        return <Tag style={{ color: '#333' }}>{item.text}</Tag>;
 
         //修改列表的标签样式
       },

src/pages/contract/contracts/pages/contract_update.tsx

@@ -76,9 +76,9 @@ export default function Index({ title = '编辑合同' }) {
   }, [id]);
 
   const onSave = (formData: any, subType: number = 1) => {
-    formData?.peoples?.forEach((res: any) => {
+    // formData?.peoples?.forEach((res: any) => {
-      res.company_suppliers_id = res?.counterparty?.split('：')?.[0];
+    //   res.company_suppliers_id = res?.counterparty?.split('：')?.[0];
-    });
+    // });
     const contractDataToSave = {
       ...formData,
       is_deposit:

src/pages/contract/contracts_other/modals/Create.tsx

@@ -131,6 +131,9 @@ export default function Create(props: MyBetaModalFormProps) {
           required: true,
           title: '选择印章',
           colProps: { span: 24 },
+          params: {
+            is_enabled: true,
+          },
           fieldProps: {
             showSearch: true,
             mode: 'multiple',

src/pages/meter/common_meter/index.tsx

@@ -38,10 +38,10 @@ export default function CommonMeter({ title = '公摊表' }) {
           title={title}
         />
       ),
-      exportmeter: (
+      importmeter_public: (
         <MyImportModal
           key="ImportMeter"
-          title="导入"
+          title="导入公摊表"
           type="default"
           size="middle"
           templateApi={Apis.Meter.HouseMeters.DownloadTemplate}

src/pages/patrol/patrol_locations/index.tsx

@@ -220,7 +220,7 @@ export default function Index({ title = '点位配置' }) {
           render: (_, item: any, __, action) => (
             <MyTableActions
               actions={{
-                update: (
+                LocationsUpdate: (
                   <Update item={item} reload={action?.reload} title={title} />
                 ),
                 toggle: (

src/pages/patrol/patrol_locations/modals/Create.tsx

@@ -58,16 +58,16 @@ export default function Create(props: MyBetaModalFormProps) {
             placeholder: '请输入点位名称',
           },
         },
-        {
+        // {
-          title: '位置信息',
+        //   title: '位置信息',
-          key: 'remark',
+        //   key: 'remark',
-          formItemProps: { ...rulesHelper.text },
+        //   // formItemProps: { ...rulesHelper.text },
-          valueType: 'textarea',
+        //   valueType: 'textarea',
-          colProps: { span: 24 },
+        //   colProps: { span: 24 },
-          fieldProps: {
+        //   fieldProps: {
-            placeholder: '请输入点位的具体位置信息',
+        //     placeholder: '请输入点位的具体位置信息',
-          },
+        //   },
-        },
+        // },
         {
           title: '是否启用',
           key: 'is_enabled',

src/pages/patrol/patrol_locations/modals/Update.tsx

@@ -64,16 +64,16 @@ export default function Update(props: MyBetaModalFormProps) {
             placeholder: '请输入点位名称',
           },
         },
-        {
+        // {
-          title: '位置信息',
+        //   title: '位置信息',
-          key: 'remark',
+        //   key: 'remark',
-          formItemProps: { ...rulesHelper.text },
+        //   // formItemProps: { ...rulesHelper.text },
-          valueType: 'textarea',
+        //   valueType: 'textarea',
-          colProps: { span: 24 },
+        //   colProps: { span: 24 },
-          fieldProps: {
+        //   fieldProps: {
-            placeholder: '请输入点位的具体位置信息',
+        //     placeholder: '请输入点位的具体位置信息',
-          },
+        //   },
-        },
+        // },
         {
           title: '是否启用',
           key: 'is_enabled',

src/pages/quality/emergency/modals/CategoryCreate.tsx

@@ -26,7 +26,10 @@ export default function Create(props: MyBetaModalFormProps) {
         }
       }}
       onFinish={async (values) =>
-        Apis.Emergency.EmergencyEventCategories.Store(values)
+        Apis.Emergency.EmergencyEventCategories.Store({
+          ...values,
+          is_enabled: values.is_enabled ?? 0,
+        })
           .then(() => {
             props.reload?.();
             message.success(props.title + '成功');

src/pages/quality/emergency/modals/CategoryUpdate.tsx

@@ -27,6 +27,7 @@ export default function Update(props: MyBetaModalFormProps) {
       onFinish={async (values) =>
         Apis.Emergency.EmergencyEventCategories.Update({
           ...values,
+          is_enabled: values.is_enabled ?? 0,
           id: props.item?.id ?? 0,
         })
           .then(() => {

src/pages/quality/emergency/modals/LevelCreate.tsx

@@ -25,7 +25,10 @@ export default function Create(props: MyBetaModalFormProps) {
       }}
       trigger={<MyButtons.Create title={`添加${props.title}`} />}
       onFinish={async (values) =>
-        Apis.Emergency.EmergencyEventLevels.Store(values)
+        Apis.Emergency.EmergencyEventLevels.Store({
+          ...values,
+          is_enabled: values.is_enabled ?? 0,
+        })
           .then(() => {
             props.reload?.();
             message.success(props.title + '成功');

src/pages/quality/emergency/modals/LevelUpdate.tsx

@@ -27,6 +27,7 @@ export default function Update(props: MyBetaModalFormProps) {
       onFinish={async (values) =>
         Apis.Emergency.EmergencyEventLevels.Update({
           ...values,
+          is_enabled: values.is_enabled ?? 0,
           id: props.item?.id ?? 0,
         })
           .then(() => {

src/pages/quality/renovation/index.tsx

@@ -67,7 +67,7 @@ export default function Index({ title = '装修管理' }) {
           MyColumns.ID({ search: false }),
           Selects?.AssetProjects({
             title: '选择项目',
-            key: 'id',
+            key: 'asset_projects_id',
             hidden: true,
           }),
           MyColumns.EnumTag({
@@ -146,7 +146,9 @@ export default function Index({ title = '装修管理' }) {
                         title="查看"
                       />
                     ),
-                    worker: (
+                    worker:
+                      item.construction_status === 'PendingConstruction' ||
+                      item.construction_status === 'NormalConstruction' ? (
                         <MyWorkerCreate
                           item={{
                             ...item,
@@ -155,6 +157,8 @@ export default function Index({ title = '装修管理' }) {
                           title="装修工人"
                           key="WorkerCreate"
                         />
+                      ) : (
+                        ''
                       ),
                     update: (
                       <MyButtons.Default

src/pages/quality/routing_inspection/index.tsx

@@ -54,6 +54,7 @@ export default function Index({ title = '装修验收' }) {
             title: '处理状态',
             dataIndex: 'status',
             valueEnum: RenovationWorkOrdersStatusEnum,
+            is_color: true,
           }),
           {
             title: '项目名称',