jinhui.wang

文本修改

...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 > 40 >
41 Empty 41 Empty
42 </div> --> 42 </div> -->
43 - <div v-loading="scope.row.loading" style="margin-top: 5px"> 43 + <div v-loading="scope.row.loading" style="margin-top: 5px;padding:5px">
44 <div 44 <div
45 class="fileItem" 45 class="fileItem"
46 v-for="(item, index) in scope.row.files" 46 v-for="(item, index) in scope.row.files"
...@@ -56,7 +56,9 @@ ...@@ -56,7 +56,9 @@
56 <i class="el-icon-document" />{{ file.sourceFileName }} 56 <i class="el-icon-document" />{{ file.sourceFileName }}
57 </div> 57 </div>
58 <div class="filtItemData-option"> 58 <div class="filtItemData-option">
59 - <span>{{ file.fileSize }}</span> 59 + <span>
60 + {{ numberRound(Number(file.fileSize / 1024), 2) }}KB
61 + </span>
60 <!-- <el-button type="text" @click="viewFile(file)" 62 <!-- <el-button type="text" @click="viewFile(file)"
61 >view</el-button 63 >view</el-button
62 > --> 64 > -->
......
...@@ -608,9 +608,9 @@ export default { ...@@ -608,9 +608,9 @@ export default {
608 if (value != null && value != "") { 608 if (value != null && value != "") {
609 let reg = /[^\d]/; 609 let reg = /[^\d]/;
610 if (value.length != 9 && value.length != 12) { 610 if (value.length != 9 && value.length != 12) {
611 - callback("TRACKING NUMBER需为12位!"); 611 + callback("The tracking number needs to be 12 digits!");
612 } else if (reg.test(value)) { 612 } else if (reg.test(value)) {
613 - callback("TRACKING NUMBER需为数字!"); 613 + callback("The tracking number must be a number!");
614 } else { 614 } else {
615 callback(); 615 callback();
616 } 616 }
...@@ -632,9 +632,9 @@ export default { ...@@ -632,9 +632,9 @@ export default {
632 if (value != null && value != "") { 632 if (value != null && value != "") {
633 let reg = /[^\d]/; 633 let reg = /[^\d]/;
634 if (value.length < 9) { 634 if (value.length < 9) {
635 - callback("shipper accpunt需为9位!"); 635 + callback("Shipper accpunt needs to be 9 digits!");
636 } else if (reg.test(value)) { 636 } else if (reg.test(value)) {
637 - callback("shipper accpunt需为数字!"); 637 + callback("Shipper accpunt must be a number!");
638 } else { 638 } else {
639 callback(); 639 callback();
640 } 640 }
......
...@@ -177,13 +177,15 @@ export default { ...@@ -177,13 +177,15 @@ export default {
177 }); 177 });
178 }); 178 });
179 if (fileSum + 1 > 100) { 179 if (fileSum + 1 > 100) {
180 - this.$message.warning("上传文件总数最大100个!"); 180 + this.$message.warning("The maximum number of uploaded files is 100!");
181 return false; 181 return false;
182 - } else if (Number(fileSize) + Number(val.fileSize) / 1024 / 1024 > 100) { 182 + } else if (Number(fileSize) + Number(val.fileSize) / 1024 / 1024 > 95) {
183 - this.$message.warning("上传文件总大小最大100M!"); 183 + this.$message.warning(
184 + "The maximum total size of uploaded files is 95M!"
185 + );
184 return false; 186 return false;
185 } else if (fileNameArray.includes(val.fileName)) { 187 } else if (fileNameArray.includes(val.fileName)) {
186 - this.$message.warning("上传文件名重复!"); 188 + this.$message.warning("Duplicate file name uploaded!");
187 return false; 189 return false;
188 } else { 190 } else {
189 return true; 191 return true;
......