货位管理

ruoyi-ui/src/views/check/difference/index.vue

@@ -261,7 +261,7 @@ export default {
     /** 查询盘点差异列表 */
     getList() {
       this.loading = true
-      if (this.queryParams.status === '1') {
+      if (this.queryParams.status === '1' || this.queryParams.status === '2') {
         // 已审核，查询历史表
         listDifferenceRecordFinish(this.queryParams).then(response => {
           this.differenceList = response.rows

ruoyi-ui/src/views/system/dict/data.vue

@@ -222,7 +222,6 @@
 <script>
 import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data"
 import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type"
-import i18n from "@/lang";
 
 export default {
   name: "Data",
@@ -335,10 +334,6 @@ export default {
     getList() {
       this.loading = true
       listData(this.queryParams).then(response => {
-        response.rows = response.rows.map(item => ({
-          ...item,
-          dictLabel: i18n.t(item.dictLabel) || item.dictLabel
-        }))
         this.dataList = response.rows
         this.total = response.total
         this.loading = false

ruoyi-ui/src/views/system/role/index.vue

@@ -266,7 +266,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('systemManagement_RoleManagement.warehouseDataScope')">
-          <el-select v-model="form.warehouseDataScope" @change="dataScopeSelectChange" multiple collapse-tags :placeholder="$t('systemManagement_RoleManagement.selectWarehouse')">
+          <el-select v-model="form.warehouseDataScope" @change="dataScopeSelectChange" multiple collapse-tags :placeholder="$t('systemManagement_RoleManagement.placeholderWarehouse')">
             <el-option
               v-for="item in warehouseOptions"
               :key="item.warehouseId"