feat: update

zhongnanhuang
1 parent 77954e9c
Showing 4 changed files with 84 additions and 53 deletions
src/pages/Order/components/HistoryModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.less
src/pages/Order/index.tsx
@@ -54,7 +54,7 @@ export default ({ subOrders, onClose }) =&gt; {
           <Row className="max-h-[500px] overflow-auto" gutter={[0, 14]}>
             {data.map((item) => {
               return (
-                <Col span={24} key="key">
+                <Col span={24} key={i}>
                   <Flex vertical>
                     <div>
                       <span className="py-2 text-[#5E5E5E]">
@@ -68,7 +68,7 @@ export default ({ subOrders, onClose }) =&gt; {
                     <Flex vertical>
                       {item.historySubOrderRecordDto?.map((history) => {
                         return (
-                          <div className="py-1" key="key">
+                          <div className="py-1" key={history.id}>
                             <span className="pr-2 text-[#5E5E5E]">
                               {formatDateTime(history.createTime)}
                             </span>
@@ -276,6 +276,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     >
       <h2>订单基本信息</h2>
       <ProFormText
+        key="id"
         name="id"
         width="lg"
         disabled
@@ -285,6 +286,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormSelect
         name="salesCode"
+        key="salesCode"
         width="lg"
         showSearch
         label="销售代表"
@@ -294,7 +296,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         // disabled={mainInfoDisbled}
       />
       <ProFormSelect
-        key="key"
+        key="customerName"
         label="收货人"
         width="lg"
         showSearch
@@ -389,6 +391,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormText
         width="lg"
+        key="customerContactNumber"
         name="customerContactNumber"
         label="联系方式"
         placeholder="请输入联系方式"
@@ -397,6 +400,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormText
         width="lg"
+        key="institution"
         name="institution"
         label="单位"
         placeholder="请输入单位"
@@ -405,6 +409,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormText
         width="lg"
+        key="institutionContactName"
         name="institutionContactName"
         label="单位联系人"
         placeholder="请输入单位联系人"
@@ -413,6 +418,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormTextArea
         width="lg"
+        key="customerShippingAddress"
         name="customerShippingAddress"
         label="收货地址"
         placeholder="请输入收货地址"
@@ -423,6 +429,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         <ProFormDigit
           name="totalPayment"
           width="lg"
+          key="totalPayment"
           label="支付总额（￥）"
           rules={[{ required: true, message: '支付总额必填' }]}
           tooltip="点击计算，合计所有子订单金额"
@@ -445,6 +452,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         placeholder="请输入支付渠道"
         name="paymentChannel"
         width="lg"
+        key="paymentChannel"
         label="支付渠道"
         options={enumToSelect(PAYMENT_CHANNEL_OPTIONS)}
         rules={[{ required: true, message: '支付渠道必填' }]}
@@ -454,6 +462,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         placeholder="请输入支付方式"
         name="paymentMethod"
         width="lg"
+        key="paymentMethod"
         label="支付方式"
         options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
         rules={[{ required: true, message: '支付方式必填' }]}
@@ -463,6 +472,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         placeholder="选择是否需要开票"
         name="invoicingStatus"
         width="lg"
+        key="invoicingStatus"
         label="是否需要开票"
         options={getInvoicingSelect()}
         // disabled={mainInfoDisbled}
@@ -480,6 +490,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         width="lg"
         name="invoiceIdentificationNumber"
         label="开票信息"
+        key="invoiceIdentificationNumber"
         // disabled={mainInfoDisbled}
         hidden={invoicingStatus === 'UN_INVOICE'}
         placeholder="请输入开票信息"
@@ -494,6 +505,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       {getUserInfo().roleSmallVO?.code === 'admin' ? (
         <ProFormDateTimePicker
           width="lg"
+          key="invoicingTime"
           name="invoicingTime"
           // disabled={mainInfoDisbled}
           hidden={invoicingStatus === 'UN_INVOICE'}
@@ -506,6 +518,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       <ProFormText
         width="lg"
         name="bank"
+        key="bank"
         label="开户银行"
         // disabled={mainInfoDisbled}
         hidden={invoicingStatus === 'UN_INVOICE'}
@@ -513,6 +526,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       />
       <ProFormText
         width="lg"
+        key="bankAccountNumber"
         name="bankAccountNumber"
         hidden={invoicingStatus === 'UN_INVOICE'}
         label="银行账号"
@@ -523,6 +537,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         width="lg"
         name="notes"
         label="备注"
+        key="notes"
         // disabled={mainInfoDisbled}
         placeholder="请输入备注"
         rules={[
@@ -668,7 +683,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   }}
                 />,
                 <ProFormText
-                  key="productCode"
+                  key={'productCode' + listMeta.index}
                   width="lg"
                   name="productCode"
                   disabled
@@ -683,7 +698,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   placeholder="未输入商品名称"
                 />,
                 <ProFormText
-                  key="parameters"
+                  key={'parameters' + listMeta.index}
                   width="lg"
                   name="parameters"
                   label="商品参数"
@@ -691,7 +706,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '商品参数必填' }]}
                 />,
                 <ProFormDigit
-                  key="quantity"
+                  key={'quantity' + listMeta.index}
                   width="lg"
                   name="quantity"
                   label="商品数量"
@@ -705,7 +720,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '商品数量必填' }]}
                 />,
                 <ProFormDigit
-                  key="productPrice"
+                  key={'productPrice' + listMeta.index}
                   width="lg"
                   name="productPrice"
                   label="商品单价"
@@ -719,7 +734,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '商品单价必填' }]}
                 />,
                 <ProFormText
-                  key="unit"
+                  key={'unit' + listMeta.index}
                   width="lg"
                   name="unit"
                   label="商品单位"
@@ -729,7 +744,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 <ProFormDigit
                   width="lg"
-                  key="subOrderPayment"
+                  key={'subOrderPayment' + listMeta.index}
                   name="subOrderPayment"
                   label="子订单金额"
                   placeholder="请输入子订单金额"
@@ -737,7 +752,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '子订单金额必填' }]}
                 />,
                 <ProFormSelect
