Merge remote-tracking branch 'origin/master'

itdmWeb/src/mixins/JeecgListMixin.js

@@ -180,10 +180,11 @@ export const JeecgListMixin = {
           ids += this.selectedRowKeys[a] + ",";
         }
         var that = this;
-        this.$confirm({
-          title: "确认删除",
-          content: "是否删除选中数据?",
-          onOk: function () {
+        this.$confirm('是否删除选中数据?', '确认删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
             that.loading = true;
             deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
               if (res.success) {
@@ -199,7 +200,7 @@ export const JeecgListMixin = {
               that.loading = false;
             });
           }
-        });
+        );
       }
     },
     handleDelete: function (id) {

itdmWeb/src/views/system/DepartList2.vue

@@ -212,10 +212,11 @@
             ids += this.selectedRowKeys[a] + ",";
           }
           var that = this;
-          this.$confirm({
-            title: "确认删除",
-            content: "是否删除选中数据?",
-            onOk: function () {
+          this.$confirm('是否删除选中数据?', '确认删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
               deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
                 if (res.success) {
                   that.$message.success(res.message);
@@ -226,7 +227,7 @@
                 }
               });
             }
-          });
+          );
         }
       },
       handleEdit: function (record) {

itdmWeb/src/views/system/RoleUserList.vue

@@ -451,10 +451,11 @@
           }
           var that = this
           console.log(this.currentDeptId)
-          this.$confirm({
-            title: '确认取消关联',
-            content: '是否删除选中数据?',
-            onOk: function() {
+          this.$confirm('是否删除选中数据?', '确认删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
               deleteAction(that.url.deleteBatch2, { roleId: that.currentRoleId, userIds: ids }).then((res) => {
                 if (res.success) {
                   that.$message.success(res.message)
@@ -465,7 +466,7 @@
                 }
               })
             }
-          })
+          )
         }
       },
       selectOK(data) {