Merge remote-tracking branch 'origin/dev' into dev

src/views/factoryModel/factoryManagement/index.vue

@@ -44,7 +44,7 @@
           </el-link>
           <el-popconfirm
             class="ele-action"
-            title="确定要删除此角色吗？"
+            title="确定要删除此工厂吗？"
             @confirm="remove(row)"
             v-if="$hasPermission('main:factoryarea:delete')"
 

src/views/system/dictionary/index.vue

@@ -9,7 +9,6 @@
           icon="el-icon-plus"
           class="ele-btn-icon"
           v-if="$hasPermission('main:dictionary:save')"
-
           @click="openEdit()"
         >
           添加
@@ -32,7 +31,6 @@
           :disabled="!current"
           @click="remove"
           v-if="$hasPermission('main:dictionary:delete')"
-
         >
           删除
         </el-button>
@@ -49,12 +47,13 @@
           :datasource="datasource"
           height="calc(100vh - 350px)"
           :need-page="false"
-          :toolkit="[]"
           :current.sync="current"
           highlight-current-row
           class="dict-table"
           tool-class="ele-toolbar-actions"
           @done="done"
+          @columns-change="handleColumnChange"
+          :cache-key="cacheKeyUrl"
         >
           <!-- 表头工具栏 -->
           <template v-slot:toolbar> </template>
@@ -76,12 +75,16 @@
   import DictEdit from './components/dict-edit.vue';
   import DictDataSearch from './components/dict-data-search.vue';
   import { listDictionaries, removeDictionary } from '@/api/system/dictionary';
+  import tabMixins from '@/mixins/tableColumnsMixin';
 
   export default {
     name: 'SystemDictionary',
     components: { DictData, DictEdit, DictDataSearch },
+    mixins: [tabMixins],
+
     data() {
       return {
+        cacheKeyUrl: 'main-ad4181af-syste-dictionary',
         // 表格列配置
         columns: [
           {

src/views/versionManage/index.vue

@@ -78,7 +78,7 @@
           <el-popconfirm
             v-if="row.status!=1&&$hasPermission('main:version:delete')"
             class="ele-action"
-            title="确定要删除当前资质吗？"
+            title="确定要删除当前版本规则吗？"
             @confirm="remove(row)"
           >
             <template v-slot:reference>

src/views/workforceManagement/schedule/index.vue

@@ -225,7 +225,7 @@
         };
         teamqueueUpdate(param)
           .then((msg) => {
-            this.$message.success(message);
+            this.$message.success(msg);
             this.done();
           })
           .catch((e) => {