修改需求发布详情里查看商品的弹框，修改需求发布bug

src/pages/transaction/common/statusList.ts

@@ -33,7 +33,7 @@ export const TimeList = [
 
 /**
  * @description: 需求单发布状态筛选
- * @param {type} 外部
+ * @param {type} 外部1.提交需求单 2.审核需求单  3.提交报价单  4.确认报价单 5.完成 6.审核不通过 7.取消报价单
  * @return {type} 1.提交需求单 2.审核需求单  3.提交报价单  4.确认报价单 5.完成 6.审核不通过 7.取消报价单
  */
 export const filterExternalStateList = [

src/pages/transaction/common/tableStatusList.tsx

@@ -200,7 +200,7 @@ export const demandExternalState = (text:any) => {
   text === 2 ? component = <Tag color="default">待审核需求单</Tag>:
   text === 3 ? component = <Tag color="processing">待提交报价单</Tag>:
   text === 4 ? component = <Tag color="warning">待确认报价单</Tag>:
-  text === 4 ? component = <Tag color="success">确认通过</Tag>:
+  text === 5 ? component = <Tag color="success">确认通过</Tag>:
   component = <Tag color="error">报价不通过</Tag>
   return component;
 }
@@ -222,7 +222,7 @@ export const demandInteriorState = (text:any) => {
   return component;
 }
 
-/********************************需求报价********************************* */
+/********************************需求报价 & 需求发布********************************* */
 /**
  * @description: 需求报价-外部状态查询
  * @author: HJX
@@ -235,7 +235,7 @@ export const demandQuoteExternalState = (text:any) => {
   text === 2 ? component = <Tag color="default">待审核需求单</Tag>:
   text === 3 ? component = <Tag color="processing">待提交报价单</Tag>:
   text === 4 ? component = <Tag color="warning">待确认报价单</Tag>:
-  text === 4 ? component = <Tag color="success">确认通过</Tag>:
+  text === 5 ? component = <Tag color="success">确认通过</Tag>:
   component = <Tag color="error">报价不通过</Tag>
   return component;
 }
@@ -256,4 +256,6 @@ export const demandQuoteInteriorState = (text:any) => {
   text === 6 ? component = <Badge status='error' text="审核不通过" />:
   component = <Badge status='error' text="审核不通过" />
   return component;
-}
\ No newline at end of file
+}
+
+/********************************需求发布******************************* */

src/pages/transaction/enquiryOffer/components/detail.tsx

@@ -502,7 +502,7 @@ const DetailsInfo: React.FC<dataInfoType> = (props) => {
  * @param {type} 
  * @return {type} 
  */
-  const getOrderProductAll = (id) => {
+  const getOrderProductAll = (id: any) => {
     setrequisitionFormId(id)//需求id
     PublicApi.getOrderRequisitionFormProductAll({ id: id }).then(res => {
       if (res.code === 1000) {
@@ -611,7 +611,7 @@ const DetailsInfo: React.FC<dataInfoType> = (props) => {
               <div>内部状态：</div>
               <div>
                 {
-                  enquiryOfferSearchInteriorState(dataInfo.interiorState)//4
+                  enquiryOfferSearchInteriorState(dataInfo.interiorState + 1)//4
 
                 }
               </div>

src/pages/transaction/enquiryOfferConfirm/components/detail.tsx

@@ -603,7 +603,7 @@ const detailInfo: React.FC<dataInfoType> = (props) => {
             <div className={style['headerMain-left-option']}>
               <div>内部状态：</div>
               <div>
-                {demandInteriorState(dataInfo.interiorState)}
+                {demandInteriorState(dataInfo.interiorState + 1)}
               </div>
             </div>
 

src/pages/transaction/enquirySubmit/components/index.tsx

@@ -34,7 +34,7 @@ import {
 } from 'god/dist/src/standard-table/TableController';
 import EyePreview from '@/components/EyePreview';
 import StatusSwitch from '@/components/StatusSwitch';
-import {interiorState,interiorStateTwo,enquirySearchInteriorState} from '../../common/tableStatusList'
+import {demandQuoteInteriorState,demandQuoteExternalState} from '../../common/tableStatusList'
 import statuStyle from '../../common/colorTag'
 import NiceForm from '@/components/NiceForm';
 import {timeRange} from '@/utils/index'
@@ -144,15 +144,8 @@ const List:React.FC<listParams> = (props) => {
       key:'externalState',
       dataIndex:'externalState',
       align:'center',
-      render: (text: any, reconds) => {
-        let component: ReactNode = null
-        if (text == 3) {
-          component = <><span style={statuStyle.warn}>审核不通过需求单</span></>
-        }else if (text == 1) {
-          component = <><span style={statuStyle.default}>待提交需求单</span></>
-        }
-        return component
-      }
+      render: (text: any, reconds) => 
+      demandQuoteExternalState(text)
     },
     {
       title:'内部状态',
@@ -160,9 +153,7 @@ const List:React.FC<listParams> = (props) => {
       dataIndex:'interiorState',
       align:'center',
       render:(text:any) =>
-      // props.type === 1 ? interiorState(text) :
-      // props.type === 2 || props.type == 3? interiorStateTwo(text) : ''
-      enquirySearchInteriorState(text)
+      demandQuoteInteriorState(text)
     },
     {
       title:'操作',

src/pages/transaction/enquirySubmit/components/productModal.tsx

@@ -22,6 +22,8 @@ export interface Params {
   onOK?: Function;
   initialValues?: any;
   dontReceive?: boolean; //默认展示
+  check?: any, // 查看详情
+  view?: boolean
 }
 const layout = {
   layout: 'vertical',
@@ -39,6 +41,7 @@ const layout = {
  * @return {type} 
  */
 const comfirmDialog: React.FC<Params> = (props) => {
+  console.log(props.sourceData)
   const [form] = Form.useForm()
   const [placeOfOriginList, setplaceOfOriginList] = useState([])//产地
   const handleCancel = () => {
@@ -46,12 +49,12 @@ const comfirmDialog: React.FC<Params> = (props) => {
   const handletOk = async () => {
     try {
       const value = await form.validateFields();
-      // for(let key in value) {
-      //   if(key !== 'model' && key !== 'brand' && key !== 'purchaseNuit' && key !== 'purchaseQuantity') {
-      //     value[key] = value[key].join('/');
-      //   }
-      // }
-      props.onOK(value)
+      console.log(value, '添加商品')
+      if(props.view) {
+        props.onCancel()
+      } else {
+        props.onOK(value)
+      }
     } catch(err) {
       message.error('有必填项没填写请检查！')
     }
@@ -97,6 +100,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
                       style={{ width: 200 }}
                       options={options}
                       placeholder="选择或输入"
+                      disabled={props.view}
                       filterOption={(inputValue, option) =>
                         option.value.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1
                       }
@@ -124,11 +128,11 @@ const comfirmDialog: React.FC<Params> = (props) => {
                       message: '此项为必填项'
                     }]}
                   >
-                    <Checkbox.Group onChange={(v) => onChange(v, attrItem)}>
+                    <Checkbox.Group onChange={(v) => onChange(v, attrItem)} >
                       
                       {
                         attrItem.attributeValueList.length && attrItem.attributeValueList.map((item: any, index: string) => (
-                          <Checkbox key={item.id} value={item.value}>{item.value}</Checkbox>
+                          <Checkbox disabled={props.view} key={item.id} value={item.value}>{item.value}</Checkbox>
                         ))
                       }
                     </Checkbox.Group>
@@ -154,6 +158,15 @@ const comfirmDialog: React.FC<Params> = (props) => {
       </>
     )
   }
+
+  // 查看详情渲染
+  useEffect(() => {
+    if(Object.keys(props.check).length > 0) {
+      form.setFieldsValue(props.check);
+    }
+  }, [props.view])
+
+
   return (
     <>
       <Modal
@@ -188,7 +201,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
                   message: '此项为必填项'
                 }]}
               >
-                <Input placeholder='' />
+                <Input disabled={props.view} placeholder='' />
               </Form.Item>
               <Form.Item
                 label='商品品牌'
@@ -198,7 +211,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
                   message: '此项为必填项'
                 }]}
               >
-                <Input placeholder='' />
+                <Input disabled={props.view} placeholder='' />
               </Form.Item>
             </Tabs.TabPane>
 
@@ -229,7 +242,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
                   message: '此项为必填项'
                 }]}
               >
-                <Input placeholder='' />
+                <Input disabled={props.view} placeholder='' />
               </Form.Item>
 
               <Form.Item
@@ -240,7 +253,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
                   message: '此项为必填项'
                 }]}
               >
-                <Input type='number' placeholder='' />
+                <Input disabled={props.view} type='number' placeholder='' />
               </Form.Item>
 
             </Tabs.TabPane>

src/pages/transaction/enquirySubmit/enquiryOne/detail/index.tsx

@@ -5,6 +5,7 @@ const EnquiryOneDetail: React.FC<{}> = () => {
   return (
     <AuditComponents 
       pagetype={1}
+      operation={1}
     />
   );
 };

src/pages/transaction/enquirySubmit/enquirySearch/index.tsx

@@ -34,8 +34,7 @@ import {
 } from 'god/dist/src/standard-table/TableController';
 import EyePreview from '@/components/EyePreview';
 import StatusSwitch from '@/components/StatusSwitch';
-import {interiorState,interiorStateTwo,
-  enquirySearchInteriorState,enquirySearchexternalState} from '../../common/tableStatusList'
+import {demandQuoteExternalState, demandQuoteInteriorState} from '../../common/tableStatusList'
 import statuStyle from '../../common/colorTag'
 import NiceForm from '@/components/NiceForm';
 import {timeRange} from '@/utils/index'
@@ -63,10 +62,14 @@ const List:React.FC<{listParams}> = (props) => {
   const format = (text) => {
     return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
   }
-  const fetchData = async (params: any) => {
-    const res = await PublicApi.getOrderRequisitionFormList(params);
-    return res.data
-    
+  const fetchData = (params: any) => {
+    return new Promise((resolve, reject) => {
+      PublicApi.getOrderRequisitionFormList({...params}).then(res => {
+        if(res.code === 1000) {
+          resolve(res.data)
+        }
+      })
+    })
   }
 
   /**
@@ -130,7 +133,7 @@ const List:React.FC<{listParams}> = (props) => {
       filterMultiple: false,
       onFilter: (value, record) => record.externalState === value,
       render: (text: any, reconds) => 
-      enquirySearchexternalState(text)
+      demandQuoteExternalState(text)
     },
     {
       title:'内部状态',
@@ -141,7 +144,7 @@ const List:React.FC<{listParams}> = (props) => {
       filterMultiple: false,
       onFilter: (value, record) => record.interiorState === value,
       render:(text:any) =>
-      enquirySearchInteriorState(text) 
+      demandQuoteInteriorState(text) 
     }
     
 

src/pages/transaction/enquirySubmit/enquiryTwo/detail/index.tsx

@@ -5,6 +5,7 @@ const EnquiryTwoDetail: React.FC<{}> = () => {
   return (
     <AuditComponents 
       pagetype={2}
+      operation={1}
     />
   );
 };

src/pages/transaction/enquirySubmit/schema/index.tsx

@@ -177,7 +177,7 @@ export const enquierySearchSchema: ISchema = {
             },
             voucherTime:{
               type:'string',
-              default: 0,
+              // default: 0,
               "x-component-props":{
                 placeholder:'请选择单据时间'
               },

src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx

@@ -61,6 +61,7 @@ const { Option } = Select
 import styled from 'styled-components'
 import { findItemAndDelete } from '@/utils'
 import cx from 'classnames'
+import EyePreview from '@/components/EyePreview';
 
 const RowStyleLayout = styled(props => <div {...props} />)`
   .card-checkbox {
@@ -235,7 +236,9 @@ const Detail: React.FC<{}> = () => {
   const [tabData, settabData] = useState<any>({})
   const [platType, setplatType] = useState(1) //需求对接类型
   const [addres, setaddres] = useState<any>({});
-  const [memberType, setmemberType] = useState(1)
+  const [memberType, setmemberType] = useState(1);
+  const [check, setCheck] = useState<any>({}); // 添加商品查看详情
+  const [view, setView ] = useState<boolean>(false);// 添加商品查看详情
   const { ProductStore } = store
   const { setAreaOption, productInfoByEdit, getBasicFormParamsByEdit, setAttributeLists, setProductName } = ProductStore
   const columnsSetMember: any[] = [
@@ -281,7 +284,6 @@ const Detail: React.FC<{}> = () => {
     }
   ]
 
-
   const FormSumbit = (values: any) => {
     setTimeout(() => {
       history.goBack()
@@ -459,16 +461,22 @@ const Detail: React.FC<{}> = () => {
     }
   ]
 
+  // 添加商品查看详情
+  const handleCheck = (value: any) => {
+    console.log(value)
+    setCheck(value)
+    setView(true)
+    setdialogVisible(true);
+  }
 
   const equiryColumns: ColumnType<any>[] = [
-
     {
       title: '商品规格型号',
       dataIndex: 'model',
       key: 'model',
-      align: 'left'
+      align: 'left',
+      render:(text:any, record:any) => <EyePreview type='button' handleClick={() => handleCheck(record)}>{text}</EyePreview>
     },
-
     {
       title: '品牌',
       dataIndex: 'brand',
@@ -639,8 +647,9 @@ const Detail: React.FC<{}> = () => {
           }
           //品类
           if (data.productCategory) {
+            const idx = data.productCategory.ids.length - 1;
             setcustomerCategoryId([data.productCategory.ids])
-            initCreatePro(data.productCategory.id, false)//生产弹窗
+            initCreatePro(data.productCategory.ids[idx], false)//生产弹窗
           }
 
 
@@ -971,8 +980,8 @@ const Detail: React.FC<{}> = () => {
     }
     list.push(item)
     setproductSource([...productSource, ...list])//新增就要合并
-    console.log(productSource, 967)
     setdialogVisible(false)
+    setView(false)
   }
   const onFinish = fieldsValue => {
     const values = {
@@ -1349,10 +1358,12 @@ const Detail: React.FC<{}> = () => {
         </Row>
         <RroductModal
           sourceData={tabData}
+          check={check}
+          view={view}
           dialogVisible={dialogVisible}
           mode={0}
           onOK={(values: any) => handleSubmit(values)}
-          onCancel={() => setdialogVisible(false)}
+          onCancel={() => {setdialogVisible(false); setView(false)}}
         >
         </RroductModal>
 

src/pages/transaction/enquirySubmit/toAddSubmit/index.tsx

@@ -29,7 +29,7 @@ import {
 } from 'god/dist/src/standard-table/TableController';
 import EyePreview from '@/components/EyePreview';
 import StatusSwitch from '@/components/StatusSwitch';
-import {interiorState} from '../../common/tableStatusList'
+import {demandQuoteExternalState, demandQuoteInteriorState} from '../../common/tableStatusList'
 import statuStyle from '../../common/colorTag'
 import NiceForm from '@/components/NiceForm';
 import {timeRange} from '@/utils/index'
@@ -107,22 +107,16 @@ const List:React.FC<{}> = () => {
       key:'externalState',
       dataIndex:'externalState',
       align:'center',
-      render: (text: any, reconds) => {
-        let component: ReactNode = null
-        if (text == 3) {
-          component = <><span style={statuStyle.warn}>审核不通过需求单</span></>
-        }else if (text == 1) {
-          component = <><span style={statuStyle.default}>待提交需求单</span></>
-        }
-        return component
-      }
+      render: (text: any, reconds) =>
+      demandQuoteExternalState(text)
     },
     {
       title:'内部状态',
       key:'interiorState',
       dataIndex:'interiorState',
       align:'center',
-      render:(text:any) => interiorState(text)
+      render:(text:any) => 
+      demandQuoteInteriorState(text)
     },
     {
       title:'操作',

src/pages/transaction/goodsOffer/components/reviewList.tsx

@@ -118,8 +118,8 @@ const ReviewList: React.FC<parmas> = (props) => {
   // 搜索
   const search = (values: any) => {
     if (values.voucherTime) {
-      values.startVoucherTime = timeRange(values.voucherTime).st
-      values.endVoucherTime = timeRange(values.voucherTime).et
+      values.startDocumentsTime = timeRange(values.voucherTime).st
+      values.endDocumentsTime = timeRange(values.voucherTime).et
       delete values.voucherTime
     }
     ref.current.reload(values)

src/pages/transaction/goodsOffer/pendingReviewTwo/index.tsx

@@ -14,41 +14,11 @@ const PendingReviewTwo: React.FC<{}> = () => {
     console.log(values, '我是多选的id')
   }
   //列表数据
-  // const data = { // 模拟的数据
-  //   totalCount: 6,
-  //   data: [{
-  //     id: 1,
-  //     inquiryListNo: 'SZX125KJS',
-  //     details: '模拟的数据',
-  //     memberName: '冰红茶',
-  //     memberId: 10,
-  //     deliveryTime: '2020-10-13 13:59:00',
-  //     quotationAsTime: '2020-10-13 23:59:00',
-  //     voucherTime: '2020-10-13 13:59:00',
-  //     externalState: 1,
-  //     interiorState: 1
-  //   }, {
-  //     id: 2,
-  //     inquiryListNo: 'SZX125LIP',
-  //     details: '模拟的数据10086',
-  //     memberName: '打喷嚏',
-  //     memberId: 1,
-  //     deliveryTime: '2020-10-12 13:59:00',
-  //     quotationAsTime: '2020-10-14 23:59:00',
-  //     voucherTime: '2020-10-12 13:59:00',
-  //     externalState: 1,
-  //     interiorState: 1
-  //   }]
-  // }
   const fetchData = (params?: any) => {
-    console.log(params)//可以直接打印参数
     return new Promise((resolve, reject) => {
       PublicApi.getOrderInquiryToAuditListTwo({...params}).then(res => {
         resolve(res.data)
       })
-      // setTimeout(() => {
-      //   resolve(data)
-      // }, 500)
     })
   }
   // 批量操作

src/pages/transaction/goodsOffer/pendingSubmit/index.tsx

@@ -117,8 +117,8 @@ const PendingSubmit: React.FC<{}> = () => {
   /**搜索 */
   const handleSumbit = (values: any) => {
     if (values.voucherTime) {
-      values.startVoucherTime = timeRange(values.voucherTime).st
-      values.endVoucherTime = timeRange(values.voucherTime).et
+      values.startDocumentsTime = timeRange(values.voucherTime).st
+      values.endDocumentsTime = timeRange(values.voucherTime).et
       delete values.voucherTime
     }
     console.log('values', values)

src/pages/transaction/goodsOffer/schema/pendingReview.tsx

 import { ISchema} from '@formily/antd'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
-import {TimeList} from '../../common/statusList'
+import {TimeList, filterExternalStateLabelList, filterInternalStateLabelList} from '../../common/statusList'
 import TranactionRoute from 'config/routes/tranactionRoute'
 
 /**
@@ -32,7 +32,7 @@ export const pendingReviewSchema: ISchema = {
 
           },
           "x-component-props":{
-            placeholder:'询价单搜索'
+            placeholder:'询价单号搜索'
           }
         }
       }
@@ -65,7 +65,7 @@ export const pendingReviewSchema: ISchema = {
                 placeholder:'询价单摘要'
               }
             },
-            memberName:{
+            inquiryListMemberName:{
               type:'string',
               "x-component-props":{
                 placeholder:'被询价会员'
@@ -73,12 +73,28 @@ export const pendingReviewSchema: ISchema = {
             },
             voucherTime:{
               type:'string',
-              default: 0,
+              // default: 0,
               "x-component-props":{
                 placeholder:'请选择单据时间'
               },
               enum: TimeList
             },
+            externalState:{
+              type:'string',
+              // default: 0,
+              "x-component-props":{
+                placeholder:'外部状态'
+              },
+              enum: filterExternalStateLabelList
+            },
+            interiorState	:{
+              type:'string',
+              // default: 0,
+              "x-component-props":{
+                placeholder:'内部状态'
+              },
+              enum: filterInternalStateLabelList
+            },
           }
         },
         sumbit:{