feat: update

zhongnanhuang
1 parent 61220eb7
Showing 4 changed files with 28 additions and 6 deletions
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
@@ -126,7 +126,9 @@ export default ({
       }}
       onOpenChange={setCheckVisible}
     >
-      <div>如果需要合并订单，请将需要合并的订单id写在备注中。</div>
+      <div className="mb-1">
+        如果需要合并订单，请将需要合并的订单id写在备注中，id之间用英文逗号隔开。
+      </div>
       <ProFormTextArea
         width="lg"
         name="applyInvoicingNotes"
@@ -134,7 +136,14 @@ export default ({
       />
       <ProFormUploadDragger
         key="2"
-        label="附件"
+        label={
+          <div>
+            <span>开票明细确认表</span>
+            <span className="pl-2 text-xs text-gray-400">
+              如果开票信息有变更，如开票内容跟下单内容不一致、下单抬头和付款抬头不一致，请上传开票明细确认表。
+            </span>
+          </div>
+        }
         name="filePaths"
         action="/api/service/order/fileProcess"
         fieldProps={{
@@ -234,6 +234,10 @@ export default ({
    * @param body 财务审核
    */
   async function doFinancailCheck(values: any, isAgree: boolean) {
+    if (fileList.length <= 0) {
+      message.error('凭证不能为空');
+      return;
+    }
     messageApi.open({
       type: 'loading',
       content: '正在上传图片...',
@@ -570,7 +570,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         // disabled={mainInfoDisbled}
         placeholder="请输入银行账号"
       />
-      <ProFormText
+      <ProFormTextArea
         width="lg"
         name="notes"
         label="备注"
@@ -799,11 +799,18 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                   rules={[{ required: true, message: '所属事业部必填' }]}
                   // disabled={mainInfoDisbled}
                 />,
-                <ProFormText
+                <ProFormTextArea
                   key={'notes' + listMeta.index}
                   width="lg"
                   name="notes"
-                  label="备注"
+                  label={
+                    <div>
+                      <span>备注</span>
+                      <span className="pl-2 text-xs text-gray-400">
+                        备注将体现在出货单上，请将需要仓管看见的信息写在备注上，例如需要开收据等信息。
+                      </span>
+                    </div>
+                  }
                   placeholder="请输入备注"
                   rules={[
                     {
@@ -1710,7 +1710,9 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('noNeedInvoicingEdit') ? (
+                  {record?.subOrderInformationLists[0].subPath?.includes(
+                    'noNeedInvoicingEdit',
+                  ) ? (
                     <Button
                       className="p-0"
                       type="link"