所有节点-子表高度设置/项目不可输入设置

src/views/baseCode/ShipArchive/components/BaseShipArchiveAccessoriesModal.vue

@@ -12,7 +12,7 @@
         :loading="demoFieldDefValSubTable.loading"
         :columns="demoFieldDefValSubTable.columns"
         :dataSource="demoFieldDefValSubTable.dataSource"
-        :height="340"
+        :maxHeight="340"
         :rowNumber="false"
         :rowSelection="true"
         :toolbar="false"

src/views/baseCode/ShipArchive/components/BaseShipArchiveRelateCustomerModal.vue

@@ -10,7 +10,7 @@
         :loading="demoFieldDefValSubTable.loading"
         :columns="demoFieldDefValSubTable.columns"
         :dataSource="demoFieldDefValSubTable.dataSource"
-        :height="340"
+        :maxHeight="340"
         :rowNumber="false"
         :rowSelection="false"
         :toolbar="false"

src/views/cuspCode/CustomerProfile/components/CuspCustomerProfileForm.vue

@@ -12,7 +12,7 @@
           :loading="cuspCustomerProfileManTable.loading"
           :columns="cuspCustomerProfileManTable.columns"
           :dataSource="cuspCustomerProfileManTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :rowNumber="true"
           :rowSelection="true"
           :disabled="formDisabled"

src/views/cuspCode/CustomerProfile/components/CuspCustomerProfileModal.vue

@@ -12,7 +12,7 @@
             :loading="cuspCustomerProfileManTable.loading"
             :columns="cuspCustomerProfileManTable.columns"
             :dataSource="cuspCustomerProfileManTable.dataSource"
-            :height="340"
+            :maxHeight="340"
             :rowNumber="true"
             :rowSelection="true"
             :disabled="formDisabled"

src/views/cuspCode/SupplierEvaluation/components/CuspSupplierEvaluationForm.vue

@@ -12,7 +12,7 @@
           :loading="cuspSupplierEvaluationScoreTable.loading"
           :columns="cuspSupplierEvaluationScoreTable.columns"
           :dataSource="cuspSupplierEvaluationScoreTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :rowNumber="true"
           :rowSelection="true"
           :disabled="formDisabled"

src/views/cuspCode/SupplierProfile/components/CuspSupplierProfileForm.vue

@@ -12,7 +12,7 @@
           :loading="cuspSupplierProfileManTable.loading"
           :columns="cuspSupplierProfileManTable.columns"
           :dataSource="cuspSupplierProfileManTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :rowNumber="true"
           :rowSelection="true"
           :disabled="formDisabled"
@@ -28,7 +28,7 @@
           :loading="cuspSupplierProfileQualificationTable.loading"
           :columns="cuspSupplierProfileQualificationTable.columns"
           :dataSource="cuspSupplierProfileQualificationTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :rowNumber="true"
           :rowSelection="true"
           :disabled="formDisabled"

src/views/cuspCode/SupplierProfile/components/CuspSupplierProfileModal.vue

@@ -12,7 +12,7 @@
               :loading="cuspSupplierProfileManTable.loading"
               :columns="cuspSupplierProfileManTable.columns"
               :dataSource="cuspSupplierProfileManTable.dataSource"
-              :height="340"
+              :maxHeight="340"
               :rowNumber="true"
               :rowSelection="true"
               :disabled="formDisabled"
@@ -34,7 +34,7 @@
               :loading="cuspSupplierProfileQualificationTable.loading"
               :columns="cuspSupplierProfileQualificationTable.columns"
               :dataSource="cuspSupplierProfileQualificationTable.dataSource"
-              :height="340"
+              :maxHeight="340"
               :rowNumber="true"
               :rowSelection="true"
               :disabled="formDisabled"

src/views/inventiry/inventoryCheck/components/inventoryCheckForm.vue

@@ -50,7 +50,7 @@
           :loading="stockDetailsTable.loading"
           :columns="stockDetailsTable.columns"
           :dataSource="stockDetailsTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

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

@@ -76,7 +76,7 @@
           :loading="otherInShipTable.loading"
           :columns="otherInShipTable.columns"
           :dataSource="otherInShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -95,7 +95,7 @@
           :loading="stockInTable.loading"
           :columns="stockInTable.columns"
           :dataSource="stockInTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/inventiry/otherOut/components/otherOutForm.vue

