Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/contractManage/components/editContract.vue

@@ -833,6 +833,7 @@ export default {
               } else {
                 this.form.type = this.$route.query.type
               }
+              console.log('2222222',this.form)
               this.form.discountrate ? this.form.discountrate =  (parseFloat(this.form.discountrate) / 100).toFixed(4) : ''
               this.form.productdiscount ? this.form.productdiscount =  (parseFloat(this.form.productdiscount) / 100).toFixed(4) : ''
               this.form.orderratio ? this.form.orderratio =  (parseFloat(this.form.orderratio) / 100).toFixed(4) : ''
@@ -853,6 +854,7 @@ export default {
               })
 
             } else {
+              this.form.discountrate ? this.form.discountrate =  (parseFloat(this.form.discountrate) / 100).toFixed(4) : ''
               this.form.orderratio ? this.form.orderratio =  (parseFloat(this.form.orderratio) / 100).toFixed(4) : ''
               this.form.productdiscount ? this.form.productdiscount =  (parseFloat(this.form.productdiscount) / 100).toFixed(4) : ''
               let res = await this.$api.requested({

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

@@ -85,7 +85,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item  :label="$t(`品牌名称`)+':'">
-                <el-input  autosize v-model="form.brandname" :placeholder="$t(`品牌名称`)" ></el-input>
+                <el-input  autosize v-model="form.brandname" :placeholder="$t(`品牌名称`)" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">