Home Explore Help
Register Sign In
zkqy-sass-platform
/
mec-cloud_-intelligent-manufacturing_crm
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

表单修改

小宝贝 2 years ago
parent
b5c320a80d
commit
2c52836875
6 changed files with 144 additions and 22 deletions
Unified View Show Diff Stats
  1. 1 1
      ruoyi-ui/src/layout/index.vue
  2. 21 1
      ruoyi-ui/src/router/index.js
  3. 7 11
      ruoyi-ui/src/views/dragform/index.vue
  4. 1 1
      ruoyi-ui/src/views/system/data/index.vue
  5. 113 7
      ruoyi-ui/src/views/system/fromModel/index.vue
  6. 1 1
      ruoyi-ui/src/views/system/processModeling/flow-x6/index.vue

+ 1 - 1
ruoyi-ui/src/layout/index.vue
View File 

@@ -176,7 +176,7 @@ export default {
 
 }
 
 }
 
 
 
 .jianbiase {
 
 .jianbiase {
 
-  width: 100px;
 
+  width: 120px;
 
   height: 37px;
 
   height: 37px;
 
   /* height: 25px; */
 
   /* height: 25px; */
 
   background: linear-gradient(128.13deg, rgba(82, 79, 255, 1) 0%, rgba(255, 74, 74, 1) 100%);
 
   background: linear-gradient(128.13deg, rgba(82, 79, 255, 1) 0%, rgba(255, 74, 74, 1) 100%);

+ 21 - 1
ruoyi-ui/src/router/index.js
View File 

@@ -134,7 +134,27 @@ export const dynamicRoutes = [
 
       }
 
       }
 
     ]
 
     ]
 
   },
 
   },
 