@@ -55,7 +55,7 @@
           :loading="otherOutTable.loading"
           :columns="otherOutTable.columns"
           :dataSource="otherOutTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/inventiry/purInAbnormal/components/purInAbnormalForm.vue

@@ -85,7 +85,7 @@
           :loading="purInAbnormalShipTable.loading"
           :columns="purInAbnormalShipTable.columns"
           :dataSource="purInAbnormalShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -103,7 +103,7 @@
           :loading="stockInTable.loading"
           :columns="stockInTable.columns"
           :dataSource="stockInTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/inventiry/purchaseIn/components/purchaseInForm.vue

@@ -111,7 +111,7 @@
           :loading="stockInTable.loading"
           :columns="stockInTable.columns"
           :dataSource="stockInTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -134,7 +134,7 @@
           :loading="purInShipTable.loading"
           :columns="purInShipTable.columns"
           :dataSource="purInShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/inventiry/salesOutbound/components/salesOutForm.vue

@@ -65,7 +65,7 @@
           :loading="stockOutTable.loading"
           :columns="stockOutTable.columns"
           :dataSource="stockOutTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -91,7 +91,7 @@
           :loading="saleShipTable.loading"
           :columns="saleShipTable.columns"
           :dataSource="saleShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -130,7 +130,7 @@
           :loading="arriveDetailsFormProductTable.loading"
           :columns="arriveDetailsFormProductTable.columns"
           :dataSource="arriveDetailsFormProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -151,7 +151,7 @@
           :loading="ArriveGoodsFormShipFormShipTable.loading"
           :columns="ArriveGoodsFormShipFormShipTable.columns"
           :dataSource="ArriveGoodsFormShipFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/purchase/commissionAdvancePay/components/viewDeatilModal.vue

@@ -42,7 +42,7 @@
                   :loading="paymentDetailsTable.loading"
                   :columns="paymentDetailsTable.columns"
                   :dataSource="paymentDetailsTable.dataSource"
-                  :height="340"
+                  :maxHeight="340"
                   :rowNumber="true"
                   :rowSelection="true"
                   asyncRemove
@@ -57,7 +57,7 @@
                   :loading="commissionDetailsTable.loading"
                   :columns="commissionDetailsTable.columns"
                   :dataSource="commissionDetailsTable.dataSource"
-                  :height="340"
+                  :maxHeight="340"
                   :rowNumber="true"
                   :rowSelection="true"
                   >

src/views/purchase/commissionPayRequest/components/commissionPayRequestForm.vue

@@ -80,7 +80,7 @@
           :loading="paymentDetailsTable.loading"
           :columns="paymentDetailsTable.columns"
           :dataSource="paymentDetailsTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/purchase/freightPurchaseOrder/components/FreightPurOrderForm.vue

@@ -45,7 +45,7 @@
           :loading="FreightProductDetailsTable.loading"
           :columns="FreightProductDetailsTable.columns"
           :dataSource="FreightProductDetailsTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -66,7 +66,7 @@
           :loading="DeliveryDoticeTable.loading"
           :columns="DeliveryDoticeTable.columns"
           :dataSource="DeliveryDoticeTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

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

@@ -85,7 +85,7 @@
           :loading="paymentDetailsTable.loading"
           :columns="paymentDetailsTable.columns"
           :dataSource="paymentDetailsTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

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

@@ -17,7 +17,7 @@
 						
 						<a-col :span="12">
 							<a-form-item label="询价项目(inquiry project)" v-bind="validateInfos.projectName" id="PuechaseInquiryFormForm-projectName" name="projectName">
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入询价项目(inquiry project)" AutoComplete="off" :disabled="notAllowEdit"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入询价项目(inquiry project)" readonly AutoComplete="off" :disabled="notAllowEdit"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -108,7 +108,7 @@
           :loading="PuechaseInquiryFormProductTable.loading"
           :columns="PuechaseInquiryFormProductTable.columns"
           :dataSource="PuechaseInquiryFormProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -129,7 +129,7 @@
           :loading="PuechaseInquiryFormShipTable.loading"
           :columns="PuechaseInquiryFormShipTable.columns"
           :dataSource="PuechaseInquiryFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

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

