销售报价单-增加表单验证/调整筛选条件格式/默认客户币种汇率并计算

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

@@ -494,6 +494,7 @@
         quotationCustomer: [{ required: true, message: '请选择报价客户(select customer)' }],
         currency: [{ required: true, message: '请选择币种(select currency)' }],
         model: [{ required: true, message: '请选择机型(model)' }],
+        deliveryTerms: [{ required: true, message: '请选择贸易方式(delivery terms)' }],
       });
       const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
       const dbData = {};
@@ -716,8 +717,7 @@
               formData.priority = item.priority;
               formData.custumerDiscount = item.discount;
               formData.paymentTerms = item.paymentTerms;
-              formData.currency = item.currency;
-              
+              formData.currency = item.currency;              
             }
           });
           if (saleQuotationFormProductTable.dataSource.length > 0) {
@@ -889,10 +889,11 @@
         formData.maker = data[0].maker;
         formData.productionClass = data[0].productionClass;
         formData.deliveryDayHead = data[0].deliveryDayChild;
-        formData.currency = '美元';
-        formData.exchangeRate = '1';
+        // formData.currency = '美元';
+        // formData.exchangeRate = '1';
         await getShipList(data[0].headId);
         await getLinkOptionsArr(formData.quotationCustomer)
+        await changeExchangeRate()
         // countGrossMargin()
         // await changeDiscountOrExchangeRate()
       }
@@ -966,9 +967,9 @@
         countGrossMargin()
       }
       function changeDiscountOrExchangeRate() {
-        if (saleQuotationFormProductTable.dataSource.length > 0) {
-          var xTable = saleQuotationFormProductTableRef.value!.getXTable();
-          var newArr = [...xTable.data];
+        var xTable = saleQuotationFormProductTableRef.value!.getXTable();
+        var newArr = [...xTable.data];
+        if (newArr.length > 0) {
           formData.exchangeRate = formData.exchangeRate == '' || formData.exchangeRate === null || !formData.exchangeRate ? 1 : formData.exchangeRate;
           newArr.map((item) => {
             item.discount = formData.custumerDiscount == '' || formData.custumerDiscount === null || !formData.custumerDiscount ? 0 : formData.custumerDiscount;

src/views/saleCode/quotation/quotation.vue

@@ -89,7 +89,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="model">
+              <a-form-item name="model" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="型号(model">型号(model)</span></template>
                 <JInput placeholder="请输入型号(model)" v-model:value="queryParam.model" allow-clear AutoComplete="off" />
               </a-form-item>