修改国际化

ruoyi-ui/src/lang/zh.js

@@ -1323,6 +1323,12 @@ export default {
     inventoryManagement: '盘点管理',
     createNewInventoryDocument: '新建盘点单据',
     inventoryDocumentManagement: '盘点单据管理',
+    flatManagement: '平库盘点库存',
+    flatManagementInfo:{
+      add: '添加盘库库存',
+      edit: '修改盘库库存',
+      delete: '删除盘库库存',
+    },
     inventoryStorageTask: '盘点入库作业',
     inventoryOutboundTask: '盘点出库作业',
     inventoryDiscrepancyManagement: '盘点差异管理',

ruoyi-ui/src/views/check/job/out/index.vue

@@ -120,7 +120,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="handleCompletedManually({type: 'completed'})"
-          v-hasPermi="['job:job:checkMydoJob:OuthandInvalidation']"
+          v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
         >{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

ruoyi-ui/src/views/in/job/index.vue

@@ -157,21 +157,21 @@
       </el-table-column>
       <el-table-column :label="$t('inJob.entrance')" align="left" prop="entranceId" /> // 入口ID
       <el-table-column :label="$t('inJob.warehouse')" align="left" prop="warehouseName" /> // 仓库ID
-      <el-table-column :label="$t('inJob.createTime')" align="left" prop="createTime" width="180"> // 创建时间
+      <el-table-column :label="$t('inJob.createTime')" align="left" prop="createTime" width="180"/> // 创建时间
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
-      <el-table-column :label="$t('inJob.startTime')" align="left" prop="startTime" width="180"> // 开始时间
+      <el-table-column :label="$t('inJob.startTime')" align="left" prop="startTime" width="180"/> // 开始时间
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
-      <el-table-column :label="$t('inJob.finishTime')" align="left" prop="finishTime" width="180"> // 结束时间
+      <el-table-column :label="$t('inJob.finishTime')" align="left" prop="finishTime" width="180"/> // 结束时间
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
 
     </el-table>
 
@@ -197,15 +197,15 @@
       <el-table-column :label="$t('inJob.englishDesc')" align="left" prop="extraField.englishDesc" /> // 英文描述
       <el-table-column :label="$t('inJob.cartonNo')" align="left" prop="extraField.cartonNo" /> // 箱号
       <el-table-column :label="$t('inJob.packingMethod')" align="left" prop="extraField.packingMethod" /> // 包装方式
-      <el-table-column :label="$t('inJob.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> // 净重
+<!--      <el-table-column :label="$t('inJob.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> // 净重-->
-      <el-table-column :label="$t('inJob.totalNetWeight')" align="right" prop="extraField.totalNetWeight" /> // 总净重
+<!--      <el-table-column :label="$t('inJob.totalNetWeight')" align="right" prop="extraField.totalNetWeight" /> // 总净重-->
-      <el-table-column :label="$t('inJob.grossWeight')" align="right" prop="extraField.grossWeight" /> // 毛重
+<!--      <el-table-column :label="$t('inJob.grossWeight')" align="right" prop="extraField.grossWeight" /> // 毛重-->
       <el-table-column :label="$t('inJob.inQuantity')" align="right" prop="inQuantity" /> // 入库数量
-      <el-table-column :label="$t('inJob.inDate')" align="left" prop="inDate" width="180"> // 入库时间
+<!--      <el-table-column :label="$t('inJob.inDate')" align="left" prop="inDate" width="180"> // 入库时间-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
+<!--          <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -409,7 +409,7 @@ export default {
       if (row.type === 'invalid'){
         //手动作废
         manualInvalidation(data).then(response => {
-          this.$modal.msgSuccess(this.$t('inJob.inJob.operaSuccess'));
+          this.$modal.msgSuccess(this.$t('inJob.operaSuccess'));
           this.getList();
         })
 

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -159,7 +159,7 @@
       <el-table-column :label="$t('inReceiveStockin.englishDesc')" align="left" prop="extraField.englishDesc"/><!--英文描述-->
       <el-table-column :label="$t('inReceiveStockin.cartonNo')" align="left" prop="extraField.cartonNo"/><!--箱号-->
       <el-table-column :label="$t('inReceiveStockin.packingMethod')" align="left" prop="extraField.packingMethod"/><!--包装方式-->
-      <el-table-column :label="$t('inReceiveStockin.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> <!--净重-->
+<!--      <el-table-column :label="$t('inReceiveStockin.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> &lt;!&ndash;净重&ndash;&gt;-->
       <el-table-column :label="$t('inReceiveStockin.quantity')" align="right" prop="quantity"/><!--计划数量-->
       <el-table-column :label="$t('inStockin.scanNum')" align="right" prop="scanNum"/><!--扫码数量-->
       <el-table-column :label="$t('inStockin.assignNum')" align="right" prop="assignNum"/><!--实际数量-->