yrik 4 năm trước cách đây
mục cha
commit
f22313cffd

+ 311 - 0
ruoyi-ui/src/api/activiti/definition.js

@@ -0,0 +1,311 @@
+import request from '@/utils/request'
+
+// 新增关联表
+export function addGendefini(data) {
+  return request({
+    url: '/p/cs/task/relation/list',
+    method: 'post',
+    data
+  })
+}
+// 刪除
+export function addGendefinideal(data) {
+  return request({
+    url: '/p/cs/task/batch/deal',
+    method: 'post',
+    data
+  })
+}
+// 查詢
+export function addGendefiniqur(data) {
+  return request({
+    url: '/p/cs/task/backlog/list',
+    method: 'post',
+    data
+  })
+}
+
+// mesetet
+export function addGenmutipor(data) {
+  return request({
+    url: '/p/c/identity/org/treequery',
+    method: 'post',
+    data
+  })
+}
+//查找用户信息
+export function addGenmutiporuder(data) {
+  return request({
+    url: '/p/c/identity/user/list',
+    method: 'post',
+    data
+  })
+}
+//获取树数据
+export function addGenmutiportree(data) {
+  return request({
+    url: '/p/c/identity/org/treeload',
+    method: 'post',
+    data
+  })
+}
+
+
+// 获取流程图信息  flowshow
+export function addGenflowshow(data) {
+  return request({
+    url: '/p/c/task/backlog/detail',
+    method: 'post',
+    data
+  })
+}
+
+//业务关系下拉数据   historicap
+export function addGenhistoricap(data) {
+  return request({
+    url: '/p/cs/task/relation/list',
+    method: 'post',
+    data
+  })
+}
+// history 查询列表
+export function addGenhistorihistory(data) {
+  return request({
+    url: '/p/cs/task/history/list',
+    method: 'post',
+    data
+  })
+}
+//提交
+export function addGenhistorilisr(data) {
+  return request({
+    url: "/p/cs/process/manualsubmit",
+    method: 'post',
+    data
+  })
+}
+
+// 修改关联表
+export function setGenTable(data) {
+  return request({
+    url: '/boman-gen/genTableRelation',
+    method: 'put',
+    data
+  })
+}
+// 删除关联表
+export function delGenTable(tableId) {
+  return request({
+    url: '/boman-gen/genTableRelation/' + tableId,
+    method: 'delete',
+  })
+}
+// 查看关联表
+export function qurGenTable(tableId) {
+  return request({
+    url: '/boman-gen/genTableRelation/' + tableId,
+    method: 'get',
+  })
+}
+
+// 关联表列表
+export function tabList(query) {
+  return request({
+    url: '/boman-gen/genTableRelation/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询生成表数据
+export function listTable(query) {
+  return request({
+    url: '/code/gen/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询db数据库列表
+export function listDbTable(query) {
+  return request({
+    url: '/code/gen/db/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增
+export function addMenu(data) {
+  return request({
+    url: '/boman-gen/gen/addTable',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询表详细信息
+export function getGenTable(tableId) {
+  return request({
+    url: '/code/gen/' + tableId,
+    method: 'get'
+  })
+}
+
+// 查询表详细信息
+export function listAllColumnsByTableId(data) {
+  return request({
+    url: '/boman-web-core/p/cs/table/listAllColumnsByTableId',
+    method: 'post',
+    data
+  })
+}
+// 查询表HR详细信息
+export function genTableColumnList(query) {
+  return request({
+    url: '/boman-gen/genTableColumn/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改代码生成信息
+export function updateGenTable(data) {
+  return request({
+    url: '/code/gen',
+    method: 'put',
+    data: data
+  })
+}
+
+// 导入表
+export function importTable(data) {
+  return request({
+    url: '/code/gen/importTable',
+    method: 'post',
+    params: data
+  })
+}
+
+// 预览生成代码
+export function previewTable(tableId) {
+  return request({
+    url: '/code/gen/preview/' + tableId,
+    method: 'get'
+  })
+}
+
+// 删除表数据
+export function delTable(tableId) {
+  return request({
+    url: '/code/gen/' + tableId,
+    method: 'delete'
+  })
+}
+// 删除
+export function delPost(id) {
+  return request({
+    url: '/genTableColumn/columnIds/' + id,
+    method: 'delete'
+  })
+}
+
+// 生成代码(自定义路径)
+export function genCode(tableName) {
+  return request({
+    url: '/code/gen/genCode/' + tableName,
+    method: 'get'
+  })
+}
+
+// 同步数据库
+export function synchDb(tableName) {
+  return request({
+    url: '/code/gen/synchDb/' + tableName,
+    method: 'get'
+  })
+}
+
+// 查询数据库sql
+export function tableSql(id) {
+  return request({
+    url: '/boman-gen/tableSql/'+id,
+    method: 'get',
+  })
+}
+// 执行创建语句
+export function zxImplement(data) {
+  return request({
+    url: '/boman-gen/tableSql/implement',
+    method: 'post',
+    data
+  })
+}
+// 刷新创建语句
+export function getReload(data) {
+  return request({
+    url: '/boman-gen/tableSql/reload',
+    method: 'POST',
+    data
+  })
+}
+// 新增字段信息
+export function addGenTableColumn(data) {
+  return request({
+    url: '/boman-gen/genTableColumn',
+    method: 'POST',
+    data
+  })
+}
+// 删除字段信息
+export function delGenTableColumn(id) {
+  return request({
+    url: '/boman-gen/genTableColumn/' + id,
+    method: 'delete',
+  })
+}
+// 修改字段信息
+export function setGenTableColumn(data) {
+  return request({
+    url: '/boman-gen/genTableColumn',
+    method: 'put',
+    data
+  })
+}
+// 获取字段信息
+export function getGenTableColumn(tableId) {
+  return request({
+    url: '/boman-gen/genTableColumn/getColumnInfo/' + tableId,
+    method: 'get',
+  })
+}
+// 获取字段信息
+export function getByIdWithForeignKey(tableId) {
+  return request({
+    url: '/boman-gen/genTableColumn/getByIdWithForeignKey/' + tableId,
+    method: 'get',
+  })
+}
+// 获取字段信息
+export function getLoadTable() {
+  return request({
+    url: 'boman-gen/init/loadTable',
+    method: 'get',
+  })
+}
+
+// 获取快速查询  查询框数据/ */
+export function tableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+
+// 快速查询列表
+export function listIndexfou(data) {
+  return request({
+    url: '/boman-web-core/p/cs/queryList',
+    method: 'post',
+    data: data
+  })
+}

+ 4 - 1
ruoyi-ui/src/components/FlowChartShow/index.vue

@@ -90,6 +90,9 @@
 <script>
 <script>
 import '../../utils/go'
 import '../../utils/go'
 import FlowDisplay from '../../utils/flow-display';
 import FlowDisplay from '../../utils/flow-display';
+import {
+     addGenflowshow
+    } from "@/api/activiti/definition";
 export default {
 export default {
   name:'FlowChartShow',
   name:'FlowChartShow',
   props:{
   props:{
@@ -212,7 +215,7 @@ export default {
     // 获取流程图信息
     // 获取流程图信息
     getChartInfo () {
     getChartInfo () {
       let id = this.instanceId?this.instanceId:this.$route.query.instanceId
       let id = this.instanceId?this.instanceId:this.$route.query.instanceId
-      this.$network.post('/p/c/task/backlog/detail', {instanceId:id})
+      addGenflowshow()
         .then(res => {
         .then(res => {
           if(res.data.resultCode === 0){
           if(res.data.resultCode === 0){
             let guiStyle = res.data.data.guiStyle?JSON.parse(res.data.data.guiStyle):{}
             let guiStyle = res.data.data.guiStyle?JSON.parse(res.data.data.guiStyle):{}

+ 8 - 4
ruoyi-ui/src/components/HistoricalProcess/index.vue

@@ -38,6 +38,11 @@ import ItemComponent from "../ItemComponent";
 import StandardTable from "../StandardTable";
 import StandardTable from "../StandardTable";
 import FlowChartShow from "../FlowChartShow";
 import FlowChartShow from "../FlowChartShow";
 // import { mapMutations } from "vuex";
 // import { mapMutations } from "vuex";
+import {
+    addGenhistoricap,
+    addGenhistorihistory,
+    addGenhistorilisr
+  } from "@/api/activiti/definition";
 export default {
 export default {
   name: "HistoricalProcess",
   name: "HistoricalProcess",
   components: { FormItemComponent, StandardTable, FlowChartShow },
   components: { FormItemComponent, StandardTable, FlowChartShow },
@@ -267,7 +272,7 @@ export default {
     // ...mapMutations(["currentChange", "checkDetailsOpenWindow"]),
     // ...mapMutations(["currentChange", "checkDetailsOpenWindow"]),
     //业务关系下拉数据
     //业务关系下拉数据
     getselectOption() {
     getselectOption() {
-      this.$network.post("/p/cs/task/relation/list", {}).then(res => {
+      addGenhistoricap().then(res => {
         if (res.data.resultCode === 0) {
         if (res.data.resultCode === 0) {
           this.formLists.forEach(outer => {
           this.formLists.forEach(outer => {
             if (outer.item.filed === "businessType") {
             if (outer.item.filed === "businessType") {
@@ -311,7 +316,7 @@ export default {
       }
       }
       let obj = Object.assign({}, this.searchData);
       let obj = Object.assign({}, this.searchData);
       delete obj.updateTime;
       delete obj.updateTime;
-      this.$network.post("/p/cs/task/history/list", obj).then(res => {
+      addGenhistorihistory(obj).then(res => {
         if (res.data.resultCode === 0) {
         if (res.data.resultCode === 0) {
           let data = res.data.data;
           let data = res.data.data;
           this.total = data.total;
           this.total = data.total;
@@ -320,8 +325,7 @@ export default {
       });
       });
     },
     },
     submitTask(instanceId) {
     submitTask(instanceId) {
-      this.$network
-        .post("/p/cs/process/manualsubmit", {
+      addGenhistorilisr({
           instanceId: instanceId
           instanceId: instanceId
         })
         })
         .then(res => {
         .then(res => {

+ 1 - 0
ruoyi-ui/src/components/Multilinequery/index.vue

@@ -1,4 +1,5 @@
 <template>
 <template>
+  
 </template>
 </template>
 
 
 <script>
 <script>

+ 8 - 4
ruoyi-ui/src/components/mutipleSelectPop/index.vue

@@ -109,6 +109,11 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
+  import {
+     addGenmutipor,
+     addGenmutiporuder,
+     addGenmutiportree
+    } from "@/api/activiti/definition";
 export default {
 export default {
   name: "Mutiple",
   name: "Mutiple",
   props: {
   props: {
@@ -313,8 +318,7 @@ export default {
           //当item的TYPE为供应商时
           //当item的TYPE为供应商时
           //  当item的TYPE为组织时
           //  当item的TYPE为组织时
           if (val[0].TYPE === "CP_C_HRORG_ID") {
           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 => {
               .then(res => {
                 if (res.data.resultCode === 0) {
                 if (res.data.resultCode === 0) {
                   let HRORG = "in ("; //储存键名为CP_C_HRORG_ID对象的ID
                   let HRORG = "in ("; //储存键名为CP_C_HRORG_ID对象的ID
@@ -664,7 +668,7 @@ export default {
     //查找用户信息
     //查找用户信息
     findUser(param) {
     findUser(param) {
       this.tableLoading = true;
       this.tableLoading = true;
-      this.$network.post("/p/c/identity/user/list", param).then(res => {
+      addGenmutiporuder( param).then(res => {
         this.tableLoading = false;
         this.tableLoading = false;
         let data = res.data;
         let data = res.data;
         if (data.code === 0) {
         if (data.code === 0) {
@@ -695,7 +699,7 @@ export default {
     //获取树数据
     //获取树数据
      getTreeData() {
      getTreeData() {
       this.tree_loading = true;
       this.tree_loading = true;
-      this.$network.post("/p/c/identity/org/treeload", {}).then(res => {
+      addGenmutiportree().then(res => {
         this.tree_loading = false;
         this.tree_loading = false;
         if (res.data.resultCode === 0) {
         if (res.data.resultCode === 0) {
           this.treeNewData = [];
           this.treeNewData = [];

+ 10 - 4
ruoyi-ui/src/components/todoProcess/index.vue

@@ -61,6 +61,11 @@ import ItemComponent from "../ItemComponent";
 import StandardTable from "../StandardTable";
 import StandardTable from "../StandardTable";
 import mutipleSelectPop from "../mutipleSelectPop/index.vue";
 import mutipleSelectPop from "../mutipleSelectPop/index.vue";
 import FlowChartShow from "../FlowChartShow";
 import FlowChartShow from "../FlowChartShow";
+import {
+    addGendefini,
+    addGendefiniqur,
+    addGendefinideal
+  } from "@/api/activiti/definition";
 // import { mapState } from "vuex";
 // import { mapState } from "vuex";
 // import { mapMutations } from "vuex";
 // import { mapMutations } from "vuex";
 export default {
 export default {
@@ -69,7 +74,8 @@ export default {
     FormItemComponent,
     FormItemComponent,
     StandardTable,
     StandardTable,
     mutipleSelectPop,
     mutipleSelectPop,
-    FlowChartShow
+    FlowChartShow,
+    
   },
   },
   props: {
   props: {
     tabalive: { type: String, default: "" }
     tabalive: { type: String, default: "" }
@@ -331,7 +337,7 @@ export default {
     // ...mapMutations(["currentChange", "checkDetailsOpenWindow"]),
     // ...mapMutations(["currentChange", "checkDetailsOpenWindow"]),
     //业务关系下拉数据
     //业务关系下拉数据
     getselectOption() {
     getselectOption() {
-      this.$network.post("/p/cs/task/relation/list", {}).then(res => {
+      addGendefini().then(res => {
         if (res.data.resultCode === 0) {
         if (res.data.resultCode === 0) {
           this.formLists.forEach(outer => {
           this.formLists.forEach(outer => {
             if (outer.item.filed === "businessType") {
             if (outer.item.filed === "businessType") {
@@ -364,7 +370,7 @@ export default {
       }
       }
       let obj = Object.assign({}, this.searchData);
       let obj = Object.assign({}, this.searchData);
       delete obj.createTime;
       delete obj.createTime;
-      this.$network.post("/p/cs/task/backlog/list", obj).then(res => {
+      addGendefiniqur(obj).then(res => {
         if (res.data.resultCode === 0) {
         if (res.data.resultCode === 0) {
           let data = res.data.data;
           let data = res.data.data;
           this.total = data.total;
           this.total = data.total;
@@ -402,7 +408,7 @@ export default {
         return
         return
       }
       }
       // sendData.userId = this.userInfo.userId;
       // sendData.userId = this.userInfo.userId;
-      this.$network.post("/p/cs/task/batch/deal", sendData).then(res => {
+      addGendefinideal(sendData).then(res => {
         let data = res.data;
         let data = res.data;
         if (data.resultCode === 0) {
         if (data.resultCode === 0) {
           this.queryLists();
           this.queryLists();