Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -9,7 +9,8 @@ yarn-error.log*
 tests/**/coverage/
 tests/e2e/reports
 selenium-debug.log
-
+# 提取的需要翻译的文件列表
+messages.txt
 # Editor directories and files
 .idea
 .vscode

collectI18nMessages.js

+const fs = require('fs');
+const root = "./src"
+let allFiles = []
+
+function getFiles(dir){
+    let files = fs.readdirSync(dir)
+    files.forEach(file => {
+        let path = dir + '/' + file
+        if(fs.lstatSync(path).isDirectory()){
+            getFiles(path)
+        }else allFiles.push(path)
+    })
+}
+
+getFiles(root)
+let messages = new Set()
+allFiles.forEach(file => {
+    let data = fs.readFileSync(file, {encoding: 'utf-8'})
+    let matched = data.matchAll(/\$t\([\'\"]{1}([^\"\']+)[\'\"]{1}\)/g)
+    let i = 0
+    for(let item of matched){
+        i ++
+        messages.add(item[1])
+    }
+})
+fs.writeFileSync("./messages.txt", Array.from(messages).join("\n"))
+console.log("done!")
\ No newline at end of file

src/views/ecw/offer/detail.vue

@@ -105,10 +105,10 @@
                       <dict-tag :value="scope.row.unit" :type="DICT_TYPE.ECW_PACKAGING_TYPE" defaultable />
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('箱规(m)')" width="120px" prop="boxGauge" />
-                <el-table-column :label="$t('体积(m³)')" width="100px" prop="volume" />
-                <el-table-column :label="$t('重量(kg)')" width="100px" prop="weight" />
-                <el-table-column :label="$t('货值(RMB)')" width="100px" prop="worth" />
+                <el-table-column :label="$t('箱规') + '(m)'" width="120px" prop="boxGauge" />
+                <el-table-column :label="$t('体积') + '(m³)'" width="100px" prop="volume" />
+                <el-table-column :label="$t('重量') + '(kg)'" width="100px" prop="weight" />
+                <el-table-column :label="$t('货值') + '(RMB)'" width="100px" prop="worth" />
                 <el-table-column :label="$t('商品特性')" width="200px" prop="prodAttrName" />
                  <el-table-column :label="$t('是否预付')">
                    <template slot-scope="scope">