基本信息保存按钮添加Loading

boyang
1 parent a940a118
Showing 9 changed files with 113 additions and 39 deletions
src/api/project/invoice.ts
src/views/project/config/CreateModal.vue
src/views/project/config/TablePanel.vue
src/views/project/finance/pay/DeductShow.vue
src/views/project/finance/pay/TrackEdit.vue
src/views/project/finance/pay/index.vue
src/views/project/finance/pay/pay.data.tsx
src/views/project/finance/receive/TrackEdit.vue
src/views/project/order/FormDetail/index.vue
@@ -23,6 +23,7 @@ enum Api {
   CHECK_DETAIL = '/order/erp/check_bill/list_base_order_info_by', //基础订单查询
   CHECK_ANALYSIS = '/order/erp/check_bill/list_analysis_by', //分析列表
   EXPORT_CHECK_ANALYSIS = '/order/erp/check_bill/export', //导出分析列表
+  GETDEDUCTURL_BY_ID = '/order/erp/check_bill/getDeductUrl_by_id', //获取扣款信息
 }
 export const getRefundDate = async (params: any, data?: any) => {
@@ -161,3 +162,10 @@ export const exportCheckAnalysis = async (params: any) =&gt; {
     params,
   });
 };
+
+export const getDeductUrlById = async (params: any) => {
+  return await defHttp.post<any>({
+    url: Api.GETDEDUCTURL_BY_ID,
+    params,
+  });
+};
@@ -41,7 +41,7 @@
       const { customerCode: customerCodeOptions } = useOrderInfo(orderStore);
       var [registerForm, { getFieldsValue, validate }] = useForm({
-        labelWidth: 80,
+        labelWidth: 100,
         schemas: [
           {
             field: 'settingValue',
@@ -58,7 +58,14 @@
           {
             field: 'relationValue',
             component: 'InputNumber',
-            label: props.column === 1 ? '利润率' : props.column === 2 ? '包装费用' : '销售额',
+            label:
+              props.column === 1
+                ? '利润率'
+                : props.column === 2
+                ? '包装费用'
+                : props.column === 5
+                ? '最后回款日期'
+                : '销售额',
             rules: [{ required: true }],
             colProps: {
               span: 24,
@@ -101,11 +108,12 @@
                 ? 'profitRate'
                 : props.column === 2
                 ? 'packetPrice'
+                : props.column === 5
+                ? 'orderHodTime'
                 : 'salesAmount',
             relationName: '包装费用',
             relationValue: values.relationValue,
           };
-
           await addConfig(params);
           emit('modal-success');
           closeModal();
@@ -123,19 +123,16 @@
     reload();
   }
   function handleCostEdit(record: any) {
-    console.log('5656hasedit');
     openDrawerEdit(true, {
       data: record,
       isUpdate: true,
     });
   }
   function handleCostCreate(record: any) {
-    console.log(56561);
     openCostCreateModal(true, {
       data: record,
       isUpdate: true,
     });
-    console.log(56562);
   }
   function handleEdit(record: any) {
     record.onEdit?.(true);
@@ -3,10 +3,21 @@
     v-bind="$attrs"
     @register="register"
     title="扣款单"
-    width="500px"
+    width="700px"
     :bodyStyle="{ height: '240px' }"
     @ok="handleOk"
   >
+    <a-list item-layout="horizontal" :data-source="itemArray">
+      <template #renderItem="{ item }">
+        <a-list-item>
+          <a-list-item-meta>
+            <template #title>
+              <a :href="item.url" target="_blank" rel="noopener noreferrer">{{ item.name }}</a>
+            </template>
+          </a-list-item-meta>
+        </a-list-item>
+      </template>
+    </a-list>
   </BasicModal>
 </template>
 <script lang="ts" setup>
@@ -15,16 +26,30 @@
   import type { UploadProps, UploadChangeParam } from 'ant-design-vue';
   import { InboxOutlined } from '@ant-design/icons-vue';
   import { message } from 'ant-design-vue';
-  import { updateInvoiceInfo } from '@/api/project/invoice';
+  import { getDeductUrlById } from '@/api/project/invoice';
-  const deductUrl = ref();
+  interface Item {
+    name: string;
+    url: string;
+  }
+
+  const list = ref();
   const id = ref();
+  const itemArray = ref<Item[]>([]);
   const [register, { closeModal }] = useModalInner(async (data) => {
-    deductUrl.value = data;
+    itemArray.value = [];
+    const res = await getDeductUrlById({ id: data.data.id });
+    for (let item in res) {
+      const url = res[item];
+      const name = item;
+      // 将 name 和 url 放入对象并添加到数组中
+      itemArray.value.push({ name, url });
+    }
   });
   async function handleOk() {
+    itemArray.value = [];
     closeModal();
   }
 </script>
@@ -47,6 +47,7 @@
   import { UploadOutlined } from '@ant-design/icons-vue';
   import type { UploadProps } from 'ant-design-vue';
   import { updateDeductInfo } from '@/api/project/invoice';
+  import { useMessage } from '/@/hooks/web/useMessage';
   const emit = defineEmits(['success']);
   const fileList = ref<UploadProps['fileList']>([]);
@@ -58,6 +59,9 @@
   const deductDept = ref();
   const uploadUrl = ref('http://47.104.8.35:18000/api/localStorage/upload_file_oss?name=');
   const updateDeductUrl = ref('http://47.104.8.35:18000/api/localStorage/upload_file_oss?name=');
+  const deductUrlOld = ref();
+  const { createMessage } = useMessage();
+  const { error } = createMessage;
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     id.value = data.data.id;
@@ -65,6 +69,7 @@
     input1.value = data.data.deductAmount;
     deductDept.value = data.data.deductDept;
     deductUrl.value = data.data.deductUrl;
+    deductUrlOld.value = data.data.deductUrl;
   });
   function handleChange(info) {
@@ -72,6 +77,10 @@
       updateDeductUrl.value = info.file.response.data.fileUrl;
       deductUrl.value = updateDeductUrl.value;
     }
+    if (info.fileList.length == 0) {
+      info.file = null;
+      deductUrl.value = '';
+    }
   }
   function beforeUpload(info) {
     updateDeductUrl.value = uploadUrl.value + info.name;
@@ -79,16 +88,24 @@
   //完成编辑
   async function handleSubmit() {
-    await updateDeductInfo({
-      id: id.value,
-      checkNo: checkNo.value,
-      deductAmount: input1.value,
-      deductDept: deductDept.value,
-      deductUrl: deductUrl.value,
-    });
-    // await updateDeduct(requestData);
-    fileList.value = [];
-    emit('success');
-    closeDrawer();
+    if (!input1.value || deductUrl.value == '' || !deductDept.value) {
+      error('选项不能为空');
+    } else {
+      //没传新扣款单，不传url
+      if (deductUrl.value == deductUrlOld.value || deductUrl.value == '') {
+        error('请上传扣款单');
+      } else {
+        await updateDeductInfo({
+          id: id.value,
+          checkNo: checkNo.value,
+          deductAmount: input1.value,
+          deductDept: deductDept.value,
+          deductUrl: deductUrl.value,
+        });
+        fileList.value = [];
+        emit('success');
+        closeDrawer();
+      }
+    }
   }
 </script>
@@ -397,7 +397,7 @@
   }
   function handleDeductShow(record) {
     openDeductShow(true, {
-      data: record.deductUrl,
+      data: record,
     });
   }
   function handleDetail(record) {
@@ -67,7 +67,6 @@ export const columns: BasicColumn[] = [
     dataIndex: 'deductUrl',
     width: 120,
     customRender: (column) => {
-      console.log(column, '5656column');
       const deductUrl = column.record.deductUrl;
       if (deductUrl == undefined) {
         return;
@@ -44,6 +44,7 @@
   import { UploadOutlined } from '@ant-design/icons-vue';
   import type { UploadProps } from 'ant-design-vue';
   import { updateDeduct } from '@/api/project/invoice';
+  import { useMessage } from '/@/hooks/web/useMessage';
   const emit = defineEmits(['success']);
   const fileList = ref<UploadProps['fileList']>([]);
@@ -54,12 +55,16 @@
   const invoiceNo = ref();
   const uploadUrl = ref('http://47.104.8.35:18000/api/localStorage/upload_file_oss?name=');
   const updateDeductUrl = ref('http://47.104.8.35:18000/api/localStorage/upload_file_oss?name=');
+  const deductUrlOld = ref();
+  const { createMessage } = useMessage();
+  const { error } = createMessage;
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     id.value = data.data.id;
     invoiceNo.value = data.data.invoiceNo;
     input1.value = data.data.deductAmount;
     deductUrl.value = data.data.deductUrl;
+    deductUrlOld.value = data.data.deductUrl;
   });
   function handleChange(info) {
@@ -67,6 +72,10 @@
       updateDeductUrl.value = info.file.response.data.fileUrl;
       deductUrl.value = updateDeductUrl.value;
     }
+    if (info.fileList.length == 0) {
+      info.file = null;
+      deductUrl.value = '';
+    }
   }
   function beforeUpload(info) {
     updateDeductUrl.value = uploadUrl.value + info.name;
@@ -74,21 +83,23 @@
   //完成编辑
   async function handleSubmit() {
-    const requestData = {
-      id: id.value,
-      invoiceNo: invoiceNo.value,
-      deductAmount: input1.value,
-      deductUrl: deductUrl.value,
-    };
-    await updateDeduct({
-      id: id.value,
-      invoiceNo: invoiceNo.value,
-      deductAmount: input1.value,
-      deductUrl: deductUrl.value,
-    });
-    // await updateDeduct(requestData);
-    fileList.value = [];
-    emit('success');
-    closeDrawer();
+    console.log(input1.value, '5656', deductUrl.value);
+    if (!input1.value || deductUrl.value == '') {
+      error('选项不能为空');
+    } else {
+      if (deductUrl.value == deductUrlOld.value || deductUrl.value == '') {
+        error('请上传扣款单');
+      } else {
+        await updateDeduct({
+          id: id.value,
+          invoiceNo: invoiceNo.value,
+          deductAmount: input1.value,
+          deductUrl: deductUrl.value,
+        });
+        fileList.value = [];
+        emit('success');
+        closeDrawer();
+      }
+    }
   }
 </script>
@@ -11,6 +11,7 @@
     :isDetail="true"
     :showDetailBack="false"
     okText="保存"
+    :loading="isLoading"
     :mask="false"
     class="z-20"
   >
@@ -162,6 +163,9 @@
       const altexUpdate = ref('');
       const sgsUpdate = ref('');
+      //loading
+      const isLoading = ref(false);
+
       //修改之前的包装费用
       const originPackagePrice = ref(-1.0);
@@ -345,6 +349,7 @@
       });
       const handleSubmit = async () => {
         try {
+          isLoading.value = true;
           if (id.value) {
             const forms = { orderId: id.value } as any;
             if (activeKey.value === '1') {
@@ -458,6 +463,9 @@
           }
         } catch (error) {
           console.log(error);
+        } finally {
+          // 无论成功或失败，都将 loading 状态设置为 false
+          isLoading.value = false;
         }
       };
       const getFormattedDate = (): string => {
@@ -499,6 +507,7 @@
         altexUpdate,
         sgsUpdate,
         getFormattedDate,
+        isLoading,
       };
     },
   });