1.1.17 报价单添加付款明细字段（提示付款节点及比例），报价单模板加物料税率。

src/api/oa/crm/crmQuoteInfo/types.ts

@@ -84,6 +84,11 @@ export interface CrmQuoteInfoVO {
    */
   paymentMethod: string;
 
+  /**
+   * 付款明细（文本说明）
+   */
+  paymentDetail?: string;
+
   /**
    * 币种（字典类型）
    */
@@ -297,6 +302,11 @@ export interface CrmQuoteInfoForm extends BaseEntity {
    */
   paymentMethod?: string;
 
+  /**
+   * 付款明细（文本说明）
+   */
+  paymentDetail?: string;
+
   /**
    * 币种（字典类型）
    */
@@ -520,6 +530,11 @@ export interface CrmQuoteInfoQuery extends PageQuery {
    */
   paymentMethod?: string;
 
+  /**
+   * 付款明细（文本说明）
+   */
+  paymentDetail?: string;
+
   /**
    * 币种（字典类型）
    */

src/views/oa/crm/crmQuoteInfo/edit.vue

@@ -118,6 +118,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="付款明细" prop="paymentDetail">
+              <el-input
+                v-model="form.paymentDetail"
+                placeholder="请输入付款节点及付款比例（如：预付款30%，验收款70%等）"
+                :disabled="isView"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="币种" prop="currencyType">
               <el-select v-model="form.currencyType" placeholder="请选择币种" :disabled="isView">
@@ -130,24 +139,24 @@
               <el-input v-model="form.taxIncludedInfo" placeholder="如：含13%增值税" :disabled="isView" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+<!--          <el-col :span="12">-->
-            <el-form-item label="税率(%)" prop="taxRate">
+<!--            <el-form-item label="税率(%)" prop="taxRate">-->
-              <el-select
+<!--              <el-select-->
-                v-model="form.taxRate"
+<!--                v-model="form.taxRate"-->
-                placeholder="请选择或输入税率"
+<!--                placeholder="请选择或输入税率"-->
-                style="width: 100%"
+<!--                style="width: 100%"-->
-                :disabled="isView"
+<!--                :disabled="isView"-->
-                filterable
+<!--                filterable-->
-                allow-create
+<!--                allow-create-->
-                default-first-option
+<!--                default-first-option-->
-              >
+<!--              >-->
-                <el-option label="0" :value="0"></el-option>
+<!--                <el-option label="0" :value="0"></el-option>-->
-                <el-option label="6" :value="6"></el-option>
+<!--                <el-option label="6" :value="6"></el-option>-->
-                <el-option label="9" :value="9"></el-option>
+<!--                <el-option label="9" :value="9"></el-option>-->
-                <el-option label="13" :value="13"></el-option>
+<!--                <el-option label="13" :value="13"></el-option>-->
-              </el-select>
+<!--              </el-select>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="打印模板" prop="templateId">
               <div class="flex gap-2 items-center" style="width: 100%">
@@ -251,7 +260,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="产品名称" prop="productName">
-                  <el-input v-model="materialForm.productName" placeholder="请输入产品名称" @input="handleMaterialProductNameInput" />
+                  <el-input v-model="materialForm.productName" placeholder="请输入产品名称(合同显示)" @input="handleMaterialProductNameInput" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -280,8 +289,10 @@
               <el-col :span="12">
                 <el-form-item label="税率(%)" prop="taxRate">
                   <el-select v-model="materialForm.taxRate" placeholder="请选择税率" style="width: 100%" @change="calculateBeforePrice">
-                    <el-option label="6" :value="6" />
+                    <el-option label="0" :value="0"></el-option>
-                    <el-option label="13" :value="13" />
+                    <el-option label="6" :value="6"></el-option>
+                    <el-option label="9" :value="9"></el-option>
+                    <el-option label="13" :value="13"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -437,7 +448,7 @@
         </el-col>
       </el-row>
       <el-table :data="materialRows" border show-summary :summary-method="getSummary">
-        <el-table-column label="产品名称" align="center" prop="productName" min-width="160" />
+        <el-table-column label="产品名称(合同显示)" align="center" prop="productName" min-width="160" />
         <el-table-column label="规格描述" align="center" prop="specificationDescription" min-width="160" />
         <el-table-column label="物料编号" align="center" prop="materialCode" width="140" />
         <el-table-column label="物料名称" align="center" prop="materialName" width="160" />
@@ -540,6 +551,7 @@ const form = reactive<CrmQuoteInfoForm>({
   warrantyPeriod: undefined,
   deliveryMethod: undefined,
   paymentMethod: undefined,
+  paymentDetail: undefined,
   currencyType: undefined,
   taxIncludedInfo: undefined,
   taxRate: undefined,