采购报价单-测试bug修改

src/views/purchase/purchaseQuotationFrm/PurchaseQuotationForm.data.ts

@@ -242,9 +242,13 @@ export const PuechaseQuotationFormProductColumns: JVxeColumn[] = [
       placeholder: '请输入${title}',
       defaultValue:'',
       type: JVxeTypes.normal,
-      options: [],
-      dictCode: 'yes_or_no',
-      disabled:true
+      formatter({ cellValue, row, column }) {
+        if(row.quantity=='0'){
+          return '否'
+        }else{
+          return '是'
+        }
+      },
     },
     {
       title: '船检证书(ship Inspection certificate)',
@@ -293,6 +297,10 @@ export const PuechaseQuotationFormProductColumns: JVxeColumn[] = [
       placeholder: '请输入${title}',
       defaultValue:'',  
       width:"200px",
+      formatter({ cellValue, row, column }) {
+        row.taxAmount = isNaN( row.taxAmount)?0:row.taxAmount
+        return cellValue
+      },
     },
     {
       title: '备注(note)',

src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue

@@ -21,13 +21,13 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="报价供应商(quotation supplier)" v-bind="validateInfos.suppilerName" id="PuechaseQuotationFormForm-suppilerName" name="suppilerName">
-                  <JSelectInput   v-model:value="formData.suppilerName"  placeholder="请选择" allow-clear  :options="supplierOption" @change="changeSupplier"></JSelectInput>
+							<a-form-item label="报价供应商(quotation supplier)" v-bind="validateInfos.quotationSuppiler" id="PuechaseQuotationFormForm-quotationSuppiler" name="quotationSuppiler">
+                  <JSelectInput   v-model:value="formData.quotationSuppiler"  placeholder="请选择" allow-clear  :options="supplierOption" @change="changeSupplier"></JSelectInput>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="报价截至日期(quotation deadline)" v-bind="validateInfos.quotationDeadline" id="PuechaseQuotationFormForm-quotationDeadline" name="quotationDeadline">
-                <a-date-picker v-model:value="formData.quotationDeadline" show-time  valueFormat="YYYY-MM-DD" format='YYYY-MM-DD' style="width: 100%;"></a-date-picker>
+                <a-date-picker placeholder="请选择"  v-model:value="formData.quotationDeadline"  value-format="YYYY-MM-DD" format="YYYY-MM-DD" style="width: 100%"  allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -424,7 +424,8 @@
         
       }
       function changeFormDeliveryTime(){
-        var arrProduct = [...PuechaseQuotationFormProductTable.dataSource]
+        const xTable = PuechaseQuotationFormProductTableRef.value!.getXTable();
+        var arrProduct = [...xTable.data]
         arrProduct.map(item=>{
           item.deliveryTime = formData.deliveryTime
         })
@@ -434,7 +435,7 @@
         data.map(item=>{
           item.productClass = item.productClass
           item.productCode = item.productCode
-          item.unit = item.measurementUnit
+          item.unit = item.unit
           item.sourceId = item.childId
           item.model = item.childModel
           item.deliveryTime = formData.deliveryTime

src/views/purchase/purchaseQuotationFrm/components/SelectSupplierInquiryModal.vue

@@ -175,7 +175,7 @@
         {
             title: '机型(model)',
             align:"center",
-            dataIndex: 'model'
+            dataIndex: 'headModel'
         },
         {
             title: '产品编码(product code)',
@@ -187,48 +187,49 @@
             title: '产品英文名(product english name)',
             key: 'englishName',
             dataIndex: 'englishName',
+            ellipsis: true,
             align:"center",
             width:250
         },
         {
             title: '型号(child model)',
-            key: 'childModel;',
-            dataIndex: 'childModel;',
+            key: 'childModel',
+            dataIndex: 'childModel',
             align:"center",
             width:250
         },
         {
             title: '厂家(factory)',
-            key: 'factory;',
-            dataIndex: 'factory;',
+            key: 'factory',
+            dataIndex: 'factory',
             align:"center",
             width:250
         },
         {
             title: '质量等级(quality grade)',
-            key: 'qualityGrade;',
-            dataIndex: 'qualityGrade;',
+            key: 'qualityGrade',
+            dataIndex: 'qualityGrade',
             align:"center",
             width:250
         },
         {
             title: '数量(quality)',
-            key: 'quantity;',
-            dataIndex: 'quantity;',
+            key: 'quantity',
+            dataIndex: 'quantity',
             align:"center",
             width:250
         },
         {
             title: '单位(unit)',
-            key: 'unit;',
-            dataIndex: 'unit;',
+            key: 'unit',
+            dataIndex: 'unit',
             align:"center",
             width:250
         },
         {
             title: '备注(notes)',
-            key: 'notes;',
-            dataIndex: 'notes;',
+            key: 'notes',
+            dataIndex: 'notes',
             align:"center",
             width:250
         },
@@ -405,8 +406,8 @@
     }
     function getTable(formData){
         visible.value = true
-        if(formData.qutationProject&&formData.qutationProject!==''){
-            fatherProject.value = formData.qutationProject
+        if(formData.quotationProject&&formData.quotationProject!==''){
+            fatherProject.value = formData.quotationProject
         }else{
             fatherProject.value = ''
         }