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

src/pages/logistics/addLogistics/index.tsx

@@ -243,6 +243,7 @@ const AddLogistics: React.FC<{}> = () => {
               receiverMemberName: res.data.receiveUserName,
               shipmentOrderCode: res.data.deliveryNo,
               shipmentOrderId: res.data.deliveryId,
+              outerStatusName: res.data.outerStatusName
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -266,6 +267,7 @@ const AddLogistics: React.FC<{}> = () => {
               receiverMemberName: res.data.receiveUserName,
               shipmentOrderCode: res.data.deliveryNo,
               shipmentOrderId: res.data.deliveryId,
+              outerStatusName: res.data.outerStatusName
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -289,6 +291,7 @@ const AddLogistics: React.FC<{}> = () => {
               receiverMemberName: res.data.receiveUserName,
               shipmentOrderCode: res.data.deliveryNo,
               shipmentOrderId: res.data.deliveryId,
+              outerStatusName: res.data.outerStatusName
             }
             form.setFieldsValue(obj);
             setQuery({ ...obj })
@@ -381,7 +384,7 @@ const AddLogistics: React.FC<{}> = () => {
             })
             break;
           case 3:
-            PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: query.relevanceOrderId ? query.relevanceOrderId : query.shipmentOrderId }).then((res: any) => {
+            PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: query.shipmentOrderId ? query.shipmentOrderId : query.relevanceOrderId }).then((res: any) => {
               if (res.code === 1000) {
                 res.data.data.forEach(item => {
                   item.category = item.categoryName
@@ -765,7 +768,7 @@ const AddLogistics: React.FC<{}> = () => {
                 :
                 (createType === 4 || createType === 5 || createType === 6) ?
                 <Form.Item label="外部状态" name='externalState'>
-                  {/* <StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} /> */}
+                  <Badge status="warning" text={query.outerStatusName} />
                 </Form.Item>
                 : <></>
               }

src/pages/logistics/components/index.less

@@ -69,7 +69,7 @@
 
       &-option {
         flex       : 1;
-        font-size  : 14px;
+        font-size  : 12px;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
         color      : #909399;
@@ -101,7 +101,7 @@
 
         &-options {
           flex       : 1;
-          font-size  : 14px;
+          font-size  : 12px;
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
           color      : #909399;

src/pages/logistics/components/orderSearchDetail.tsx

@@ -9,7 +9,6 @@ import { PublicApi } from '@/services/api'
 import moment from 'moment'
 import style from './index.less'
 import statuStyle from '../colorTag'
-import { getLogisticsSelectListFreightTemplate } from '@/services/LogisticsApi';
 const { Step } = Steps
 
 const detailInfo: React.FC<{}> = () => {

src/pages/logistics/list/addCompany.tsx

@@ -10,6 +10,7 @@ import ModalTable from '@/components/ModalTable'
 import { PublicApi } from '@/services/api'
 import { PageStatus } from '@/hooks/usePageStatus'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+
 interface Item {
   key: string;
 }
@@ -240,7 +241,7 @@ const company: React.FC<parmas> = (props) => {
                             }
                           ]}
                         >
-                          <Input disabled={isSee} className="input_addonAfter" maxLength={20} addonAfter={selectBtn} />
+                          <Input disabled={isSee} className="input_addonAfter" maxLength={0} addonAfter={selectBtn} />
                         </Form.Item>
                         :
                         <Form.Item

src/pages/logistics/list/components/templateForm.tsx

@@ -342,7 +342,7 @@ const diaLogForm: React.FC<ListProps> = (props) => {
                     <Col span={24}>
                       <Field
                         name="designateList"
-                        minItems={1}
+                        minItems={0}
                         type="array"
                         x-component="ArrayTable"
                         x-component-props={{

src/pages/member/components/index.less

@@ -170,7 +170,7 @@
       display      : flex;
       width        : calc(100% / 3);
       margin-bottom: 17px;
-      font-size    : 14px;
+      font-size    : 12px;
       font-family  : PingFangSC-Regular, PingFang SC;
       font-weight  : 400;
       color        : #909399;

src/pages/transaction/confirmInquiryQuote/components/details.tsx

@@ -104,7 +104,7 @@ const Details: React.FC<parmas> = (props) => {
   // 询价商品
   const handleJump = (data: any) => {
     console.log(data)
-    window.open(`/shop/commodity/detail?id=${data.productId}&type=2&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
+    window.open(`/shop/commodity/detail?id=${data.commodityId}&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
   }
   const inquiryGoods: ColumnType<any>[] = [{
     title: 'ID',

src/pages/transaction/goodsOffer/addEnquiryOrder/addForm.tsx

@@ -58,6 +58,7 @@ const AddQuotes: React.FC<parmas> = (props) => {
       const data = JSON.parse(sessionStorage.getItem(spam_id));
       const inquiryGoods: any[] = [];
       inquiryGoods.push({
+        commodityId: data.commodityId,
         productId: data.id,
         productName: data.name,
         category: data.category,

src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx

@@ -107,6 +107,7 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
           const data: any[] = [];
           res.data.data.forEach((v, i) => {
             data.push({
+              commodityId: v.commodityId,
               productId: v.id,
               productName: v.name,
               category: v.customerCategoryName,

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

@@ -10,6 +10,7 @@ import moment from 'moment';
 import { PublicApi } from '@/services/api';
 import GeneralExternalState from '@/pages/transaction/common/externalState';
 import GeneralInteriorState from '@/pages/transaction/common/interiorState';
+import EyePreview from '@/components/EyePreview';
 
 const { TabPane } = Tabs;
 const { Step } = Steps;
@@ -44,6 +45,11 @@ const Details: React.FC<parmas> = (props) => {
   // 模拟数据
   const [data, setdata] = useState<any>({});
   // 询价商品
+  // 询价商品
+  const handleJump = (data: any) => {
+    console.log(data)
+    window.open(`/shop/commodity/detail?id=${data.commodityId}&shopId=${btoa(JSON.stringify({ roleId: data.memberRoleId, memberId: data.memberId }))}`)
+  }
   const inquiryGoods: ColumnType<any>[] = [{
     title: 'ID',
     key: 'productId',
@@ -52,6 +58,7 @@ const Details: React.FC<parmas> = (props) => {
     title: '报价商品名称',
     key: 'productName',
     dataIndex: 'productName',
+    render: (text: any, record: any) => <EyePreview type='button' handleClick={() => handleJump(record)}>{text}</EyePreview>
   }, {
     title: '品类',
     key: 'category',