销售报价单-选择弹窗显示字段调整/保存时增加校验

src/views/publicComponents/SelectSupplierQuotation.vue

@@ -34,10 +34,11 @@
                                     labelField="code"
                                     valueField="id"
                                     :disabled="fatherProject!==''"
+                                    :params="{ pageSize: -1 }"
                                     />
                             </a-form-item>
                         </a-col>
-                           <a-col :md="6"  :sm="8">
+                        <!-- <a-col :md="6"  :sm="8">
                             <a-form-item  label="供应商(quotation supplier)">
                                 <ApiSelect
                                     :api="supplierOption"
@@ -47,9 +48,10 @@
                                     resultField="records"
                                     labelField="name"
                                     valueField="id"
+                                    :params="{ pageSize: -1 }"
                                 />
                             </a-form-item>
-                        </a-col>
+                        </a-col> -->
                         <a-col :md="6"  :sm="8">
                             <a-form-item label="优先级(priority)">
                                 <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
@@ -65,6 +67,7 @@
                                     resultField="records"
                                     labelField="name"
                                     valueField="id"
+                                    :params="{ pageSize: -1 }"
                                 />
                             </a-form-item>
                         </a-col>
@@ -120,7 +123,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3500, y: 300 }"
+                :scroll="{ x: 3500, y: 400 }"
                 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>
@@ -167,11 +170,11 @@
             align:"center",
             dataIndex: 'projectName'
         },
-        {
-            title: '供应商(supplier)',
-            align:"center",
-            dataIndex: 'selectionSupplier_dictText'
-        },
+        // {
+        //     title: '供应商(supplier)',
+        //     align:"center",
+        //     dataIndex: 'selectionSupplier_dictText'
+        // },
         // {
         //     title: '询价供应商(quotation supplier)',
         //     align:"center",
@@ -212,7 +215,8 @@
         {
             title: '厂家(maker)',
             align:"center",
-            dataIndex: 'maker'
+            dataIndex: 'maker',
+            ellipsis:true
         },
         {
             title: '质量等级(quality grade)',

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

@@ -572,9 +572,8 @@
       }
       //保存
       async function submitForm() {
-        var xTable = saleQuotationFormProductTableRef.value!.getXTable();
-        if (xTable.data.length == 0) {
-          message.warning('请添加产品明细');
+        if (formData.sourceCode == '') {
+          message.warning('请添加供应商报价选定');
         } else {
           saleQuotationFormProductTableRef.value!.validateTable().then(async (errMap) => {
             if (errMap) {

src/views/saleCode/quotation/quotationForm.data.ts

@@ -142,6 +142,24 @@ export const saleQuotationFormShipColumns: JVxeColumn[] = [
     },
   ]
 export const saleQuotationFormProductColumns: JVxeColumn[] = [
+    {
+      title: '产品英文名(english name)',
+      key: 'englishName',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+      fixed: 'left',
+    },
+    {
+      title: '备件号(partno)',
+      key: 'partno',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+      fixed: 'left',
+    },
     {
       title: '交期(delivery time)',
       key: 'deliveryDayChild',
@@ -174,14 +192,7 @@ export const saleQuotationFormProductColumns: JVxeColumn[] = [
       width:"200px",
       defaultValue:'',
     },
-    {
-      title: '产品英文名(english name)',
-      key: 'englishName',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
+   
     // {
     //   title: '规格(specifications)',
     //   key: 'specifications',
@@ -198,14 +209,6 @@ export const saleQuotationFormProductColumns: JVxeColumn[] = [
       width:"200px",
       defaultValue:'',
     },
-    {
-      title: '备件号(partno)',
-      key: 'partno',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
     {
       title: '订货号(orderno)',
       key: 'orderno',