补充提交

ruoyi-ui/src/views/dragform/index.vue

@@ -165,7 +165,7 @@
         prop="fId"
         show-overflow-tooltip
       />
-      <el-table-column
+      <!-- <el-table-column
         label="表单名称
 "
         align="center"
@@ -178,7 +178,7 @@
         align="center"
         prop="dfNickname"
         show-overflow-tooltip
-      />
+      /> -->
       <el-table-column
         label="表单vue模版"
         align="center"

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

@@ -35,13 +35,11 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-        >搜索
-        </el-button
-        >
+          >搜索
+        </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置
-        </el-button
-        >
+          >重置
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -54,9 +52,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:dept:add']"
-        >新增
-        </el-button
-        >
+          >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -65,9 +62,8 @@
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
-        >展开/折叠
-        </el-button
-        >
+          >展开/折叠
+        </el-button>
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -122,46 +118,36 @@
               处理<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item
-              >
+              <el-dropdown-item>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:dept:edit']"
-                >修改
-                </el-button
-                >
-              </el-dropdown-item
-              >
-              <el-dropdown-item
-              >
+                  >修改
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-plus"
                   @click="handleAdd(scope.row)"
                   v-hasPermi="['system:dept:add']"
-                >新增
-                </el-button
-                >
-              </el-dropdown-item
-              >
-              <el-dropdown-item
-              >
+                  >新增
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
                 <el-button
-                  v-if="scope.row.parentId != 0"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['system:dept:remove']"
-                >删除
-                </el-button
-                >
-              </el-dropdown-item
-              >
+                  >删除
+                </el-button>
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
 
@@ -209,7 +195,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称"/>
+              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -259,9 +245,8 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{ dict.label }}
-                </el-radio
-                >
+                  >{{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -290,7 +275,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Dept",
   dicts: ["sys_normal_disable"],
-  components: {Treeselect},
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -322,10 +307,10 @@ export default {
         //   { required: true, message: "上级部门不能为空", trigger: "blur" },
         // ],
         deptName: [
-          {required: true, message: "部门名称不能为空", trigger: "blur"},
+          { required: true, message: "部门名称不能为空", trigger: "blur" },
         ],
         orderNum: [
-          {required: true, message: "显示排序不能为空", trigger: "blur"},
+          { required: true, message: "显示排序不能为空", trigger: "blur" },
         ],
         email: [
           {
@@ -440,7 +425,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.deptId != undefined) {
-            this.form['tenantId'] = this.$store.state.user.tenant.tenantId
+            this.form["tenantId"] = this.$store.state.user.tenant.tenantId;
             updateDept(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -450,7 +435,7 @@ export default {
             if (typeof this.form.parentId == "undefined") {
               this.form.parentId = 0;
             }
-            this.form['tenantId'] = this.$store.state.user.tenant.tenantId
+            this.form["tenantId"] = this.$store.state.user.tenant.tenantId;
             addDept(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -462,6 +447,10 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      if (row.children?.length) {
+        this.$message.error("当前部门存在子部门,不可删除!请先删除子部门");
+        return;
+      }
       this.$modal
         .confirm('是否确认删除名称为"' + row.deptName + '"的数据项？')
         .then(function () {
@@ -471,8 +460,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
   },
 };

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -20,6 +20,7 @@
           '&sqlKey=' +
           sqlkey
         "
+        v-loading="upload.isUploading"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"