Merge branch 'mergeBranch' into greenUrgent

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -168,11 +168,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col  :span="24">
-              <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
-                <el-input type="number"  v-model="form.discountrate" autocomplete="off" placeholder="请输入0-100%"   @change="discountrateChange"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col  :span="24">
               <el-form-item label="业务员:" label-width="100px" prop="salername">
                 <el-input disabled  v-model="form.salername" autocomplete="off" placeholder="请选择业务员"  ></el-input>