-  
+  {
 
+    path: '/system/fromModel/index',
 
+    component: Layout,
 
+    hidden: true,
 
+    permissions: ['system:fromModel:edit'],
 
+    children: [
 
+      {
 
+        path: 'fromModel/:index',
 
+        component: () => import('@/views/system/fromModel/index'),
 
+        name: 'fromModel',
 
+        meta: { title: '表单建模', activeMenu: '/system/fromModel/index' }
 
+      },
 
+      // {
 
+      //   path: 'fromModel/:index',
 
+      //   component: () => import('@/views/system/fromModel/formBuild'),
 
+      //   name: 'fromModel',
 
+      //   meta: { title: '表单建模', activeMenu: '/system/fromModel/formBuild' }
 
+      // }
 
+    ]
 
+    
+  },
 
   {
 
   {
 
     path: '/system/role-auth',
 
     path: '/system/role-auth',
 
     component: Layout,
 
     component: Layout,

+ 7 - 11
ruoyi-ui/src/views/dragform/index.vue
View File 

@@ -233,9 +233,10 @@
 
 
 
 <script>
 
 <script>
 
 import {listForm, getForm, delForm, addForm, updateForm} from "@/api/dragform/form";
 
 import {listForm, getForm, delForm, addForm, updateForm} from "@/api/dragform/form";
 
-
 
+// import fromModel from '../system/fromModel/index.vue'
 
 export default {
 
 export default {
 
   name: "Form",
 
   name: "Form",
 
+  
   data() {
 
   data() {
 
     return {
 
     return {
 
       // 遮罩层
 
       // 遮罩层
 
@@ -339,24 +340,19 @@ export default {
 
     },
 
     },
 
     /** 新增按钮操作 */
 
     /** 新增按钮操作 */
 
     handleAdd() {
 
     handleAdd() {
 
-      this.reset();
 
-      this.open = true;
 
-      this.title = "添加动态单";
 
+      this.$router.push("system/fromModel/index");
 
     },
 
     },
 
     /** 修改按钮操作 */
 
     /** 修改按钮操作 */
 
     handleUpdate(row) {
 
     handleUpdate(row) {
 
-      this.reset();
 
-      const fId = row.fId || this.ids
 
-      getForm(fId).then(response => {
 
-        this.form = response.data;
 
-        this.open = true;
 
-        this.title = "修改动态单";
 
-      });
 
+      const fId = row.fId || this.ids;
 
+      this.$router.push({name:"fromModel",params:{id:fId}});
 
     },
 
     },
 
     /** 提交按钮 */
 
     /** 提交按钮 */
 
     submitForm() {
 
     submitForm() {
 
       this.$refs["form"].validate(valid => {
 
       this.$refs["form"].validate(valid => {
 
         if (valid) {
 
         if (valid) {
 
+
 
+          console.log(this.form)
 
           if (this.form.fId != null) {
 
           if (this.form.fId != null) {
 
             updateForm(this.form).then(response => {
 
             updateForm(this.form).then(response => {
 
               this.$modal.msgSuccess("修改成功");
 
               this.$modal.msgSuccess("修改成功");

+ 1 - 1
ruoyi-ui/src/views/system/data/index.vue
View File 

@@ -181,7 +181,7 @@ export default {
 
           // 这个是提交后端，新增接口，数据直接填写就可以了。
 
           // 这个是提交后端，新增接口，数据直接填写就可以了。
 
           addSave(this.formLabelAlign).then((res) => {
 
           addSave(this.formLabelAlign).then((res) => {
 
             console.log(res);
 
             console.log(res);
 
-            // 新增成功后，操作的东西，写这里
 
+            // 新增成功后，操作的东西
 
           });
 
           });
 
         } else {
 
         } else {
 
           console.log("error submit!!");
 
           console.log("error submit!!");

+ 113 - 7
ruoyi-ui/src/views/system/fromModel/index.vue
View File 

@@ -3,21 +3,127 @@
 
       <k-form-design 
       <k-form-design 
       :showHead="false"
 
       :showHead="false"
 
       @save="handleSave"
 
       @save="handleSave"
 
-      @handleSave="asd"
 
+      @exportCode="handCode"
 
+      ref="kfd"
 
       />
 
       />
 
     </div>
 
     </div>
 
   </template>
 
   </template>
 
 <script>
 
 <script>
 
+// 生成HTML的
 
+let codeHtmlFront = `<!DOCTYPE html>
 
+<html>
 
+
 
+<head>
 
+  <title>表单设计</title>
 
+  <meta charset="UTF-8">
 
+  <link rel="stylesheet" href="http://unpkg.com/k-form-design/lib/k-form-design.css">
 
+</head>
 
+
 
+<body>
 
+  <div class="app">
 
+    <k-form-build ref="KFB" @submit="handleSubmit" :value="jsonData"></k-form-build>
 
+    <button @click="getData">提交</button>
 
+  </div>
 
+  <script src="http://cdn.kcz66.com/vue.min.js"><\/script>
 
+  <script src="http://unpkg.com/k-form-design/lib/k-form-design.umd.min.js"><\/script>
 
+  <script>
 
+    let jsonData = `;
 
+    
+    let codeHtmlLast = `
 
+    let vm = new Vue({
 
+      el: '.app',
 
+      data: {
 
+        jsonData
 
+      },
 
+      methods: {
 
+        handleSubmit(p) {
 
+          // 通过表单提交按钮触发，获取promise对象
 
+          p().then(res => {
 
+            // 获取数据成功
 
+            alert(JSON.stringify(res))
 
+          })
 
+            .catch(err => {
 
+              console.log(err, '校验失败')
 
+            })
 
+        },
 
+        getData() {
 
+          // 通过函数获取数据
 
+          this.$refs.KFB.getData().then(res => {
 
+            // 获取数据成功
 
+            alert(JSON.stringify(res))
 
+          })
 
+            .catch(err => {
 
+              console.log(err, '校验失败')
 
+            })
 
+        }
 
+      }
 
+    })
 
+  <\/script>
 
+</body>
 
+
 
+</html>`
 
+import { addForm ,getForm,updateForm} from "@/api/dragform/form";
 
 export default {
 
 export default {
 
+  name:'fromModel',
 
+  data() {
 
+    return {
 
+      fid: null,
 
+    };
 
+  },
 
   methods: {
 
   methods: {
 
     handleSave(values) {
 
     handleSave(values) {
 
-      alert("111");
 
-      console.log(values);
 
+      // console.log(values);
 
+      var jsonData = JSON.parse(values);
 
+      //
 
+      var editorHtmlJson =
 
+          codeHtmlFront + JSON.stringify(jsonData) + codeHtmlLast;
 
+      console.log(this.fid)
 
+      if(!this.fid){
 
+        addForm({
 
+          dfName:'1',
 
+          dfNickname:'1',
 
+          dfVueTemplate:values,
 
+          dfHtmlTemplate:editorHtmlJson.toString(),
 
+          dfFormSql:'',
 
+          dfNodeId:'',
 
+          dfDatabase:'',
 
+          dfTableName:'',
 
+        }).then((res)=>{
 
+          console.log(res);
 
+        })
 
+      }else{
 
+        updateForm({
 
+          dfName:'1',
 
+          dfNickname:'1',
 
+          dfVueTemplate:values,
 
+          dfHtmlTemplate:editorHtmlJson.toString(),
 
+          dfFormSql:'',
 
+          dfNodeId:'',
 
+          dfDatabase:'',
 
+          dfTableName:'',
 
+          fId:this.fid
 
+        }).then((res)=>{
 
+          console.log(res)
 
+          this.$message(res.msg)
 
+        })
 
+      }
 
+      
+    
     },
 
     },
 
-    asd(row){
 
-      console.log(row)
 
-    }
 
-  }
 
+
 
+  },
 
+  mounted() {
 
+    const fid = this.$route.params.id;
 
+
 
+    if(!fid)return;
 
+    this.fid = fid;
 
+    
+    getForm(fid).then(response => {
 
+      console.log(response)
 
+      const jsonData = JSON.parse(response.data.dfVueTemplate)
 
+      this.$refs.kfd.handleSetData(jsonData)
 
+    });
 
+  },
 
 };
 
 };
 
 </script>
 
 </script>

+ 1 - 1
ruoyi-ui/src/views/system/processModeling/flow-x6/index.vue
View File 

@@ -91,7 +91,7 @@ export default {
 
 }
 
 }
 
 
 
 </script>
 
 </script>
 
-<style lang="scss" >
 
+<style lang="scss">
 
 .x6-widget-snapline-vertical {
 
 .x6-widget-snapline-vertical {
 
   border-right-color: #ff4e50 !important;
 
   border-right-color: #ff4e50 !important;
 
 }
 
 }