fix(invoice): 修复状态过滤导致的核销问题

取消了对银行状态查询的异常状态过滤，以允许正常状态的银行记录被正确核销。此更改确保了核销流程能够顺利进行，不再因错误的状态过滤而受到影响。

fix(invoice): 修复状态过滤导致的核销问题
取消了对银行状态查询的异常状态过滤，以允许正常状态的银行记录被正确核销。此更改确保了核销流程能够顺利进行，不再因错误的状态过滤而受到影响。
曾国涛
1 parent 3010ed6c
Showing 5 changed files with 55 additions and 45 deletions
src/pages/Invoice/Invoice/components/BankChooseModal.tsx
src/pages/Invoice/constant.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/components/ReissueModal_old.tsx
src/pages/ResearchGroup/components/ResearchGroupAddModal.tsx
@@ -276,7 +276,7 @@ export default ({ loadInvoiceData, invoiceId, setVisible, onClose }) =&gt; {
           }}
           request={async (params) => {
             const res = await postServiceBankStatementQueryBankStatement({
-              data: { ...params, status: 'ABNORMAL' },
+              data: { ...params },
             });
             if (res) {
               return {
@@ -58,6 +58,18 @@ export const INVOICE_COLUMNS = [
     dataIndex: 'statusText',
     valueType: 'text',
     width: 180,
+    hideInSearch: true,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    valueType: 'select',
+    width: 100,
+    valueEnum: enumToProTableEnumValue({
+      UNVERIFIED: '未核销',
+      VERIFIED: '已核销',
+    }),
+    hideInTable: true,
   },
   {
     title: '购买方',
@@ -11,6 +11,7 @@ import {
   postKingdeeRepMaterialUnit,
   postKingdeeRepMeasureUnit,
   postPrepaidPhoneAvailableList,
+  postResearchGroupsNameSet,
   postServiceOrderAddOrder,
   postServiceOrderAfterSalesQuerySnapshotOrder,
   postServiceOrderApplyAfterSales,
@@ -1207,45 +1208,45 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           placeholder="请输入单位"
           rules={[{ required: true, message: '单位必填' }]}
         />
-        <ProFormText
+        {/*<ProFormText
           width="lg"
           key="institutionContactName"
           name="institutionContactName"
           label="课题组"
           placeholder="请输入课题组"
           rules={[{ required: true, message: '课题组必填' }]}
-        />
-        {/*<ProFormSelect
-            key={'institutionContactName'}
-            width="md"
-            showSearch
-            name="institutionContactName"
-            rules={[{ required: true, message: '请输入课题组名称!' }]}
-            request={async (value) => {
-              const keywords = value.keyWords;
-              const res = await postResearchGroupsNameSet({
-                data: {
-                  groupName: keywords,
-                },
-              });
-              let options = res?.data?.map((c: any) => {
-                return {
-                  label: c,
-                  value: c,
-                  key: c,
-                };
-              });
-              return options;
-            }}
-            fieldProps={{
-              filterOption() {
-                return true;
-              },
-            }}
-            debounceTime={1000}
-            label="课题组名称"
-            placeholder="请输入名称"
         />*/}
+        <ProFormSelect
+          key={'institutionContactName'}
+          width="md"
+          showSearch
+          name="institutionContactName"
+          rules={[{ required: true, message: '请输入课题组名称!' }]}
+          request={async (value) => {
+            const keywords = value.keyWords;
+            const res = await postResearchGroupsNameSet({
+              data: {
+                groupName: keywords,
+              },
+            });
+            let options = res?.data?.map((c: any) => {
+              return {
+                label: c,
+                value: c,
+                key: c,
+              };
+            });
+            return options;
+          }}
+          fieldProps={{
+            filterOption() {
+              return true;
+            },
+          }}
+          debounceTime={1000}
+          label="课题组名称"
+          placeholder="请输入名称"
+        />
         <div
           style={{
             display: 'flex',
@@ -43,10 +43,7 @@ export default ({ setVisible, mainOrder, onClose }) =&gt; {
     getInvoiceSelectList();
   }, []);
   return (
-    <ModalForm<{
-      invoiceId: string;
-      notes: string;
-    }>
+    <ModalForm
       title="重新开票(旧)"
       form={form}
       width={500}
@@ -343,6 +343,12 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
               placeholder="请输入课题组名称"
               rules={[{ required: true, message: '请输入课题组名称' }]}
             />
+            <ProFormText
+              name="companyName"
+              label="单位名称"
+              placeholder="请输入单位名称"
+              rules={[{ required: true, message: '请输入单位名称' }]}
+            />
             <ProFormSelect
               name="leaderName"
               key="leaderName"
@@ -350,15 +356,9 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
               showSearch
               label="负责人"
               placeholder="请输入课题组负责人"
-              rules={[{ required: true, message: '请输入课题组负责人' }]}
+              //rules={[{ required: true, message: '请输入课题组负责人' }]}
               options={salesCodeOptions}
             />
-            <ProFormText
-              name="companyName"
-              label="单位名称"
-              placeholder="请输入单位名称"
-              rules={[{ required: true, message: '请输入单位名称' }]}
-            />
           </ProForm.Group>
  
           <ProFormSelect
@@ -371,7 +371,7 @@ export default ({ setVisible, researchGroupId, onClose }) =&gt; {
             onChange={(_, option) => {
               autoAccountSelectOptions(option);
             }}
-            rules={[{ required: true, message: '请至少选择绑定一个预存账号' }]}
+            //rules={[{ required: true, message: '请至少选择绑定一个预存账号' }]}
             fieldProps={{
               mode: 'multiple',
               filterOption() {