Merge branch 'warning' of http://39.108.227.113:8001/zhusen/canrd-erp-front into warning

boyang
2 parents 32dbf89c 01578991
Showing 3 changed files with 16 additions and 8 deletions
src/pages/Order/Order/components/CheckModal.tsx
src/pages/Order/Order/index.tsx
src/pages/Order/constant.ts
@@ -236,8 +236,8 @@ export default ({
     setPreviewOpen(true);
     setPreviewTitle(
       file.name ||
-      file.originFileObj?.name ||
-      file.url!.substring(file.url!.lastIndexOf('/') + 1),
+        file.originFileObj?.name ||
+        file.url!.substring(file.url!.lastIndexOf('/') + 1),
     );
   };
@@ -681,6 +681,12 @@ export default ({
               width="md"
               name="bankStatementSerialNumbersText"
               label="流水号"
+              rules={[
+                {
+                  required: true,
+                  message: '请输入流水号!',
+                },
+              ]}
               placeholder={'多个流水号用逗号隔开'}
             />
             <div className="pb-4 text-xs decoration-gray-50">
@@ -1199,11 +1199,13 @@ const OrderPage = () =&gt; {
             </div>
             {/* 确认发票状态 */}
-            <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
-              <Tag color={'success'} style={{ marginRight: '4px' }}>
-                {optRecord.invoiceConfirmStatusText}
-              </Tag>
-            </div>
+            {optRecord.invoiceConfirmStatusText !== null && (
+              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <Tag color={'success'} style={{ marginRight: '4px' }}>
+                  {optRecord.invoiceConfirmStatusText}
+                </Tag>
+              </div>
+            )}
             {/* 后置审核状态 */}
             {optRecord.postAuditStatus !== null ? (
@@ -550,7 +550,7 @@ export const MAIN_ORDER_COLUMNS = [
     hideInTable: true,
     valueEnum: {
       invoiceConfirmWarning: {
-        text: '待开票预警',
+        text: '待确认开票预警',
         status: 'invoiceConfirmWarning',
       },
       paymentReceiptStatusWarning: {