@@ -25,7 +25,7 @@
 						
 						<a-col :span="12">
 							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="SaleOrderForm-projectName" name="projectName" >
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" :disabled="notAllowEdit"  allow-clear enter-button="Search" AutoComplete="off" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" readonly :disabled="notAllowEdit"  allow-clear enter-button="Search" AutoComplete="off" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -176,7 +176,7 @@
           :loading="purOrderFormShipFormProductTable.loading"
           :columns="purOrderFormShipFormProductTable.columns"
           :dataSource="purOrderFormShipFormProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -197,7 +197,7 @@
           :loading="PurOrderFormShipFormShipTable.loading"
           :columns="PurOrderFormShipFormShipTable.columns"
           :dataSource="PurOrderFormShipFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -237,6 +237,7 @@
   import { useUserStore } from '/@/store/modules/user';
   import {  ApiSelect, } from '/@/components/Form/index';
   import moment from 'moment';
+import { itemList } from '/@/views/system/dict/dict.api';
   const useForm = Form.useForm;
   export default defineComponent({
     name: "SaleOrderForm",
@@ -516,7 +517,7 @@
           item.model = item.childModel
           item.sourceId = item.childId
           item.sourceType = 'Quo'+item.childId
-          item.sourceCode =data[0].billCode
+          item.sourceCode =item.billCode
         })
         var arrProduct = data.concat(purOrderFormShipFormProductTable.dataSource)
         purOrderFormShipFormProductTable.dataSource=arrProduct  
@@ -541,8 +542,9 @@
           item.model = item.childModel
           item.sourceId = item.childId
           item.sourceType = 'Con'+item.childId
-          item.sourceCode =data[0].billCode 
-          item.taxPrice=data[0].taxPriceGys
+          item.sourceCode =item.billCode 
+          item.taxPrice=item.taxPriceGys
+          item.taxAmount = item.taxPrice*item.quantity
           // item.productClass =data[0].productClass
         })
         var arrProduct = data.concat(purOrderFormShipFormProductTable.dataSource)

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

@@ -17,7 +17,7 @@
 						
 						<a-col :span="12">
 							<a-form-item label="报价项目(quotation project)" v-bind="validateInfos.projectName" id="PuechaseQuotationFormForm-projectName" name="projectName">
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入报价项目(quotation project)" :disabled="notAllowEdit"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入报价项目(quotation project)" readonly :disabled="notAllowEdit"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -124,7 +124,7 @@
           :loading="PuechaseQuotationFormProductTable.loading"
           :columns="PuechaseQuotationFormProductTable.columns"
           :dataSource="PuechaseQuotationFormProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -145,7 +145,7 @@
           :loading="PuechaseQuotationFormShipTable.loading"
           :columns="PuechaseQuotationFormShipTable.columns"
           :dataSource="PuechaseQuotationFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/purchase/selectionQuotationForm/components/SelectQuotationFormForm.vue

@@ -17,7 +17,7 @@
 						
 						<a-col :span="12">
 							<a-form-item label="询价项目(inquiry project)" v-bind="validateInfos.projectName" id="SelectQuotationFormForm-projectName" name="projectName">
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入询价项目(inquiry project)"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入询价项目(inquiry project)" readonly  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -80,7 +80,7 @@
           :loading="SelectQuotationFormProductTable.loading"
           :columns="SelectQuotationFormProductTable.columns"
           :dataSource="SelectQuotationFormProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -106,7 +106,7 @@
           :loading="SelectQuotationFormShipTable.loading"
           :columns="SelectQuotationFormShipTable.columns"
           :dataSource="SelectQuotationFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -125,7 +125,7 @@
           :columns="SupplierQuotationDetailsTable.columns"
           :dataSource="SupplierQuotationDetailsTable.dataSource"
           :rowKey="record => record.childId"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -141,7 +141,7 @@
           :loading="SupplierSummaryAmountTable.loading"
           :columns="SupplierSummaryAmountTable.columns"
           :dataSource="SupplierSummaryAmountTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/saleCode/deliveryNotice/components/deliveryNoticeForm.vue

