銷售报价单/采购询价单-时间区间赋值错误的问题

src/views/purchase/purchaseInquiryForm/components/PurchaseInquiryFormForm.vue

@@ -79,6 +79,7 @@
               >
                 <a-range-picker
                   v-model:value="inquiryPeriod"
+                  value-format="YYYY-MM-DD"
                   :format="['YYYY-MM-DD', 'YYYY-MM-DD']"
                   @change="onChangeInquiryPeriod"
                   style="width: 100%"
@@ -429,8 +430,8 @@
         PuechaseInquiryFormShipTable.dataSource = [...PuechaseInquiryFormShipDataList];
         const PuechaseInquiryFormProductDataList = await queryPurcodeInquiryFormProductListByMainId(row['id']);
         PuechaseInquiryFormProductTable.dataSource = [...PuechaseInquiryFormProductDataList];
-        inquiryPeriod.value[0] = formData.inquiryPeriodBegin ? moment(formData.inquiryPeriodBegin) : '';
-        inquiryPeriod.value[1] = formData.inquiryPeriodEnd ? moment(formData.inquiryPeriodEnd) : '';
+        inquiryPeriod.value[0] = formData.inquiryPeriodBegin ? moment(formData.inquiryPeriodBegin).format('YYYY-MM-DD') : '';
+        inquiryPeriod.value[1] = formData.inquiryPeriodEnd ? moment(formData.inquiryPeriodEnd).format('YYYY-MM-DD') : '';
         notAllowEdit.value = true;
       }
 
@@ -570,10 +571,10 @@
         });
         var arrProduct = data.concat(PuechaseInquiryFormProductTable.dataSource);
         notAllowEdit.value = true;
-        inquiryPeriod.value[0] = data[0].inquiryPeriodBegin ? moment(data[0].inquiryPeriodBegin) : '';
-        inquiryPeriod.value[1] = data[0].inquiryPeriodEnd ? moment(data[0].inquiryPeriodEnd) : '';
-        formData.inquiryPeriodBegin = data[0].inquiryPeriodBegin ? moment(data[0].inquiryPeriodBegin) : '';
-        formData.inquiryPeriodEnd = data[0].inquiryPeriodEnd ? moment(data[0].inquiryPeriodEnd) : '';
+        inquiryPeriod.value[0] = data[0].inquiryPeriodBegin ? moment(data[0].inquiryPeriodBegin).format('YYYY-MM-DD') : '';
+        inquiryPeriod.value[1] = data[0].inquiryPeriodEnd ? moment(data[0].inquiryPeriodEnd).format('YYYY-MM-DD') : '';
+        formData.inquiryPeriodBegin = data[0].inquiryPeriodBegin ? moment(data[0].inquiryPeriodBegin).format('YYYY-MM-DD') : '';
+        formData.inquiryPeriodEnd = data[0].inquiryPeriodEnd ? moment(data[0].inquiryPeriodEnd).format('YYYY-MM-DD') : '';
         PuechaseInquiryFormProductTable.dataSource = arrProduct;
         formData.inquiryProject = data[0].inquiryProject;
         formData.projectName = data[0].projectName;
@@ -631,8 +632,8 @@
       }
       function onChangeInquiryPeriod(data) {
         inquiryPeriod.value = data;
-        formData.inquiryPeriodBegin = data[0].format('YYYY-MM-DD');
-        formData.inquiryPeriodEnd = data[1].format('YYYY-MM-DD');
+        formData.inquiryPeriodBegin = data[0];
+        formData.inquiryPeriodEnd = data[1];
       }
       function SelectCustomerInquiry() {
         SelectCustomerInquiryModalRef.value.getTable(formData);

src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -371,7 +371,7 @@
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
   import { Form, message } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
-  import moment from 'moment';
+  import dayjs from 'dayjs';
   import { useGlobSetting } from '/@/hooks/setting';
   const { domainUrl } = useGlobSetting();
   const userStore = useUserStore();
@@ -433,7 +433,7 @@
         status: undefined,
         delFlag: undefined,
         otherStatus: '',
-        billDate: moment(new Date()).format('YYYY-MM-DD'),
+        billDate: dayjs(new Date()).format('YYYY-MM-DD'),
         billCode: '',
         quotationProject: '',
         quotationProjectName: '',
@@ -510,8 +510,8 @@
       async function changeExchangeRate() {
         if (formData.currency !== '美元') {
           var param = {
-            month: moment(new Date()).month() + 1,
-            year: moment(new Date()).year(),
+            month: dayjs(new Date()).month() + 1,
+            year: dayjs(new Date()).year(),
             currency: formData.currency,
           };
           var info = await queryRate(param);
@@ -532,8 +532,8 @@
         saleQuotationFormProductTable.dataSource = [...saleQuotationFormProductDataList];
         getOptiom();
         getCustomerOptions();
-        quotationPeriod.value[0] = formData.quotationPeriodBegin ? moment(formData.quotationPeriodBegin) : '';
-        quotationPeriod.value[1] = formData.quotationPeriodEnd ? moment(formData.quotationPeriodEnd) : '';
+        quotationPeriod.value[0] = formData.quotationPeriodBegin ? dayjs(formData.quotationPeriodBegin,'YYYY/MM/DD') : '';
+        quotationPeriod.value[1] = formData.quotationPeriodEnd ? dayjs(formData.quotationPeriodEnd,'YYYY/MM/DD') : '';
         notAllowEdit.value = true;
       }
       //获取主表
@@ -791,8 +791,8 @@
         saleQuotationFormProductTable.dataSource = [...saleQuotationFormProductDataList];
         getOptiom();
         getCustomerOptions();
-        quotationPeriod.value[0] = formData.quotationPeriodBegin ? moment(formData.quotationPeriodBegin) : '';
-        quotationPeriod.value[1] = formData.quotationPeriodEnd ? moment(formData.quotationPeriodEnd) : '';
+        quotationPeriod.value[0] = formData.quotationPeriodBegin ? dayjs(formData.quotationPeriodBegin,'YYYY/MM/DD') : '';
+        quotationPeriod.value[1] = formData.quotationPeriodEnd ? dayjs(formData.quotationPeriodEnd,'YYYY/MM/DD') : '';
       }
       async function queryVersonHistoryData(id) {
         const row = await queryVersonHistoryById(id);