feat: update

zhongnanhuang
1 parent 3553409f
Showing 3 changed files with 43 additions and 42 deletions
src/pages/Order/components/DeliverModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
@@ -28,7 +28,6 @@ const DeliverModal = ({ data: propsData, isSendProduct, onClose }) =&gt; {
     } else {
       newData[index][key] = obj.target?.value;
     }
-
     setData(newData);
   };
   const columns: ProColumns<any>[] = [
@@ -68,10 +67,10 @@ const DeliverModal = ({ data: propsData, isSendProduct, onClose }) =&gt; {
       title: '包裹数量',
       width: 80,
       dataIndex: 'packageNumber',
-      render: (_, record) => (
+      render: (_, record, index) => (
         <InputNumber
           value={record.packageNumber}
-          onChange={(value) => (record.packageNumber = value)}
+          onChange={(value) => handleChange('packageNumber', index, value)}
         />
       ),
     },
@@ -53,7 +53,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       setInvoicingStatus(data.invoicingStatus);
     }
   }, [data]);
-  let mainInfoDisbled = optType('edit');
+  // let mainInfoDisbled = optType('edit');
   if (optType('edit') || optType('copy')) {
     //订单修改和新增的子订单列表命名是list
     data.list = data.subOrderInformationLists;
@@ -114,6 +114,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    * @param currentRowData list中当前行的数据
    */
   function autoFillProductInfo(option: any, currentRowData: any) {
+    console.log(option);
     let copyList = form.getFieldValue('list');
     let currentData = copyList[currentRowData.field.key];
     currentData.productCode = option?.productCode;
@@ -200,7 +201,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         placeholder="请输入销售代表"
         options={SALES_CODE_OPTIONS}
         rules={[{ required: true, message: '销售代表必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormText
         name="customerName"
@@ -208,7 +209,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="收货人"
         placeholder="请输入收货人"
         rules={[{ required: true, message: '收货人必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormText
         width="lg"
@@ -216,7 +217,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="联系方式"
         placeholder="请输入联系方式"
         rules={[{ required: true, message: '联系方式必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormText
         width="lg"
@@ -224,7 +225,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="单位"
         placeholder="请输入单位"
         rules={[{ required: true, message: '单位必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormText
         width="lg"
@@ -232,7 +233,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="单位联系人"
         placeholder="请输入单位联系人"
         rules={[{ required: true, message: '单位联系人必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormTextArea
         width="lg"
@@ -240,14 +241,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="收货地址"
         placeholder="请输入收货地址"
         rules={[{ required: true, message: '收货地址必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormDigit
         name="totalPayment"
         width="lg"
         label="支付总额（￥）"
         rules={[{ required: true, message: '支付总额必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormSelect
         placeholder="请输入支付渠道"
@@ -256,7 +257,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="支付渠道"
         options={enumToSelect(PAYMENT_CHANNEL_OPTIONS)}
         rules={[{ required: true, message: '支付渠道必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormSelect
         placeholder="请输入支付方式"
@@ -265,7 +266,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="支付方式"
         options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
         rules={[{ required: true, message: '支付方式必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormSelect
         placeholder="请输入所属事业部"
@@ -274,7 +275,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         label="所属事业部"
         options={enumToSelect(PRODUCT_BELONG_DEPARTMENT_OPTIONS)}
         rules={[{ required: true, message: '所属事业部必填' }]}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
       />
       <ProFormSelect
         placeholder="选择是否需要开票"
@@ -282,9 +283,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         width="lg"
         label="是否需要开票"
         options={enumToSelect(INVOCING_STATUS_OPTIONS)}
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
         onChange={(_, option) => {
           setInvoicingStatus(option.value);
+          console.log(option.value);
           if (option.value === 'UN_INVOICE') {
             form.setFieldValue('invoiceIdentificationNumber', undefined);
             form.setFieldValue('bank', undefined);
@@ -293,32 +295,27 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         }}
         rules={[{ required: true, message: '是否需要开票必填' }]}
       />
-      {optType('add') || optType('copy') ? (
-        <ProFormText
-          width="lg"
-          name="invoiceIdentificationNumber"
-          label="开票信息"
-          disabled={mainInfoDisbled}
-          hidden={invoicingStatus !== 'INVOICED'}
-          placeholder="请输入开票信息"
-          rules={[
-            {
-              required: invoicingStatus === 'INVOICED' ? true : false,
-              message: '开票信息必填',
-            },
-          ]}
-        />
-      ) : (
-        ''
-      )}
+      <ProFormText
+        width="lg"
+        name="invoiceIdentificationNumber"
+        label="开票信息"
+        // disabled={mainInfoDisbled}
+        hidden={invoicingStatus !== 'INVOICED'}
+        placeholder="请输入开票信息"
+        rules={[
+          {
+            required: invoicingStatus === 'INVOICED' ? true : false,
+            message: '开票信息必填',
+          },
+        ]}
+      />
-      {getUserInfo().roleSmallVO?.code === 'admin' &&
-      (optType('add') || optType('edit')) ? (
+      {getUserInfo().roleSmallVO?.code === 'admin' ? (
         <ProFormDateTimePicker
           width="lg"
           name="invoicingTime"
-          disabled={mainInfoDisbled}
-          hidden={invoicingStatus === 'INVOICED'}
+          // disabled={mainInfoDisbled}
+          hidden={invoicingStatus !== 'INVOICED'}
           label="开票时间"
           placeholder="请输入开票时间"
         />
@@ -329,7 +326,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         width="lg"
         name="bank"
         label="开户银行"
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
         hidden={invoicingStatus !== 'INVOICED'}
         placeholder="请输入开户银行"
       />
@@ -338,14 +335,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         name="bankAccountNumber"
         hidden={invoicingStatus !== 'INVOICED'}
         label="银行账号"
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
         placeholder="请输入银行账号"
       />
       <ProFormText
         width="lg"
         name="notes"
         label="备注"
-        disabled={mainInfoDisbled}
+        // disabled={mainInfoDisbled}
         placeholder="请输入备注"
       />
@@ -474,7 +471,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                         productName: keywords,
                         type: 'add',
                         label: keywords,
-                        value: keywords,
+                        value: 13 + '|' + keywords,
+                        key: keywords,
                       });
                     }
                     return options;
@@ -391,8 +391,12 @@ const OrderPage = () =&gt; {
                     onClick={() => {
                       let selectedSubOrders = selectedRowObj[record.id];
                       setSelectedRows(selectedSubOrders);
-                      if (selectedSubOrders === null) {
+                      if (selectedSubOrders === undefined) {
                         setSelectedRows(record.subOrderInformationLists);
+                        console.log(
+                          'subOrderInformationLists：' +
+                            record.subOrderInformationLists,
+                        );
                       }
                       for (let i = 0; i < selectedRows.length; i++) {
                         if (