Merge remote-tracking branch 'origin/pre-release' into pre-release

src/views/ecw/offer/edit.vue

@@ -394,7 +394,7 @@
         <div class="card-title" slot="header">{{ $t("通用") }}</div>
         <div class="form-section">
           <el-form-item :label="$t('唛头')" prop="marks">
-            <el-input v-model.trim="form.marks" placeholder="" class="w-200"></el-input>
+            <el-input v-model="form.marks"  @blur="trimMarks" placeholder="" class="w-200"></el-input>
           </el-form-item>
           <el-form-item :label="$t('报关方式')" prop="customsType" label-width="200px">
             <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable />
@@ -1480,6 +1480,10 @@ export default {
           })
         })
       }
+    },
+    // 去掉唛头首尾空格
+    trimMarks(){
+      this.form.marks = this.form.marks.trim()
     }
   }
 }