单据必填校验更改

src/views/inventiry/otherIn/components/otherInForm.vue

@@ -217,6 +217,9 @@
         supplier: [
           { required: true, message: '请选择供应商(select supplier)' }
         ],
+        model: [
+          { required: true, message: '请选择机型(model)' }
+        ],
       });
       const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
       const dbData = {};

src/views/platformBusiness/commissionContract/components/commissionContractFormForm.vue

@@ -21,7 +21,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="commissionContractForm-supplier" name="supplier">
+              <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplierId" id="commissionContractForm-supplierId" name="supplierId">
                 <JSelect   v-model:value="formData.supplierId" :get-option-url="supplierOption" :showField="showField"  @change="handleSupplierChange"></JSelect>
               </a-form-item>
             </a-col>
@@ -107,6 +107,7 @@
   import { Form, message } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import moment from 'moment';
+import { curry } from 'lodash-es';
   const useForm = Form.useForm;
   export default defineComponent({
     name: 'commissionContractForm',
@@ -162,6 +163,12 @@
 
       //表单验证
       const validatorRules = reactive({
+        supplierId: [
+          { required: true, message: '请选择供应商(supplier)' }
+        ],
+        currency: [
+          { required: true, message: '请选择币种(currency)' }
+        ],
       });
       const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
       const dbData = {};

src/views/platformBusiness/commissionOrder/components/commissionOrderFormForm.vue

@@ -21,7 +21,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="commissionOrderForm-supplier" name="supplier">
+              <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplierId" id="commissionOrderForm-supplierId" name="supplierId">
                 <JSelect   v-model:value="formData.supplierId" :get-option-url="supplierOption" :showField="showField"  @change="handleSupplierChange"></JSelect>
               </a-form-item>
             </a-col>
@@ -91,7 +91,7 @@
 
     <!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated style="padding: 24px; padding-top: 0px">
-      <a-tab-pane tab="佣金合同 - 产品明细(product details)" key="commissionOrderFormProduct" :forceRender="true">
+      <a-tab-pane tab="佣金订单 - 产品明细(product details)" key="commissionOrderFormProduct" :forceRender="true">
         <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectProductList" :disabled="formData.commissionContractCode!==''"> 选择产品(select products)</a-button>
         <j-vxe-table
           :keep-source="true"
@@ -195,6 +195,12 @@
 
       //表单验证
       const validatorRules = reactive({
+        supplierId: [
+          { required: true, message: '请选择供应商(supplier)' }
+        ],
+        currency: [
+          { required: true, message: '请选择币种(currency)' }
+        ],
       });
       const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
       const dbData = {};

src/views/purchase/purPaymentRequest/components/purPaymentRequestForm.vue

@@ -171,7 +171,10 @@
       //表单验证
       const validatorRules = reactive({
         supplier: [
-          { required: true, message: '请选择供应商(select supplier)' }
+          { required: true, message: '请选择供应商(select supplier)' },
+        ],
+        currency: [
+          { required: true, message: '请选择币种(select currency)' }
         ],
       });
       const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});

src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -397,9 +397,9 @@
         projectName: [
           { required: true, message: '请选择报价项目(select project)' }
         ],
-        currency:[
-          { required: true, message: '请选择币种(currency)' }
-        ],
+        // currency:[
+        //   { required: true, message: '请选择币种(currency)' }
+        // ],
       });
       const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
       const dbData = {};

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

@@ -481,6 +481,7 @@
         quotationProjectName: [{ required: true, message: '请选择报价项目(select project)' }],
         quotationCustomer: [{ required: true, message: '请选择报价客户(select customer)' }],
         currency: [{ required: true, message: '请选择币种(select currency)' }],
+        model: [{ required: true, message: '请选择机型(model)' }],
       });
       const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
       const dbData = {};
@@ -702,15 +703,18 @@
               formData.custumerDiscount = item.discount;
               formData.paymentTerms = item.paymentTerms;
               formData.currency = item.currency;
+              
             }
           });
           if (saleQuotationFormProductTable.dataSource.length > 0) {
-            var newArr = [...saleQuotationFormProductTable.dataSource];
+            var xTable = saleQuotationFormProductTableRef.value!.getXTable();
+            var newArr = [...xTable.data];
             newArr.map((item) => {
               item.discount = formData.custumerDiscount;
             });
             saleQuotationFormProductTable.dataSource = newArr;
           }
+          changeExchangeRate()
         }
       }
       //获取客户列表

src/views/saleCode/saleContract/SaleContract.data.ts

@@ -310,6 +310,9 @@ export const formSchema: FormSchema[] = [
     field: 'model',
     labelWidth: 200,
     component: 'JDictSelectTag',
+    dynamicRules: ({ model, schema }) => {
+      return [{ required: true, message: '请输入机型!' }];
+    },
     componentProps: {
       dictCode: 'model_typer',
     },

src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -540,7 +540,7 @@
       //表单验证
       const validatorRules = reactive({
         projectName: [{ required: true, message: '请选择项目(select project)' }],
-        currency: [{ required: true, message: '请选择币种(select currency)' }],
+        // currency: [{ required: true, message: '请选择币种(select currency)' }],
       });
       const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
       const dbData = {};