zihan.wu

refactor(i18n):优化国际化文案并统一字段名称- 修改了多个组件中的字段标签,如"电商企业"改为"电商企业名称","运港代码"改为"指运港代码"

...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 > 17 >
18 <el-row :gutter="5"> 18 <el-row :gutter="5">
19 <el-col :span="3"> 19 <el-col :span="3">
20 - <Formitem label="电商企业" prop="ebccode"> 20 + <Formitem label="电商企业名称" prop="ebccode">
21 <el-select 21 <el-select
22 type="text" 22 type="text"
23 id="inputInner--ebccode" 23 id="inputInner--ebccode"
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 </Formitem> 36 </Formitem>
37 </el-col> 37 </el-col>
38 <el-col :span="3"> 38 <el-col :span="3">
39 - <Formitem label="物流企业" prop="logisticsCode"> 39 + <Formitem label="物流企业" prop="logisticsCode">
40 <el-input 40 <el-input
41 type="text" 41 type="text"
42 class="inputShadow" 42 class="inputShadow"
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
282 </Formitem> 282 </Formitem>
283 </el-col> 283 </el-col>
284 <el-col :span="3"> 284 <el-col :span="3">
285 - <Formitem label="运港代码" prop="portCode"> 285 + <Formitem label="运港代码" prop="portCode">
286 <el-select 286 <el-select
287 type="text" 287 type="text"
288 id="inputInner--portCode" 288 id="inputInner--portCode"
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
475 </Formitem> 475 </Formitem>
476 </el-col> 476 </el-col>
477 </el-row> 477 </el-row>
478 - </el-form> 478 + </el-form>
479 </section> 479 </section>
480 <div class="fold-unfold"> 480 <div class="fold-unfold">
481 <img v-if="isFold" src="@/assets/images/fold.png" @click="()=>isFold = false" alt=""> 481 <img v-if="isFold" src="@/assets/images/fold.png" @click="()=>isFold = false" alt="">
...@@ -496,21 +496,21 @@ ...@@ -496,21 +496,21 @@
496 :expandRowKeys="expandRowKeys" 496 :expandRowKeys="expandRowKeys"
497 > 497 >
498 <template slot="rowDataEdit" slot-scope="props"> 498 <template slot="rowDataEdit" slot-scope="props">
499 - <RowDataEditForm 499 + <RowDataEditForm
500 ref="rowEditForm" 500 ref="rowEditForm"
501 - :rowDatas="props" 501 + :rowDatas="props"
502 @cancelEditRowData="cancelEditRowData" 502 @cancelEditRowData="cancelEditRowData"
503 @rowFormDataSave="rowFormDataSave" 503 @rowFormDataSave="rowFormDataSave"
504 - /> 504 + />
505 </template> 505 </template>
506 <template v-slot:destinationCountryRegionCode="scope"> 506 <template v-slot:destinationCountryRegionCode="scope">
507 - <span>{{ mapDicDatas($store.getters.dict.COUNTRY_REGION_CODE, scope.row.destinationCountryRegionCode) }}</span> 507 + <span>{{ mapDicDatas($store.getters.dict.COUNTRY_REGION_CODE, scope.row.destinationCountryRegionCode) }}</span>
508 </template> 508 </template>
509 <template v-slot:unit="scope"> 509 <template v-slot:unit="scope">
510 - <span>{{ mapDicDatas($store.getters.dict.MEASUREMENT_UNIT, scope.row.unit) }}</span> 510 + <span>{{ mapDicDatas($store.getters.dict.MEASUREMENT_UNIT, scope.row.unit) }}</span>
511 </template> 511 </template>
512 <template v-slot:currency="scope"> 512 <template v-slot:currency="scope">
513 - <span>{{ mapCurrencyDatas($store.getters.dict.CURRENCY, scope.row.currency) }}</span> 513 + <span>{{ mapCurrencyDatas($store.getters.dict.CURRENCY, scope.row.currency) }}</span>
514 </template> 514 </template>
515 <template slot="optionColumn"> 515 <template slot="optionColumn">
516 <el-table-column align="left" label="操作" width="100"> 516 <el-table-column align="left" label="操作" width="100">
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
524 </section> 524 </section>
525 <div class="addNewItem"> 525 <div class="addNewItem">
526 <i class="el-icon-circle-plus-outline" @click="addNewItem"></i> 526 <i class="el-icon-circle-plus-outline" @click="addNewItem"></i>
527 - <span @click="addNewItem">添加新物品</span> 527 + <span @click="addNewItem">添加新物品</span>
528 </div> 528 </div>
529 <div style="margin-top: 20px; text-align: center"> 529 <div style="margin-top: 20px; text-align: center">
530 <el-button 530 <el-button
...@@ -539,7 +539,7 @@ ...@@ -539,7 +539,7 @@
539 </div> 539 </div>
540 </div> 540 </div>
541 </template> 541 </template>
542 - 542 +
543 <script> 543 <script>
544 import RowDataEditForm from "./RowDataEditForm.vue"; 544 import RowDataEditForm from "./RowDataEditForm.vue";
545 import { getCustomerList, getPortList, getDeclareData, updateDeclareData } from "@/api/declareData-api.js"; 545 import { getCustomerList, getPortList, getDeclareData, updateDeclareData } from "@/api/declareData-api.js";
...@@ -552,7 +552,7 @@ ...@@ -552,7 +552,7 @@
552 if (value < 0) { 552 if (value < 0) {
553 callback(new Error('数值不能为负')); 553 callback(new Error('数值不能为负'));
554 } else { 554 } else {
555 - callback(); 555 + callback();
556 } 556 }
557 }; 557 };
558 var checkPackNo = (rule, value, callback) => { 558 var checkPackNo = (rule, value, callback) => {
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
625 { required: true, message: '请选择运抵国', trigger: 'change' } 625 { required: true, message: '请选择运抵国', trigger: 'change' }
626 ], 626 ],
627 portCode: [ 627 portCode: [
628 - { required: true, message: '请选择运港代码', trigger: 'change' } 628 + { required: true, message: '请选择运指运港代码', trigger: 'change' }
629 ], 629 ],
630 freight: [ 630 freight: [
631 { required: true, message: '请输入运费', trigger: 'blur' }, 631 { required: true, message: '请输入运费', trigger: 'blur' },
...@@ -668,8 +668,8 @@ ...@@ -668,8 +668,8 @@
668 detialHeaderData: [ 668 detialHeaderData: [
669 { 669 {
670 value: "rowDataEdit", 670 value: "rowDataEdit",
671 - expand:true, 671 + expand:true,
672 - width:0, 672 + width:0,
673 }, 673 },
674 { 674 {
675 name: "企业商品货号", 675 name: "企业商品货号",
...@@ -707,7 +707,7 @@ ...@@ -707,7 +707,7 @@
707 value: "model", 707 value: "model",
708 width: "", 708 width: "",
709 align: "left", 709 align: "left",
710 - 710 +
711 }, 711 },
712 { 712 {
713 name: "账册备案料号", 713 name: "账册备案料号",
...@@ -805,7 +805,7 @@ ...@@ -805,7 +805,7 @@
805 } else { 805 } else {
806 return '' 806 return ''
807 } 807 }
808 - 808 +
809 }, 809 },
810 mapCurrencyDatas(dicArr, code){ 810 mapCurrencyDatas(dicArr, code){
811 if (code != "") { 811 if (code != "") {
...@@ -891,20 +891,20 @@ ...@@ -891,20 +891,20 @@
891 "totalPrice": 0, 891 "totalPrice": 0,
892 "unit": "" 892 "unit": ""
893 }) 893 })
894 - this.$nextTick(()=>{ 894 + this.$nextTick(()=>{
895 this.expandRowKeys = [orderNum] 895 this.expandRowKeys = [orderNum]
896 }) 896 })
897 }, 897 },
898 updateRow(row){ 898 updateRow(row){
899 if (this.expandRowKeys.length > 0) return 899 if (this.expandRowKeys.length > 0) return
900 - this.expandRowKeys = [row.gnum] 900 + this.expandRowKeys = [row.gnum]
901 - let obj = {} 901 + let obj = {}
902 for (let key in row) { 902 for (let key in row) {
903 obj[key] = row[key] 903 obj[key] = row[key]
904 } 904 }
905 - 905 +
906 - this.$nextTick(()=>{ 906 + this.$nextTick(()=>{
907 - this.$refs.rowEditForm.tableRowformData = obj 907 + this.$refs.rowEditForm.tableRowformData = obj
908 // const table = this.$refs.entryTable.$el.querySelector('.el-table__body-wrapper'); 908 // const table = this.$refs.entryTable.$el.querySelector('.el-table__body-wrapper');
909 // table.scrollTop = row.gnum*51+10 909 // table.scrollTop = row.gnum*51+10
910 }) 910 })
...@@ -976,7 +976,7 @@ ...@@ -976,7 +976,7 @@
976 }, 976 },
977 }; 977 };
978 </script> 978 </script>
979 - 979 +
980 <style scoped lang="scss"> 980 <style scoped lang="scss">
981 .entry { 981 .entry {
982 width: 100%; 982 width: 100%;
...@@ -984,12 +984,12 @@ ...@@ -984,12 +984,12 @@
984 padding: 10px; 984 padding: 10px;
985 background-color: #fff; 985 background-color: #fff;
986 overflow: auto; 986 overflow: auto;
987 - 987 +
988 .entryInformation { 988 .entryInformation {
989 width: 100%; 989 width: 100%;
990 height: 100%; 990 height: 100%;
991 } 991 }
992 - 992 +
993 .entryTitle { 993 .entryTitle {
994 display: flex; 994 display: flex;
995 justify-content: space-between; 995 justify-content: space-between;
...@@ -998,7 +998,7 @@ ...@@ -998,7 +998,7 @@
998 color: #000; 998 color: #000;
999 margin-bottom: 10px; 999 margin-bottom: 10px;
1000 } 1000 }
1001 - 1001 +
1002 .titleBorder { 1002 .titleBorder {
1003 border-bottom: 1px solid #333; 1003 border-bottom: 1px solid #333;
1004 } 1004 }
...@@ -1048,4 +1048,3 @@ ...@@ -1048,4 +1048,3 @@
1048 } 1048 }
1049 } 1049 }
1050 </style> 1050 </style>
1051 -
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
211 align: "left", 211 align: "left",
212 }, 212 },
213 { 213 {
214 - name: "电商企业", 214 + name: "电商企业名称",
215 value: "ebcname", 215 value: "ebcname",
216 width: "", 216 width: "",
217 align: "left", 217 align: "left",
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 </el-col> 48 </el-col>
49 <!-- 运单号 --> 49 <!-- 运单号 -->
50 <el-col :span="5"> 50 <el-col :span="5">
51 - <Formitem label="运单编号" prop="logisticsWaybillNumber"> 51 + <Formitem label="物流运单编号" prop="logisticsWaybillNumber">
52 <FormTextareaInput 52 <FormTextareaInput
53 :formData="sreachFormData" 53 :formData="sreachFormData"
54 dataKey="logisticsWaybillNumber" 54 dataKey="logisticsWaybillNumber"
......