@@ -16,7 +16,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="quotationFormForm-projectName" name="projectName">
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)"  allow-clear enter-button="Search" :disabled="notAllowEdit" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" readonly  allow-clear enter-button="Search" :disabled="notAllowEdit" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -153,7 +153,7 @@
           :loading="deliveryDetailFormProductTable.loading"
           :columns="deliveryDetailFormProductTable.columns"
           :dataSource="deliveryDetailFormProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -175,7 +175,7 @@
           :loading="deliveryNoticeFormShipTable.loading"
           :columns="deliveryNoticeFormShipTable.columns"
           :dataSource="deliveryNoticeFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/saleCode/saleContract/components/SaleContractForm.vue

@@ -12,7 +12,7 @@
           :loading="saleContractShipTable.loading"
           :columns="saleContractShipTable.columns"
           :dataSource="saleContractShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :rowNumber="true"
           :rowSelection="true"
           :disabled="formDisabled"
@@ -28,7 +28,7 @@
           :loading="saleContractProductTable.loading"
           :columns="saleContractProductTable.columns"
           :dataSource="saleContractProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :rowNumber="true"
           :rowSelection="true"
           :disabled="formDisabled"

src/views/saleCode/saleContract/components/SaleContractModal.vue

@@ -2,7 +2,7 @@
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" width="95%" @ok="handleSubmit">
     <BasicForm @register="registerForm" ref="formRef" name="SaleContractForm">
         <template #quotationProjectName="props">
-								<a-input-search v-model:value="props.values.quotationProjectName" :disabled="notAllowEdit" AutoComplete="off"   allow-clear enter-button="Search" @search="onSearchProject( props)"></a-input-search>
+								<a-input-search v-model:value="props.values.quotationProjectName" :disabled="notAllowEdit"  readonly AutoComplete="off"   allow-clear enter-button="Search" @search="onSearchProject( props)"></a-input-search>
         </template>
     </BasicForm>
     <!-- 子表单区域 -->
@@ -17,7 +17,7 @@
           :loading="saleContractProductTable.loading"
           :columns="saleContractProductTable.columns"
           :dataSource="saleContractProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :rowNumber="true"
           :rowSelection="true"
           :disabled="formDisabled"
@@ -39,7 +39,7 @@
           :loading="saleContractShipTable.loading"
           :columns="saleContractShipTable.columns"
           :dataSource="saleContractShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :rowNumber="true"
           :rowSelection="true"
           :disabled="formDisabled"

src/views/saleCode/saleInquiryForm/components/SaleInquiryFormForm.vue

@@ -113,11 +113,11 @@
           :loading="saleInquiryFormProductTable.loading"
           :columns="saleInquiryFormProductTable.columns"
           :dataSource="saleInquiryFormProductTable.dataSource"
-          :height="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
           asyncRemove
+          :maxHeight="340"
           >
           <template #action="props">
                 <a-popconfirm title="确定删除吗？" @confirm="handleDelete1(props)">
@@ -135,7 +135,7 @@
           :loading="saleInquiryFormShipTable.loading"
           :columns="saleInquiryFormShipTable.columns"
           :dataSource="saleInquiryFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

src/views/saleCode/salesInvoice/components/saleInvoiceForm.vue

@@ -16,7 +16,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="saleInvoiceForm-projectName" name="projectName">
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)"  allow-clear enter-button="Search" :disabled="notAllowEdit" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" readonly allow-clear enter-button="Search" :disabled="notAllowEdit" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -142,7 +142,7 @@
           :loading="saleInvoiceDetailsTable.loading"
           :columns="saleInvoiceDetailsTable.columns"
           :dataSource="saleInvoiceDetailsTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -164,7 +164,7 @@
           :loading="saleInvoiceFormShipTable.loading"
           :columns="saleInvoiceFormShipTable.columns"
           :dataSource="saleInvoiceFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"

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

@@ -25,7 +25,7 @@
 						
 						<a-col :span="12">
 							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="SaleOrderForm-projectName" name="projectName">
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" :disabled="notAllowEdit"  allow-clear enter-button="Search" AutoComplete="off" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" readonly :disabled="notAllowEdit"  allow-clear enter-button="Search" AutoComplete="off" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -192,7 +192,7 @@
           :loading="SaleOrderFormShipFormProductTable.loading"
           :columns="SaleOrderFormShipFormProductTable.columns"
           :dataSource="SaleOrderFormShipFormProductTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -214,7 +214,7 @@
           :loading="SaleOrderFormShipFormShipTable.loading"
           :columns="SaleOrderFormShipFormShipTable.columns"
           :dataSource="SaleOrderFormShipFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"