lijunping пре 3 месеци
родитељ
комит
58669c8d74

+ 2 - 1
src/lang/en.js

@@ -150,7 +150,8 @@ export default {
         generateNo :'generateNo',
         onBoard:'onBoard',
         onArrival:'onArrival',
-        returnEmpty:'onArrival',
+        returnEmpty:'returnEmpty',
+        pickUp:'pickUp',
         customs:'customs',
         customsNo:'customsNo',
         changeDoc:'changeDoc',

+ 2 - 1
src/lang/zh.js

@@ -148,7 +148,8 @@ export default {
     generateNo :'出号',
     onBoard:'开船',
     onArrival:'到港',
-    returnEmpty:'返空',
+    returnEmpty:'返空日期',
+    pickUp:'提柜日期',
     customs:'通关',
     customsNo:'报关单号',
     changeDoc:'换单',

+ 12 - 11
src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -531,7 +531,7 @@
                             <el-col>
                                 <el-form-item label="退押日期" prop="returnDate" label-width="80px">
                                     <span slot="label">
-                                        <span style="color: #1e9fff">{{ $t("sea118n.returnDeposit") }}</span>
+                                        <span style="color: #1e9fff">{{ $t("btn118n.returnDeposit") }}</span>
                                     </span>
                                     <el-date-picker v-model="assemblyForm.returnDate" clearable style="width: 100%"
                                         type="date" size="small"
@@ -543,32 +543,33 @@
                         </div>
                         <div>
                             <el-col>
-                                <el-form-item label="返空日期" prop="returnEmptyDate" label-width="80px">
+                                <el-form-item label="通关日期" prop="clearanceDate" label-width="80px">
                                     <span slot="label">
-                                        <span style="color: #1e9fff">{{ $t("sea118n.returnEmpty") }}</span>
+                                        <span style="color: #1e9fff">{{ $t("sea118n.pickUp") }}</span>
                                     </span>
-                                    <el-date-picker v-model="assemblyForm.returnEmptyDate" clearable style="width: 100%"
-                                        type="date" size="small"
-                                        :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" placeholder="请选择返空日期">
+                                    <el-date-picker v-model="assemblyForm.clearanceDate" clearable style="width: 100%"
+                                                    type="date" size="small"
+                                                    :disabled="detailData.seeDisabled || generateBillsfalse"
+                                                    value-format="yyyy-MM-dd" placeholder="请选择通关日期">
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
                         </div>
                         <div>
                             <el-col>
-                                <el-form-item label="通关日期" prop="clearanceDate" label-width="80px">
+                                <el-form-item label="返空日期" prop="returnEmptyDate" label-width="80px">
                                     <span slot="label">
-                                        <span style="color: #1e9fff">{{ $t("sea118n.customs") }}</span>
+                                        <span style="color: #1e9fff">{{ $t("sea118n.returnEmpty") }}</span>
                                     </span>
-                                    <el-date-picker v-model="assemblyForm.clearanceDate" clearable style="width: 100%"
+                                    <el-date-picker v-model="assemblyForm.returnEmptyDate" clearable style="width: 100%"
                                         type="date" size="small"
                                         :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" placeholder="请选择通关日期">
+                                        value-format="yyyy-MM-dd" placeholder="请选择返空日期">
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
                         </div>
+
                         <div>
                             <el-col>
                                 <el-form-item label="报关单号" prop="customsDeclarationNumber" label-width="80px">