Merge remote-tracking branch 'origin/master'

lms/nladmin-system/src/main/resources/language/i18n/en.js

@@ -49,6 +49,11 @@ var config = {
         "mesErrorTitle": "MES Error"
     },
     "common": {
+        "warehousing_time": "Warehousing Time",
+        "stock_age": "Stock Age",
+        "produce_age": "Production Duration (Days)",
+        "reason_for_overdue": "Reason for Overdue",
+        "box_weight": "Gross Weight",
         "documentNumber": "Document Number",
         "biheight": "Height",
         "biwidth": "Width",

lms/nladmin-system/src/main/resources/language/i18n/id.js

@@ -48,6 +48,11 @@ var config = {
         "load_text5": "Hanya dapat mengunggah satu file excel!"
     },
     "common": {
+        "warehousing_time": "Waktu Pemasukan Gudang",
+        "stock_age": "Usia Inventaris",
+        "produce_age": "Durasi Produksi (hari)",
+        "reason_for_overdue": "Alasan Keterlambatan",
+        "box_weight": "Berat Kotor",
         "documentNumber": "Nomor Dokumen",
         "biheight": "Tinggi",
         "biwidth": "Lebar",

lms/nladmin-system/src/main/resources/language/i18n/zh.js

@@ -93,6 +93,11 @@ var config = {
         "correspondingDeepLocationError": "对应的深货位错误!"
     },
     "common": {
+        "warehousing_time":"入库时间",
+        "stock_age":"库龄",
+        "produce_age":"生产时长（天）",
+        "reason_for_overdue":"超期原因",
+        "box_weight":"毛重",
         "documentNumber": "单据号",
         "biheight":"高度",
         "biwidth":"宽度",
@@ -179,7 +184,7 @@ var config = {
         "syscompanyid": "公司ID",
         "sysdeptid": "部门ID",
         "product_name": "产品编码",
-        "package_box_sn": "木箱唯一码",
+        "package_box_sn": "木箱码",
         "ext_code": "外部编码",
         "bill_code": "单据编号",
         "io_type": "出入类型",
@@ -1542,7 +1547,7 @@ var config = {
         "product_description": "产品描述",
         "product_name": "产品编码",
         "quality_guaran_period": "保质期",
-        "quanlity_in_box": "箱内子卷数量",
+        "quanlity_in_box": "子卷数",
         "real_weight": "实际木箱自身重量",
         "remark": "备注",
         "sale_order_description": "销售订单描述",

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -304,21 +304,21 @@
           :label="$t('common.vbeln_order')"
           :min-width="flexWidth('sale_order_name',crud.data,'销售订单')"
         />
-        <el-table-column prop="box_weight" :label="$t('pdm_bi_subpackagerelation.box_weight')" :formatter="rounding2" />
+        <el-table-column prop="box_weight" :label="$t('common.box_weight')" :formatter="rounding2" />
         <el-table-column prop="canuse_qty" :label="$t('st_ivt_structivt.canuse_qty')" :formatter="rounding" />
         <el-table-column prop="frozen_qty" :label="$t('st_ivt_structivt.frozen_qty')" :formatter="rounding" />
         <el-table-column prop="ivt_qty" :label="$t('st_ivt_structivt.ivt_qty')" :formatter="rounding" />
         <el-table-column prop="warehousing_qty" :label="$t('st_ivt_structivt.warehousing_qty')" :formatter="rounding" />
         <el-table-column prop="unit_name" :label="$t('common.qty_unit_name')" />
-        <el-table-column prop="confirm_time" :label="$t('common.confirm_time')" min-width="150" />
-        <el-table-column prop="stock_age" :label="$t('common.create_time')" min-width="150" />
+        <el-table-column prop="confirm_time" :label="$t('common.warehousing_time')" min-width="150" />
+        <el-table-column prop="stock_age" :label="$t('common.stock_age')" min-width="150" />
         <el-table-column prop="joint_type" :label="$t('pdm_bi_subpackagerelation.joint_type')" min-width="150" />
         <el-table-column prop="sub_type" :label="$t('common.sub_type')" min-width="150" :formatter="formatSubType" />
-        <el-table-column prop="produce_age" :label="$t('common.create_time')" min-width="120" />
+        <el-table-column prop="produce_age" :label="$t('common.produce_age')" min-width="120" />
         <el-table-column prop="paper_type" :label="$t('common.quality_scode')" min-width="150" />
         <el-table-column prop="paper_code" :label="$t('pdm_bi_slittingproductionplan.paper_code')" min-width="150" />
         <el-table-column prop="paper_name" :label="$t('pdm_bi_slittingproductionplan.paper_name')" min-width="250" />
-        <el-table-column prop="remark" :label="$t('common.remark')" min-width="250">
+        <el-table-column prop="remark" :label="$t('common.reason_for_overdue')" min-width="250">
           <template scope="scope">
             <el-select
               v-model="scope.row.remark"

lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/AddDialog.vue

@@ -39,11 +39,11 @@
       <el-input v-show="false" v-model="form.stor_code" :placeholder="$t('common.storCode')"/>
       <el-input v-show="false" v-model="form.stor_name" :placeholder="$t('common.storName')"/>
       <el-form-item :label="$t('common.bill_code')" prop="plan_code">
-        <label slot="label">{{$t('common.bill_code')}}</label>
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.plan_code" disabled :placeholder="$t('common.systemGenerated')" clearable style="width: 210px"/>
       </el-form-item>
       <el-form-item :label="$t('common.warehouse')" prop="stor_id"/>
-        <label slot="label">{{$t('common.warehouse')}}</label>
+        <label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
         <el-select
           v-model="form.stor_id"
           clearable