项目不可输入

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

@@ -16,7 +16,7 @@
 						</a-col>		
 						<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)" AutoComplete="off"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" readOnly AutoComplete="off"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">

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

@@ -16,7 +16,7 @@
 						</a-col>		
 						<a-col :span="12">
 							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="ArriveGoodsForm-projectName" name="projectName">
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" :disabled="notAllowEdit"  AutoComplete="off"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" readOnly :disabled="notAllowEdit"  AutoComplete="off"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">

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

@@ -16,7 +16,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="报价项目(quotation project)" v-bind="validateInfos.quotationProjectName" id="quotationFormForm-quotationProjectName" name="quotationProjectName">
-								<a-input-search v-model:value="formData.quotationProjectName" placeholder="请输入报价项目(inquiry project)"  allow-clear enter-button="Search" :disabled="notAllowEdit" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.quotationProjectName" readonly placeholder="请输入报价项目(inquiry project)"  allow-clear enter-button="Search" :disabled="notAllowEdit" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -163,7 +163,7 @@
           :loading="saleQuotationFormShipTable.loading"
           :columns="saleQuotationFormShipTable.columns"
           :dataSource="saleQuotationFormShipTable.dataSource"
-          :height="340"
+          :maxHeight="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -729,6 +729,11 @@
         if(prop.col.key=='quantity'&&prop.row.salePrice&&prop.row.quantity){
           prop.row.taxAmount =  (prop.row.salePrice*prop.row.quantity).toFixed(2)
         }
+        if(prop.col.key=='salePrice'){
+          var num = 1-( ((prop.row.purchasePrice/Number(formData.exchangeRate)*(1+prop.row.taxRate/100)*(1+prop.row.tariff/100)*(1-prop.row.discount/100))/prop.row.salePrice)+(prop.row.customerCommision/100-prop.row.intermediatorCommission/100))
+          num = (Number(num)*100).toFixed(2)
+          prop.row.grossMargin = !isNaN(num)?num:''
+        }
       }
       function changeDiscountOrExchangeRate(){
         if(saleQuotationFormProductTable.dataSource.length>0){

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

@@ -298,7 +298,7 @@ export const saleQuotationFormProductColumns: JVxeColumn[] = [
     {
       title: '销售单价(sale price)',
       key: 'salePrice',
-      type: JVxeTypes.normal,
+      type: JVxeTypes.inputNumber,
       placeholder: '请输入${title}',
       width:"200px",
       defaultValue:'',