采购询价但/销售询价单-测试bug修改

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

@@ -231,13 +231,18 @@ export const PuechaseInquiryFormProductColumns: JVxeColumn[] = [
       placeholder: '请输入${title}',
       defaultValue:'',
       type: JVxeTypes.normal,
-      options: [],
-      dictCode: 'yes_or_no',
+      formatter({ cellValue, row, column }) {
+        if(row.quantity=='0'){
+          return '否'
+        }else{
+          return '是'
+        }
+      },
     },
     {
       title: '船检证书(ship Inspection certificate)',
       key: 'shipInspection',
-      type: JVxeTypes.input,
+      type: JVxeTypes.normal,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',

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

@@ -68,7 +68,7 @@
 						</a-col> -->
             <a-col :span="12">
 							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" id="PuechaseInquiryFormForm-delivery" name="delivery" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
-                <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_methods" disabled/>
+                <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_methods" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -416,7 +416,7 @@
         data.map(item=>{
           item.productClass = item.productionClass_dictText
           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/purchaseInquiryForm/components/SelectCustomerInquiryModal.vue

@@ -144,13 +144,13 @@
             align:"center",
             width:200
         },
-        {
-            title: '询价客户(inquiry customer)',
-            key: 'inquiryCustomer',
-            dataIndex: 'inquiryCustomer_dictText',
-            align:"center",
-            ellipsis: true,
-        },
+        // {
+        //     title: '询价客户(inquiry customer)',
+        //     key: 'inquiryCustomer',
+        //     dataIndex: 'inquiryCustomer_dictText',
+        //     align:"center",
+        //     ellipsis: true,
+        // },
         {
             title: '询价有效期(inquiry period)',
             align:"center",
@@ -201,47 +201,48 @@
             key: 'englishName',
             dataIndex: 'englishName',
             align:"center",
+            ellipsis: true,
             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;',
+            title: '数量(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
         },

src/views/saleCode/saleInquiryForm/SaleInquiryForm.data.ts

@@ -293,6 +293,7 @@ export const saleInquiryFormProductColumns: JVxeColumn[] = [
       type: JVxeTypes.select,
       options: [],
       dictCode: 'yes_or_no',
+      stringToNumber: true,
     },
     {
       title: '船检证书(ship Inspection certificate)',