Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

src/i18n/lang/en.ts

@@ -138,8 +138,8 @@ export default {
     Pi_OrderNoNotSelected: 'Order number not selected',
     Pi_NoDataFound: 'No Data Found',
     Pi_QueryResults: 'Query result',
-    Pi_Summary: 'Summary',
+    Pi_Summary: 'By Summary',
-    Pi_ByOrder: 'Order',
+    Pi_ByOrder: 'By Order',
     Pi_ByOrderPicking: 'Order Pick up',
     Pi_SummaryPicking: 'Summary Pick up',
     Pi_upload: 'Upload',
@@ -238,7 +238,7 @@ export default {
     InventoryPleaseScan: 'Please scan No.',
     InventoryFinish: 'Finish',
     collecting: 'Please enter the collecting doc No',
-    MaterialCount: 'Material count',
+    MaterialCount: 'Stocktaking  by MAT',
     InventoryNumber: 'Inventory number',
     DocumentScanned: 'Document scanned',
     ReservoirArea: 'Reservoir area',
@@ -299,7 +299,7 @@ export default {
     Warehouse_TransferOrderNo: 'Transfer order No',
     BackSweep: 'Back sweep',
     SweptQuantity: 'Swept quantity',
-    LocationInventory: 'Location inventory',
+    LocationInventory: 'Stocktaking  by LOC',
     Warehouse_TransferDetails: 'Transfer detail',
     Warehouse_OrderNo: 'Order No',
     LocationScanned: 'Location scanned',

src/pages/product/warehouse/wholeScrap/index.vue

@@ -36,16 +36,16 @@
         <u-input :disabled="true" v-model="Some.originWl" placeholder="" />
       </u-form-item>
       <!-- 目标库位 -->
-      <u-form-item :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
+      <!-- <u-form-item :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
         <u-input :disabled="true" v-model="Some.aimWl" placeholder="" />
-      </u-form-item>
+      </u-form-item> -->
       <!-- 成本中心 -->
       <u-form-item :label="$t('message.product_costCenter')">
         <u-input v-model="Some.costCenter" :disabled="true" placeholder="" />
       </u-form-item>
       <!-- 文件号 -->
       <u-form-item :label="$t('message.DocumentNumber')">
-        <u-input v-model="Some.fileNo" placeholder="" />
+        <u-input v-model="Some.fileNo" :placeholder="$t('message.fileNumber')" />
       </u-form-item>
       <!-- 已扫 -->
       <u-form-item :label="$t('message.product_Swept')">