小宝贝 2 лет назад
Родитель
Сommit
eb13ea9cd1
2 измененных файлов с 91 добавлено и 34 удалено
  1. 90 34
      ruoyi-ui/src/views/dragform/index.vue
  2. 1 0
      ruoyi-ui/src/views/system/fromModel/index.vue

+ 90 - 34
ruoyi-ui/src/views/dragform/index.vue

@@ -1,7 +1,5 @@
 <template>
-  <div
-    class="app-container"
-  >
+  <div class="app-container">
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -110,7 +108,7 @@
         >
       </el-form-item>
     </el-form>
-<!-- v-hasPermi="['dragform:form:add']" 
+    <!-- v-hasPermi="['dragform:form:add']" 
 v-hasPermi="['dragform:form:edit']"
 v-hasPermi="['dragform:form:remove']"
 v-hasPermi="['dragform:form:export']"
@@ -123,7 +121,6 @@ v-hasPermi="['dragform:form:export']"
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          
           >新增
         </el-button>
       </el-col>
@@ -135,7 +132,6 @@ v-hasPermi="['dragform:form:export']"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          
           >修改
         </el-button>
       </el-col>
@@ -147,7 +143,6 @@ v-hasPermi="['dragform:form:export']"
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          
           >删除
         </el-button>
       </el-col>
@@ -158,7 +153,6 @@ v-hasPermi="['dragform:form:export']"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          
           >导出
         </el-button>
       </el-col>
@@ -168,14 +162,24 @@ v-hasPermi="['dragform:form:export']"
       ></right-toolbar>
     </el-row>
 
-    <el-table 
+    <el-table
       tooltip-effect="dark"
       v-loading="loading"
       :data="formList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" show-overflow-tooltip/>
-      <el-table-column label="表单主键" align="center" prop="fId" show-overflow-tooltip/>
+      <el-table-column
+        type="selection"
+        width="55"
+        align="center"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="表单主键"
+        align="center"
+        prop="fId"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="表单名称
 "
@@ -202,8 +206,18 @@ v-hasPermi="['dragform:form:export']"
         prop="dfHtmlTemplate"
         show-overflow-tooltip
       />
-      <el-table-column label="表单sql" align="center" prop="dfFormSql" show-overflow-tooltip/>
-      <el-table-column label="节点ID" align="center" prop="dfNodeId" show-overflow-tooltip/>
+      <el-table-column
+        label="表单sql"
+        align="center"
+        prop="dfFormSql"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="节点ID"
+        align="center"
+        prop="dfNodeId"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="数据源名称
 "
@@ -211,11 +225,36 @@ v-hasPermi="['dragform:form:export']"
         prop="dfDatabase"
         show-overflow-tooltip
       />
-      <el-table-column label="绑定表名称" align="center" prop="dfTableName" show-overflow-tooltip/>
-      <el-table-column label="表单描述" align="center" prop="dfNotes" show-overflow-tooltip/>
-      <el-table-column label="备用列" align="center" prop="spare" show-overflow-tooltip/>
-      <el-table-column label="备用列" align="center" prop="spare1" show-overflow-tooltip/>
-      <el-table-column label="文件路径" align="center" prop="dfFliePath" show-overflow-tooltip/>
+      <el-table-column
+        label="绑定表名称"
+        align="center"
+        prop="dfTableName"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="表单描述"
+        align="center"
+        prop="dfNotes"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="备用列"
+        align="center"
+        prop="spare"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="备用列"
+        align="center"
+        prop="spare1"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="文件路径"
+        align="center"
+        prop="dfFliePath"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -223,26 +262,50 @@ v-hasPermi="['dragform:form:export']"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <el-button
+          <el-dropdown>
+            <el-button type="warning" plain size="small">
+              处理<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item
+                ><el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  >修改
+                </el-button></el-dropdown-item
+              >
+              <el-dropdown-item>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  >删除
+                </el-button>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            
             >修改
-          </el-button>
+          </el-button> -->
           <!--  v-hasPermi="['dragform:form:edit']"
             
 
           -->
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            
             >删除
-          </el-button>
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -313,12 +376,7 @@ v-hasPermi="['dragform:form:export']"
 </template>
 
 <script>
-import {
-  delForm,
-  addForm,
-  updateForm,
-  listForm
-} from "@/api/dragform/form";
+import { delForm, addForm, updateForm, listForm } from "@/api/dragform/form";
 // import fromModel from '../system/fromModel/index.vue'
 export default {
   name: "Form",
@@ -426,13 +484,13 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      sessionStorage.removeItem('fid')
+      sessionStorage.removeItem("fid");
       this.$router.push("system/fromModel/index");
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       const fId = row.fId || this.ids;
-      sessionStorage.setItem('fid',fId);
+      sessionStorage.setItem("fid", fId);
       this.$router.replace("system/fromModel/index");
     },
     /** 提交按钮 */
@@ -483,5 +541,3 @@ export default {
   },
 };
 </script>
-
-

+ 1 - 0
ruoyi-ui/src/views/system/fromModel/index.vue

@@ -87,6 +87,7 @@ export default {
           dfHtmlTemplate:editorHtmlJson.toString(),
         }).then((res)=>{
           console.log(res);
+          this.$message(res.msg)
         })
       }else{
         updateForm({