Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

src/pages/500.tsx

@@ -14,7 +14,7 @@ const InternetError: React.FC<{}> = () => {
 
   return (
     <div className={styles.wrapper}>
-      <UserHeader logo={GlobalConfig.global.siteInfo.logo}/>
+      <UserHeader logo={GlobalConfig.global.siteInfo.logo} />
       <div className={styles.errorBox}>
         <Row>
           <Col span={12}>
@@ -26,13 +26,13 @@ const InternetError: React.FC<{}> = () => {
               <Button
                 type="primary"
                 size="large"
-                style={{marginTop: 100}}
+                style={{ marginTop: 100 }}
                 onClick={handleReload}
               >刷新页面试试</Button>
             </div>
           </Col>
           <Col span={12}>
-            <img className={styles.image} src={Img} alt="数商云服务"/>
+            <img className={styles.image} src={Img} alt="数商云服务" />
           </Col>
         </Row>
       </div>

src/pages/contract/funds/addbill/index.tsx

@@ -162,15 +162,15 @@ const AddbillList: React.FC<{}> = () => {
   };
 
 
-  const fetchOptions = (service) => {
-    return async function () {
-      const res = await service();
-      if (res.code === 1000) {
-        return res.data.map((item) => { return { label: item.name, value: item.status } })
-      }
-      return [];
-    }
-  }
+  // const fetchOptions = (service) => {
+  //   return async function () {
+  //     const res = await service();
+  //     if (res.code === 1000) {
+  //       return res.data.map((item) => { return { label: item.name, value: item.status } })
+  //     }
+  //     return [];
+  //   }
+  // }
 
 
   return (
@@ -199,10 +199,10 @@ const AddbillList: React.FC<{}> = () => {
                   'applyNo',
                   FORM_FILTER_PATH,
                 );
-                useAsyncSelect(
-                  "status",
-                  fetchOptions(PublicApi.getContractApplyAmountGetStatusList)
-                )
+                // useAsyncSelect(
+                //   "status",
+                //   fetchOptions(PublicApi.getContractApplyAmountGetStatusList)
+                // )
               },
               components: {
                 DateRangePickerUnix,

src/pages/contract/funds/schema/index.ts

 import { ISchema } from '@formily/antd';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants';
+// import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants';
 
 export const SchemaBli: any = {
   type: 'object',
@@ -51,14 +51,14 @@ export const SchemaBli: any = {
             }
           },
         },
-        status: {
-          type: 'string',
-          enum: [],
-          "x-component-props": {
-            placeholder: '请选择内部状态'
-          },
-          title: '请选择外部状态',
-        },
+        // status: {
+        //   type: 'string',
+        //   enum: [],
+        //   "x-component-props": {
+        //     placeholder: '请选择内部状态'
+        //   },
+        //   title: '请选择外部状态',
+        // },
         submit: {
           'x-component': 'Submit',
           'x-component-props': {
@@ -113,14 +113,14 @@ export const addSchemaBli: ISchema = {
             }
           },
         },
-        status: {
-          type: 'string',
-          enum: [],
-          "x-component-props": {
-            placeholder: '请选择内部状态'
-          },
-          title: '请选择外部状态',
-        },
+        // status: {
+        //   type: 'string',
+        //   enum: [],
+        //   "x-component-props": {
+        //     placeholder: '请选择内部状态'
+        //   },
+        //   title: '请选择外部状态',
+        // },
         submit: {
           'x-component': 'Submit',
           'x-component-props': {

src/pages/contract/manage/editing/components/fromtable.tsx

@@ -127,7 +127,7 @@ const FormList = (props: any) => {
         payRatio: '',
         payAmount: '',
         payWay: '1',
-        payParam: '',
+        payParam: '1',
         id: 0,
       },
     )