页面更新

ruoyi-ui/src/components/MutipleSelectPop/index.vue

@@ -109,6 +109,11 @@
   </div>
 </template>
 <script>
+  import {
+     addGenmutipor,
+     addGenmutiporuder,
+     addGenmutiportree
+    } from "@/api/activiti/definition";
 export default {
   name: "Mutiple",
   props: {
@@ -196,7 +201,7 @@ export default {
       columns: [],
       treeNewData: [],
       showTree: this.open,
-      component: [
+      componentt: [
         {
           tab: "筛选结果",
           columns: [
@@ -234,14 +239,14 @@ export default {
       // let data = Object.assign(this.component, this.componentData);
       // return data;
       if (this.isMutiple) {
-        this.component[0].columns.unshift({
-          type: "selection",
-          align: "center",
-          fixed: "left",
-          width: 30
-        });
+        // this.componentt[0].columns.unshift({
+        //   type: "selection",
+        //   align: "center",
+        //   fixed: "left",
+        //   width: 30
+        // });
       }
-      return this.component;
+      return this.componentt;
     },
     resultMessage() {
       // let data = Object.assign(this.resultRightData, this.resultData);
@@ -253,7 +258,7 @@ export default {
       handler(newValue, oldValue) {
         if (newValue) {
           //执行请求
-          this.component[0].pageNum = 1
+          this.componentt[0].pageNum = 1
           this.getTreeData();
           if (this.resultData.list) {
             this.resultRightData = this.deepCopy(this.resultData);
@@ -313,8 +318,7 @@ export default {
           //当item的TYPE为供应商时
           //  当item的TYPE为组织时
           if (val[0].TYPE === "CP_C_HRORG_ID") {
-            this.$network
-              .post("/p/c/identity/org/treequery", { CP_C_ORGUP_ID: valID })
+            addGenmutipor({ CP_C_ORGUP_ID: valID })
               .then(res => {
                 if (res.data.resultCode === 0) {
                   let HRORG = "in ("; //储存键名为CP_C_HRORG_ID对象的ID
@@ -370,7 +374,7 @@ export default {
     },
     pageChange(index) {
       this.$emit("on-change-page", index, this);
-      this.component[0].pageNum = index;
+      this.componentt[0].pageNum = index;
       let param = Object.assign(this.obj, { page: index, pageSize: 10 });
       if (this.table.search !== "") {
         param.ENAME = this.table.search;
@@ -379,7 +383,7 @@ export default {
     },
     pageChangeSize(index) {
       this.$emit("on-change-pageSize", index, this);
-      this.component[0].pageSize = index;
+      this.componentt[0].pageSize = index;
       let param = Object.assign(this.obj, { page: 1, pageSize: index });
       if (this.table.search !== "") {
         param.ENAME = this.table.search;
@@ -436,7 +440,7 @@ export default {
     },
     Onselect(selection, row) {
       if (this.isMutiple) {
-        this.component[0].list.map(item => {
+        this.componentt[0].list.map(item => {
           if (row.ID === item.ID) {
             item._checked = true;
           }
@@ -448,7 +452,7 @@ export default {
       this.$emit("on-select", selection, row);
     },
     onSelectCancel(selection, row) {
-      this.component[0].list.map(item => {
+      this.componentt[0].list.map(item => {
         if (row.ID === item.ID) {
           item._checked = false;
         }
@@ -459,14 +463,14 @@ export default {
     },
     onSelectAll(selection) {
       this.selectRow = [];
-      this.component[0].list.map(item => {
+      this.componentt[0].list.map(item => {
         item._checked = true;
       });
       this.selectRow = selection;
       this.$emit("on-select-all", selection);
     },
     onSelectAllCancel(selection) {
-      this.component[0].list.map(item => {
+      this.componentt[0].list.map(item => {
         item._checked = false;
       });
       this.selectRow = [];
@@ -593,10 +597,10 @@ export default {
         }
       }
       //刷新表格数据
-      this.component[0].list.map(item => {
+      this.componentt[0].list.map(item => {
         item._checked = false;
       });
-      this.component[0].list = this.component[0].list.concat([]);
+      this.componentt[0].list = this.componentt[0].list.concat([]);
       if (this.selectRow.length > 0) {
         //选中状态的清除
         this.selectRow = [];
@@ -655,16 +659,16 @@ export default {
       this.$emit("on-deleBtn", this);
       this.resultRightData.total = 0;
       this.resultRightData.list = [];
-      this.component[0].list.map(item => {
+      this.componentt[0].list.map(item => {
         item._checked = false;
       });
-      this.component[0].list = this.component[0].list.concat([]);
+      this.componentt[0].list = this.componentt[0].list.concat([]);
       this.$emit("getResult", this.resultRightData);
     },
     //查找用户信息
     findUser(param) {
       this.tableLoading = true;
-      this.$network.post("/p/c/identity/user/list", param).then(res => {
+      addGenmutiporuder( param).then(res => {
         this.tableLoading = false;
         let data = res.data;
         if (data.code === 0) {
@@ -679,9 +683,9 @@ export default {
     },
     //表格体数据转化
     transferTbody(data) {
-      this.component[0].total = data.totalRowCount;
-      this.component[0].pageOptions = data.selectrange;
-      this.component[0].list = [];
+      this.componentt[0].total = data.totalRowCount;
+      this.componentt[0].pageOptions = data.selectrange;
+      this.componentt[0].list = [];
       data.row.map(item => {
         let tem = {};
         let temval = {};
@@ -689,13 +693,13 @@ export default {
           tem[inner] = item[inner].val;
         });
         temval = Object.assign({}, tem);
-        this.component[0].list.push(tem);
+        this.componentt[0].list.push(tem);
       });
     },
     //获取树数据
      getTreeData() {
       this.tree_loading = true;
-      this.$network.post("/p/c/identity/org/treeload", {}).then(res => {
+      addGenmutiportree().then(res => {
         this.tree_loading = false;
         if (res.data.resultCode === 0) {
           this.treeNewData = [];
@@ -839,7 +843,7 @@ export default {
     //       this.table.search = "";
     //     }
     // }
-    
+
   },
   destroyed() {
     if (this.selectRow.length > 0) {
@@ -1024,4 +1028,3 @@ export default {
   }
 }
 </style>
-

ruoyi-ui/src/components/todoProcess/index.vue

@@ -59,7 +59,7 @@
 import FormItemComponent from "../FormItemComponent";
 import ItemComponent from "../ItemComponent";
 import StandardTable from "../StandardTable";
-import mutipleSelectPop from "../mutipleSelectPop/index.vue";
+import mutipleSelectPop from "../MutipleSelectPop";
 import FlowChartShow from "../FlowChartShow";
 import {
     addGendefini,
@@ -75,7 +75,7 @@ export default {
     StandardTable,
     mutipleSelectPop,
     FlowChartShow,
-    
+
   },
   props: {
     tabalive: { type: String, default: "" }

ruoyi-ui/src/main.js

@@ -5,7 +5,6 @@ import Cookies from 'js-cookie'
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 import 'burgeon-ui/dist/styles/burgeon-ui.css';
-import BurgeonUi from 'burgeon-ui';
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
@@ -64,7 +63,6 @@ Vue.component('DynamicForms', DynamicForms)
 Vue.component('MemoranDum', MemoranDum)
 
 Vue.use(permission)
-Vue.use(BurgeonUi);
 
 /**
  * If you don't want to use mock-server

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

@@ -9,16 +9,17 @@
     </div>
     <!-- 内容 -->
     <div class="table_nav headertable_nav">
-      <el-collapse v-model="activeNames" @change="handleChange">
+      <el-collapse v-model="activeNames" @change="handleChange">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" :rules="queryData.rules" label-width="120px">
         <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" >
-          <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
+          
             <el-row :gutter="0">
               <el-col :span="24"  :key="index">
                   <dynamic-forms :ref="items.columnName" :config="queryParams" @inputs = "changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren" :key='indexs' />
               </el-col>
             </el-row>
-          </el-form>
-        </el-collapse-item>
+        </el-collapse-item>
+        </el-form>
       </el-collapse>
     </div>
   </div>
@@ -163,7 +164,6 @@
             this.formeanti.commitData = []
             this.formy.status = 1
             this.formeanti.commitData.push(this.formy)
-            console.log(this.formeanti)
            this.antiSubmission()
          }else if(index == '反提交'){
            //反提交  保存
@@ -231,7 +231,7 @@
               }else{
                 route = '新增'
               }
-             
+
             }else if(route == 'M'){
               route = '保存'
               if(this.formy.id != -1){
@@ -295,18 +295,16 @@
       },
       /** 新增 修改提交按钮 */
       submitForm: function() {
-              addbjectSave(this.forme).then(response => {
-                this.msgSuccess("保存成功");
-                this.open = false;
-                console.log(this.xidugje)
-                // if(this.xidugje =="新增"){
-                //    this.$router.go(-2)
-                // }else{
-                  this.$router.replace('surface')
-                // }
-
-                // this.getList();
-              });
+        this.$refs["queryForm"].validate(valid => {
+          if (valid) {
+            addbjectSave(this.forme).then(response => {
+              this.msgSuccess("保存成功");
+              this.open = false;
+              console.log(this.xidugje)
+              this.$router.replace('surface')
+            });
+          }
+        });
       },
       // 提交反提交
       antiSubmission(){