-                  key="productBelongBusiness"
+                  key={'productBelongBusiness' + listMeta.index}
                   placeholder="请输入所属事业部"
                   name="productBelongBusiness"
                   width="lg"
@@ -748,7 +763,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   // disabled={mainInfoDisbled}
                 />,
                 <ProFormText
-                  key="notes"
+                  key={'notes' + listMeta.index}
                   width="lg"
                   name="notes"
                   label="备注"
@@ -762,7 +777,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 />,
                 <>
                   <ProFormUploadDragger
-                    key="filePaths"
+                    key={'filePaths' + listMeta.index}
                     label="附件"
                     name="filePaths"
                     action="/api/service/order/fileProcess"
@@ -91,3 +91,8 @@
   border-bottom: 1px solid #d7d6d6; /* 设置行与行之间分割线的颜色 */
   border-right: 1px solid #d7d6d6; /* 设置行与行之间分割线的颜色 */
 }
+
+//tooltip字体颜色自定义
+// .order-tooltip .ant-tooltip-inner{
+//   color: black !important;
+// }
@@ -608,10 +608,13 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C]">代表：</span>
                     <span className="text-slate-700">{record.salesCode}</span>
                   </div>
-                  <span>
+                  <div
+                    title={record.institution}
+                    className="whitespace-no-wrap overflow-hidden overflow-ellipsis max-w-[256px]"
+                  >
                     <span className="text-[#8C8C8C]">单位：</span>
                     <span className="text-slate-700">{record.institution}</span>
-                  </span>
+                  </div>
                   <span>
                     <span className="text-[#8C8C8C]">联系人：</span>
                     <span className="text-slate-700">
@@ -622,13 +625,15 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C]">收货人：</span>
                     <span className="text-slate-700">
                       {record.customerName + ' '}
-                      <ContainerTwoTone
-                        className="hover:curcor-pointer"
-                        onClick={() => {
-                          setDeliverInfoDrawerVisible(true);
-                          setOrderRow(record);
-                        }}
-                      />
+                      <Tooltip className="order-tooltip" title="详情">
+                        <ContainerTwoTone
+                          className="hover:curcor-pointer"
+                          onClick={() => {
+                            setDeliverInfoDrawerVisible(true);
+                            setOrderRow(record);
+                          }}
+                        />
+                      </Tooltip>
                     </span>
                   </span>
                 </Space>
@@ -643,14 +648,16 @@ const OrderPage = () =&gt; {
                   </span>
                 </div>
               </div>
-              <EditTwoTone
-                className="hover:curcor-pointer"
-                onClick={() => {
-                  setNotesEditVisible(true);
-                  setOrderRow(record);
-                  setIsMainOrder(true);
-                }}
-              />
+              <Tooltip title="编辑">
+                <EditTwoTone
+                  className="hover:curcor-pointer"
+                  onClick={() => {
+                    setNotesEditVisible(true);
+                    setOrderRow(record);
+                    setIsMainOrder(true);
+                  }}
+                />
+              </Tooltip>
             </Flex>
           </Flex>
           <Flex wrap="wrap" gap="middle" vertical>
@@ -663,34 +670,38 @@ const OrderPage = () =&gt; {
                   </span>
                 </div>
                 {rolePath?.includes('addOrder') ? (
-                  <CopyTwoTone
-                    className="hover:cursor-pointer"
-                    onClick={() => {
-                      setOrderOptType('copy');
-                      setOrderDrawerVisible(true);
-                      let copy = cloneDeep(record);
-                      copy.id = undefined;
-                      copy.subOrderInformationLists?.forEach((item) => {
-                        item.id = undefined;
-                      });
-                      setOrderRow(copy);
-                    }}
-                  />
+                  <Tooltip title="复制">
+                    <CopyTwoTone
+                      className="hover:cursor-pointer"
+                      onClick={() => {
+                        setOrderOptType('copy');
+                        setOrderDrawerVisible(true);
+                        let copy = cloneDeep(record);
+                        copy.id = undefined;
+                        copy.subOrderInformationLists?.forEach((item) => {
+                          item.id = undefined;
+                        });
+                        setOrderRow(copy);
+                      }}
+                    />
+                  </Tooltip>
                 ) : (
                   ''
                 )}
-                <ClockCircleTwoTone
-                  className="hover:cursor-pointer"
-                  onClick={() => {
-                    setHistoryModalVisible(true);
-                    if (selectedRowObj[record.id]?.length) {
-                      setSelectedRows(selectedRowObj[record.id]);
-                    } else {
-                      setSelectedRows(record.subOrderInformationLists);
-                    }
-                  }}
-                />
+                <Tooltip title="历史">
+                  <ClockCircleTwoTone
+                    className="hover:cursor-pointer"
+                    onClick={() => {
+                      setHistoryModalVisible(true);
+                      if (selectedRowObj[record.id]?.length) {
+                        setSelectedRows(selectedRowObj[record.id]);
+                      } else {
+                        setSelectedRows(record.subOrderInformationLists);
+                      }
+                    }}
+                  />
+                </Tooltip>
               </Flex>
             </Flex>
             <Flex justify="flex-end">