Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/contractManage/components/addContract.vue

@@ -1030,7 +1030,7 @@
                   type="text"
                   size="small"
                   v-model="form.customername"
-                  placeholder="客户名称"
+                  :placeholder="$t(`客户名称`)"
                 ></el-input>
               </el-form-item>
             </el-col>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -802,7 +802,7 @@ export default {
       if (this.$route.query.type == '居间'){
         this.form.enterprisename = this.data.ascription_enterprisename
         this.form.customername = this.data.enterprisename
-        this.form.ascription_title_new = this.data.ascription_title ? this.data.billno + '-' +  this.data.ascription_title : this.data.billno
+        this.form.ascription_title_new = this.data.ascription_title ? this.data.ascription_billno + '-' +  this.data.ascription_title : this.data.ascription_billno
       }
       this.drawer = true
       if (!this.form.reminddays){