采购询价单-询价有效期改为单个日期

src/views/purchase/purchaseInquiryForm/PurchaseInquiryForm.data.ts

@@ -29,20 +29,20 @@ export const columns: BasicColumn[] = [
    {
     title: '询价有效期(inquiry period)',
     align:"center",
-    dataIndex: 'time',
+    dataIndex: 'inquiryPeriodEnd',
     width:250,
-    customRender:({text,record}) =>{
-      if(record.inquiryPeriodBegin&&record.inquiryPeriodEnd){
-        text = record.inquiryPeriodBegin+'~'+record.inquiryPeriodEnd
-      }else if(!record.inquiryPeriodBegin){
-        text = record.inquiryPeriodEnd
-      }else if(!record.inquiryPeriodEnd){
-        text = record.inquiryPeriodBegin
-      }else{
-        text=''
-      }
-      return text;
-    },
+    // customRender:({text,record}) =>{
+    //   if(record.inquiryPeriodBegin&&record.inquiryPeriodEnd){
+    //     text = record.inquiryPeriodBegin+'~'+record.inquiryPeriodEnd
+    //   }else if(!record.inquiryPeriodBegin){
+    //     text = record.inquiryPeriodEnd
+    //   }else if(!record.inquiryPeriodEnd){
+    //     text = record.inquiryPeriodBegin
+    //   }else{
+    //     text=''
+    //   }
+    //   return text;
+    // },
    },
    {
     title: '优先级(priority)',

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

@@ -78,13 +78,7 @@
                 id="PuechaseInquiryFormForm-inquiryPeriodEnd"
                 name="inquiryPeriodEnd"
               >
-                <a-range-picker
-                  v-model:value="inquiryPeriod"
-                  value-format="YYYY-MM-DD"
-                  :format="['YYYY-MM-DD', 'YYYY-MM-DD']"
-                  @change="onChangeInquiryPeriod"
-                  style="width: 100%"
-                />
+                <a-date-picker placeholder="请选择日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="formData.inquiryPeriodEnd" style="width: 100%" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -335,7 +329,7 @@
       var SelectPrpductModalRef = ref();
       var SelectProjectModalRef = ref();
       var SelectCustomerInquiryModalRef = ref();
-      var inquiryPeriod = ref([]);
+      // var inquiryPeriod = ref([]);
       const PuechaseInquiryFormShipTableRef = ref();
       const PuechaseInquiryFormShipTable = reactive<Record<string, any>>({
         loading: false,
@@ -423,7 +417,7 @@
         PuechaseInquiryFormShipTable.dataSource = [];
         PuechaseInquiryFormProductTable.dataSource = [];
         activeKey.value = 'PuechaseInquiryFormProduct';
-        inquiryPeriod.value = [];
+        // inquiryPeriod.value = [];
         notAllowEdit.value = false;
       }
 
@@ -435,8 +429,8 @@
         PuechaseInquiryFormShipTable.dataSource = [...PuechaseInquiryFormShipDataList];
         const PuechaseInquiryFormProductDataList = await queryPurcodeInquiryFormProductListByMainId(row['id']);
         PuechaseInquiryFormProductTable.dataSource = [...PuechaseInquiryFormProductDataList];
-        inquiryPeriod.value[0] = formData.inquiryPeriodBegin ? moment(formData.inquiryPeriodBegin).format('YYYY-MM-DD') : '';
-        inquiryPeriod.value[1] = formData.inquiryPeriodEnd ? moment(formData.inquiryPeriodEnd).format('YYYY-MM-DD') : '';
+        // 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;
       }
 
@@ -581,9 +575,9 @@
         var xTable = PuechaseInquiryFormProductTableRef.value!.getXTable()
         var arrProduct = xTable.data.concat(data);
         notAllowEdit.value = true;
-        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') : '';
+        // 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;
@@ -641,11 +635,11 @@
       function onSearchProject() {
         SelectProjectModalRef.value.getTable();
       }
-      function onChangeInquiryPeriod(data) {
-        inquiryPeriod.value = data;
-        formData.inquiryPeriodBegin = data[0];
-        formData.inquiryPeriodEnd = data[1];
-      }
+      // function onChangeInquiryPeriod(data) {
+      //   inquiryPeriod.value = data;
+      //   formData.inquiryPeriodBegin = data[0];
+      //   formData.inquiryPeriodEnd = data[1];
+      // }
       function SelectCustomerInquiry() {
         SelectCustomerInquiryModalRef.value.getTable(formData);
       }
@@ -693,8 +687,8 @@
         SelectCustomerInquiryModalRef,
         onSearchProject,
         addProject,
-        inquiryPeriod,
-        onChangeInquiryPeriod,
+        // inquiryPeriod,
+        // onChangeInquiryPeriod,
         SelectCustomerInquiry,
         addProductFromCustomer,
         changeSupplier,