修复bug

src/components/NiceForm/index.tsx

@@ -46,7 +46,7 @@ const SchemaFormButtonGroup = createVirtualBox('schemaButtonGroup', FormButtonGr
 const SchemaButton = createVirtualBox('schemaButton', Button)
 const SchemaSubmit = createVirtualBox('schemaSubmit', Submit)
 const SchemaReset = createVirtualBox('schemaReset', Reset)
-export const FlexBox = createVirtualBox('flexBox', props => <Row {...props}/>)
+export const FlexBox = createVirtualBox('flexBox', props => <Row {...props} />)
 
 // 自定义校验规则
 registerValidationRules({
@@ -124,12 +124,13 @@ const NiceForm: React.FC<NiceFormProps> = props => {
   const defineComponents = Object.assign(componentExport, components);
 
   return (
-    <div style={{width: '100%', position: 'relative'}}>
+    <div style={{ width: '100%', position: 'relative' }}>
       <SchemaForm
         colon={false}
         components={defineComponents}
-        style={{opacity: loading ? 0 : 1, position: loading ? 'absolute' : 'initial'}}
+        style={{ opacity: loading ? 0 : 1, position: loading ? 'absolute' : 'initial' }}
         effects={($, ctx) => {
+          console.log(ctx)
           // 自定义联动scope收集器
           useLinkComponentProps(expressionScope)
 
@@ -141,7 +142,7 @@ const NiceForm: React.FC<NiceFormProps> = props => {
       >
         {children}
       </SchemaForm>
-      { loading && <Loading/> }
+      { loading && <Loading />}
     </div>
   );
 };

src/pages/commodity/goods/index.tsx

@@ -285,7 +285,7 @@ const Goods: React.FC<{}> = () => {
         title: '确定要执行批量删除操作？',
         icon: <ExclamationCircleOutlined />,
         onOk() {
-          if(!goodsRowCtl.selectedRowKeys.length) { return message.error('请先选择货品') }
+          if (!goodsRowCtl.selectedRowKeys.length) { return message.error('请先选择货品') }
           PublicApi.postProductGoodsDeleteBatchGoods({ idList: goodsRowCtl.selectedRowKeys }).then(res => {
             ref.current.reload()
           })

src/pages/contract/components/examine/index.tsx

@@ -35,6 +35,7 @@ const Examine: React.FC<Iprops> = ({
   const [form] = Form.useForm();
   /* 提交表单 */
   const onFinish = (values: any) => {
+    console.log(type, '是啥')
     let fn;
     switch (type) {
       /* 待新增请款单审核接口 */
@@ -69,12 +70,12 @@ const Examine: React.FC<Iprops> = ({
         break;
       /* 合同协同  待提交审核合同  */
       case 'pageToBeSubmitExamine':
-        fn = PublicApi.getContractCoordinationPageToBeSubmitExamine
+        fn = PublicApi.postContractCoordinationSubmitExamine
         values.contractId = applyId;
         break;
       /* 合同协同  一级待提交审核合同  */
       case 'CoordinationPageToBeExamineOne':
-        fn = PublicApi.getContractCoordinationPageToBeExamineOne
+        fn = PublicApi.postContractCoordinationExamineStepOne
         values.contractId = applyId;
         break;
       /* 合同协同  二级待提交审核合同  */

src/pages/contract/constants/index.css

+.god-schema-form > .ant-form-item {
+  margin-bottom: 0 !important;
+}
+.god-schema-form > .ant-row-end {
+  margin-top: 24px !important;
+}

src/pages/contract/constants/styles.css

+.revise_info :global .ant-form-item-label {
+  width: 174px;
+}
+.revise_info :global .ant-form-item-label label {
+  color: #6B778C;
+}
+.revise_info :global .ant-form-item-control {
+  width: 500px;
+}
+.revise_info :global .ant-form-item-control .ant-form-item-control-input-content {
+  position: relative;
+}
+.revise_info :global .ant-form-item-control .ant-form-item-control-input-content .ant-btn-link {
+  position: absolute;
+  right: -120px;
+}
+.revise_info :global .ant-form-item-control .ant-form-item-control-input-content .ant-picker {
+  width: 100%;
+}
+.revise_info :global .ant-form-item-control .ant-input-group-addon .ant-input-search-button {
+  background-color: #6B778C !important;
+  border-color: #6B778C;
+}
+.revise_info :global .ant-radio-group-solid .ant-radio-button-wrapper-checked {
+  background: #6B778C !important;
+  border-color: #6B778C;
+}
+.revise_info :global .ant-radio-group-solid .ant-radio-button-wrapper-checked:hover {
+  background: #6B778C;
+  border-color: #6B778C;
+}
+.revise_info .upload_item {
+  padding: 5px 8px;
+  margin-bottom: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: #FAFBFC;
+}
+.revise_info .upload_item .upload_left {
+  display: flex;
+  align-items: center;
+  color: #303133;
+}
+.revise_info .upload_item .upload_left :global .anticon-file-word {
+  color: #4279df;
+  font-size: 20px;
+  margin-right: 8px;
+}
+.revise_info .upload_item .upload_right {
+  color: #00B37A;
+  cursor: pointer;
+}
+.revise_info .upload_item .upload_right :global .anticon-delete {
+  margin-left: 19px;
+  color: #C0C4CC;
+}

src/pages/contract/constants/styles.less

+.revise_info {
+  :global {
+    .ant-form-item-label {
+      width: 174px;
+      label {
+        color:#6B778C
+      }
+    }
+    .ant-form-item-control {
+      width: 500px;
+      .ant-form-item-control-input-content {
+        position: relative;
+        .ant-btn-link {
+          position: absolute;
+          right: -120px;
+        }
+        .ant-picker {
+          width: 100%;
+        }
+      }
+      .ant-input-group-addon {
+        .ant-input-search-button {
+          background-color: #6B778C !important;
+          border-color: #6B778C;
+        }
+      }
+    }
+    .ant-radio-group-solid {
+      .ant-radio-button-wrapper-checked {
+        background: #6B778C !important;
+        border-color: #6B778C;
+        &:hover {
+          background: #6B778C;
+          border-color: #6B778C;
+        }
+      }
+    }
+  }
+  .upload_item {
+    padding: 5px 8px;
+    margin-bottom: 16px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background-color: #FAFBFC;
+
+    .upload_left {
+      display: flex;
+      align-items: center;
+      color: #303133;
+
+      :global {
+        .anticon-file-word {
+          color: #4279df;
+          font-size: 20px;
+          margin-right: 8px;
+        }
+      }
+    }
+
+    .upload_right {
+      color: #00B37A;
+      cursor: pointer;
+
+      :global {
+        .anticon-delete {
+          margin-left: 19px;
+          color: #C0C4CC;
+        }
+      }
+    }
+  }
+}

src/pages/contract/contractexecution/details/index.css

@@ -159,3 +159,9 @@
   color: #00B37A;
   cursor: pointer;
 }
+.wrapper :global .ant-input-search .ant-input-group .ant-input {
+  padding: 0px !important;
+}
+.wrapper :global .ant-input-search .ant-input-group-addon .ant-input-search-button {
+  background-color: #F7F8FA;
+}

src/pages/contract/contractexecution/details/index.less

@@ -182,3 +182,21 @@
     color: #00B37A;
     cursor:pointer;
   }
+.wrapper{
+:global {
+    // 处理高级筛选input和search按钮不对齐问题、search按钮背景
+  .ant-input-search {
+    .ant-input-group {
+      .ant-input {
+        padding: 0px !important;
+      }
+    }
+    .ant-input-group-addon {
+      .ant-input-search-button {
+        background-color: #F7F8FA;
+      }
+    }
+  }
+}
+
+}

src/pages/contract/contractexecution/details/index.tsx

@@ -185,7 +185,7 @@ const Details = (props: any) => {
       title: '含税/税率', dataIndex: 'taxRate', align: 'center',
       render: (text, record) => (
         <Space direction='vertical'>
-          <Text>{record.isHasTax}</Text>
+          <Text>{record.isHasTax == 1 ? '是' : '否'}</Text>
           <Text>%{text}</Text>
         </Space>
       )
@@ -579,7 +579,7 @@ const Details = (props: any) => {
               <div className='ant-card-head-wrapper'>
                 执行情况
               </div>
-              <div>
+              <div className={style.wrapper}>
                 <Input.Search
                   style={{ width: 240 }}
                   placeholder="搜素"

src/pages/contract/coordination/pageToBeExamineOne/index.tsx

@@ -202,7 +202,7 @@ const pageToBeExamineOne = () => {
         ExamineFlag={Visible}
         getfetchData={getfetchData}
         applyId={id}
-        type="ManageExamineStepOne"
+        type="CoordinationPageToBeExamineOne"
       />
 
     </PageHeaderWrapper>

src/pages/contract/coordination/pageToBeSubmitExamine/index.tsx

@@ -199,7 +199,7 @@ const pageToBeSubmitExamine = () => {
         ExamineFlag={Visible}
         getfetchData={getfetchData}
         applyId={id}
-        type="ManageExamineStepOne"
+        type="pageToBeSubmitExamine"
       />
 
     </PageHeaderWrapper>

src/pages/contract/manage/QueryList/index.tsx

@@ -145,7 +145,6 @@ const QueryList = () => {
   };
   const like = (record) => {
     history.push(`/memberCenter/contract/manage/add/addList/editing?contractId=${record.id}&oldContractId=1`)
-    // history.push(`/memberCenter/contract/manage/add/QueryList/editing?contractId=${record.id}&oldContractId=1`)
   };
   const [form] = Form.useForm();
   const [id, setId] = useState('');
@@ -247,7 +246,7 @@ const QueryList = () => {
           </div>
         </Form>
       </Modal>
-    </PageHeaderWrapper >
+    </PageHeaderWrapper>
   )
 }
 

src/pages/contract/manage/add/components/FormList.tsx

@@ -257,13 +257,13 @@ const FormList = (props: any) => {
             price: Number(item.price),
             bidCount: item.bidCount,
             bidAmount: item.bidCount && item.price ? Number(item.bidCount) * Number(item.price) : '',
-            associatedMaterielName: item.associatedMaterielName ? item.associatedMaterielName : '',
-            associatedGoods: item.associatedGoods ? item.associatedGoods : '',
-            associatedDataId: item.associatedDataId ? item.associatedDataId : '',
-            associatedMaterielNo: item.associatedMaterielNo ? item.associatedMaterielNo : '',
-            associatedType: item.type ? item.type : '',
-            associatedCategory: item.customerCategory != null ? item.customerCategory.name : '',
-            associatedBrand: item.brand != null ? item.brand.name : '',
+            associatedMaterielName: Object.keys(Row).length === 0 ? '' : item.associatedMaterielName,
+            associatedGoods: Object.keys(Row).length === 0 ? '' : item.associatedGoods,
+            associatedDataId: Object.keys(Row).length === 0 ? '' : item.associatedDataId,
+            associatedMaterielNo: Object.keys(Row).length === 0 ? '' : item.associatedMaterielNo,
+            associatedType: Object.keys(Row).length === 0 ? '' : item.type,
+            associatedCategory: Object.keys(Row).length === 0 ? '' : item.customerCategory.name,
+            associatedBrand: Object.keys(Row).length === 0 ? '' : item.brand.name,
           })
         })
         resolve({
@@ -336,7 +336,7 @@ const FormList = (props: any) => {
       }
 
       <Table
-        rowKey="id"
+        rowKey="index"
         dataSource={dataList}
         columns={columnsTab}
         expandable={{

src/pages/contract/manage/add/components/information.tsx

@@ -14,6 +14,8 @@ import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
 import { column, columnsList, columnsGetList, supplierColumns } from '../Table'
+import { clearModalParams } from '@/utils';
+import style from '../../../constants/styles.less'
 
 const { Option } = Select;
 const { RangePicker } = DatePicker;
@@ -55,11 +57,13 @@ const Information = (props: any) => {
   const [manual, setmanual] = useState<boolean>(false)
   /* 显示弹出 */
   const Choose = (sourceType?) => {
+    clearModalParams()
     if (sourceType) {
       let Data = basicsVO;
       Data.sourceType = sourceType;
       console.log(currentRef);
       setbasicsVO(Data);
+
     }
     setvisible(!visible)
   }
@@ -245,7 +249,7 @@ const Information = (props: any) => {
     rules: [{ type: 'array' as const, required: true, message: ' 请选择开始或者结束时间' }],
   };
   return (
-    <div>
+    <div className={style.revise_info}>
       <Form
         form={attrValueForm}
         name="edit_infomation"
@@ -253,6 +257,7 @@ const Information = (props: any) => {
         labelAlign="left"
         colon={false}
         autoComplete="off"
+
       >
         <Form.Item
           label="合同编号"

src/pages/contract/manage/add/contracAdd.tsx

@@ -32,7 +32,7 @@ const Add: React.FC<{}> = (props: any) => {
   const [Row, setRow] = useState<any>({})
   /* 获取下拉框选中的id 查询物料 */
   const getrow = (row) => {
-    console.log(row, 1111111111111)
+    // console.log(row, 1111111111111)
     setRow(row)
   }
   const TabList = [
@@ -90,8 +90,6 @@ const Add: React.FC<{}> = (props: any) => {
     const payPlanList = await payPlan.current.length != 0 ? await payPlan.current.get() : [];
     /* 合同管理 */
     const contract = await Object.keys(contractText.current).length != 0 ? await contractText.current.get() : {}
-    console.log(payPlanList, contract)
-
     let param: any = {
       basicsVO: basicsVO.data,
       purchaseMaterielList: purchaseMaterielList.data.list,
@@ -100,6 +98,7 @@ const Add: React.FC<{}> = (props: any) => {
       operateType: 1
     }
     console.log(param)
+    // return;
     PublicApi.postContractManageSave(param).then((res => {
       if (res.code === 1000) {
         setTimeout(() => {

src/pages/contract/manage/auction/index.tsx

@@ -105,7 +105,6 @@ const Auction = () => {
 
   // 列表数据
   const fetchData = (params?: any) => {
-    console.log(params)//可以直接打印参数
     params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';
     params.endTime = params.endTime ? moment(Number(params.endTime)).format('YYYY-MM-DD') : '';
     return new Promise((resolve, reject) => {

src/pages/contract/manage/details/index.tsx

@@ -18,7 +18,6 @@ const { Step } = Steps;
 
 const { Text } = Typography;
 const activeAnchorClassName = 'ant-anchor-link-active'
-
 const Details = (props: any) => {
   /* 合同id */
   const { location: { query: { contractId, type } } } = props;

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

@@ -2,7 +2,7 @@
 import React, { useState, useEffect, forwardRef } from 'react';
 import { Button, Input, Select, DatePicker, Form, Drawer } from 'antd'
 import { PublicApi } from '@/services/api';
-
+import style from '../../../constants/styles.less'
 import moment from 'moment';
 
 const { Option } = Select;
@@ -77,7 +77,7 @@ const Information = (props: any) => {
     rules: [{ type: 'array' as const, required: true, message: ' 请选择开始或者结束时间' }],
   };
   return (
-    <div>
+    <div className={style.revise_info}>
       <Form
         form={attrValueForm}
         name="edit_infomation"

src/pages/contract/manage/purchase/index.tsx

@@ -103,7 +103,6 @@ const PurchaseList = () => {
       return (
         <div>
           <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => like(record)}>创建采购询价合同</span>
-          {/* <span style={{ color: '#00B37A', cursor: 'pointer' }} onClick={() => history.push(`/memberCenter/contract/manage/purchase/details?contractId=${record.id}`)}>查看</span> */}
         </div>
       )
     }