Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/api/activiti/definition.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 新增关联表
 export function addGendefini(data) {
   return request({
-    url: '/p/cs/task/relation/list',
+    url: '/jflow/p/cs/task/relation/list',
     method: 'post',
     data
   })
@@ -11,7 +11,7 @@ export function addGendefini(data) {
 // 刪除
 export function addGendefinideal(data) {
   return request({
-    url: '/p/cs/task/batch/deal',
+    url: '/jflow/p/cs/task/batch/deal',
     method: 'post',
     data
   })
@@ -19,7 +19,7 @@ export function addGendefinideal(data) {
 // 查詢
 export function addGendefiniqur(data) {
   return request({
-    url: '/p/cs/task/backlog/list',
+    url: '/jflow/p/cs/task/backlog/list',
     method: 'post',
     data
   })
@@ -28,7 +28,7 @@ export function addGendefiniqur(data) {
 // mesetet
 export function addGenmutipor(data) {
   return request({
-    url: '/p/c/identity/org/treequery',
+    url: '/jflow/p/c/identity/org/treequery',
     method: 'post',
     data
   })
@@ -36,7 +36,7 @@ export function addGenmutipor(data) {
 //查找用户信息
 export function addGenmutiporuder(data) {
   return request({
-    url: '/p/c/identity/user/list',
+    url: '/jflow/p/c/identity/user/list',
     method: 'post',
     data
   })
@@ -44,7 +44,7 @@ export function addGenmutiporuder(data) {
 //获取树数据
 export function addGenmutiportree(data) {
   return request({
-    url: '/p/c/identity/org/treeload',
+    url: '/jflow/p/c/identity/org/treeload',
     method: 'post',
     data
   })
@@ -54,7 +54,7 @@ export function addGenmutiportree(data) {
 // 获取流程图信息  flowshow
 export function addGenflowshow(data) {
   return request({
-    url: '/p/c/task/backlog/detail',
+    url: '/jflow/p/c/task/backlog/detail',
     method: 'post',
     data
   })
@@ -63,7 +63,7 @@ export function addGenflowshow(data) {
 //业务关系下拉数据   historicap
 export function addGenhistoricap(data) {
   return request({
-    url: '/p/cs/task/relation/list',
+    url: '/jflow/p/cs/task/relation/list',
     method: 'post',
     data
   })
@@ -71,7 +71,7 @@ export function addGenhistoricap(data) {
 // history 查询列表
 export function addGenhistorihistory(data) {
   return request({
-    url: '/p/cs/task/history/list',
+    url: '/jflow/p/cs/task/history/list',
     method: 'post',
     data
   })
@@ -79,7 +79,7 @@ export function addGenhistorihistory(data) {
 //提交
 export function addGenhistorilisr(data) {
   return request({
-    url: "/p/cs/process/manualsubmit",
+    url: "/jflow/p/cs/process/manualsubmit",
     method: 'post',
     data
   })

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

@@ -11,16 +11,15 @@
       :buttonType="false"
       @formChange="formChange"
     ></FormItemComponent>
-
-    <StandardTable
-      class="table"
-      :currentPage="searchData.page"
-      :pageSize="searchData.pageSize"
-      :total="total"
-      :columns="columns"
-      :data="data"
-      :standardTableEvent="standardTableEvent"
-    ></StandardTable>
+   <StandardTable
+     class="table"
+     :currentPage="searchData.page"
+     :pageSize="searchData.pageSize"
+     :total="total"
+     :columns="columns"
+     :data="data"
+     :standardTableEvent="standardTableEvent"
+   ></StandardTable>
     <Modal
       v-model="openControl"
       :title="modaltitle"
@@ -30,6 +29,7 @@
       @on-ok="ok"
       @on-cancel="cancel"
     >
+
       <div class="modalCotent">
         <mutipleSelectPop
           ref="dialogtest"
@@ -60,7 +60,7 @@
 import FormItemComponent from "../FormItemComponent";
 import ItemComponent from "../ItemComponent";
 import StandardTable from "../StandardTable";
-import mutipleSelectPop from "@/components/MutipleSelectPop";
+import mutipleSelectPop from "../MutipleSelectPop/index.vue";
 import FlowChartShow from "../FlowChartShow";
 import {
     addGendefini,
@@ -405,7 +405,11 @@ export default {
       if(this.resultData.list.length>0){
          sendData.delegateId = this.resultData.list[0].ID;
       }else{
-        this.$Message.warning("请选择转派人员");
+        this.$message({
+                 message: "请选择转派人员",
+                 type: 'warning'
+               });
+        // this.$Message.warning("请选择转派人员");
         return
       }
       // sendData.userId = this.userInfo.userId;
@@ -413,9 +417,14 @@ export default {
         let data = res.data;
         if (data.resultCode === 0) {
           this.queryLists();
-          this.$Message.success(data.resultMsg);
+          this.msgSuccess(data.resultMsg);
+          // this.$Message.success();
         } else {
-          this.$Message.warning(data.resultMsg);
+          this.$message({
+                   message: data.resultMsg,
+                   type: 'warning'
+                 });
+          // this.$Message.warning(data.resultMsg);
         }
       });
     },
@@ -455,7 +464,11 @@ export default {
         this.resultData.total=0;
       }
       } else {
-        this.$Message.warning("请选择单据");
+         this.$message({
+                  message: '请选择单据',
+                  type: 'warning'
+                });
+        // this.$Message.warning("请选择单据");
       }
     },
     onRowClick(row, index, vm) {

ruoyi-ui/src/utils/request.js

@@ -6,6 +6,7 @@ import errorCode from '@/utils/errorCode'
 import { tansParams } from "@/utils/ruoyi";
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers['accountName'] = 'guest'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

ruoyi-ui/src/views/activiti/modeler/index.vue

@@ -196,7 +196,7 @@ export default {
     }
   },
   methods:{
-    // ...mapMutations(['currentChange','changeKeepAliveArray']),
+    ...mapMutations(['currentChange','changeKeepAliveArray']),
     formChange (data) {  //表单数据修改时，修改searchData数据
       if(data.status){
         this.formLists[0].item.value = data.name
@@ -254,7 +254,6 @@ export default {
           })
           return arr
         },[])
-        console.log(this.listsConfig,9998)
       });
     },
     addTemplate () {  //新建模版

ruoyi-ui/src/views/index.vue

@@ -112,7 +112,7 @@
                  <el-tab-pane label="用户管理" name="first"> -->
                    <div style="height: 84%;">
                         <div style="height: 85%;">
-                          <h3 style="text-align: center;">{{tieku}}</h3>
+                          <h3 style="text-align: center; margin: 35px 0;">{{tieku}}</h3>
                                         <p class="index_profilep" > {{comg}}	</p>
                         </div>
                                       <!-- {{getLisprofileone[0].info_content}} -->
@@ -170,14 +170,14 @@
                 <span @click="memoere"><i class="el-icon-date"></i>创建备忘录</span>
               </p>
               <ul >
-                <li v-for="(item,index) in getmemorandum" :key="index" @click="index_deledetfe(item.id)">
+                <li v-for="(item,index) in getmemorandum" :key="index" >
                   <p>{{item.memorandum_title}}
                   </p>
                   <div class="index_navspande">
                     <span>
                     {{item.remind_time}}
                     </span>
-                    <img src="../assets/images/deletety.png" alt="" v-if="shower">
+                    <img src="../assets/images/deletety.png" alt="" v-if="shower" @click="index_deledetfe(item.id)">
                   </div>
                 </li>
 
@@ -454,23 +454,11 @@ export default {
      brightDate () {
        // let ary = []
        var that =  this
-       // console.log(that.calendarData,887)
        if(that.calendarData.length !==null){
          for (var i = 0 ; i < that.calendarData.length; i++) {
-           // that.ary.push(that.calendarData[i].startDate)
-           // that.ary.push(that.calendarData[i].begin_time.slice(0,10))
-           // that.ary.push(that.calendarData[i].all_date.split(','))
            that.calendarData[i].love="yu"
            if(that.calendarData[i].remind_time !== undefined){
-             // that.rjtu.concat(that.calendarData[i].all_date.join(','))
              that.ary.push(that.calendarData[i].remind_time)
-             // that.calendarData[i].all_date.fi
-             // that.calendarData[i].remind_time.filter(route => {
-             //   // console.log(route,9875)
-             //   that.ary.push(route)
-             // })
-             // that.ary = that.calendarData[i].all_date
-             // console.log(that.calendarData[i].all_date.join(','),754)
            }
          }
        }
@@ -489,23 +477,20 @@ export default {
           let conert = ''
           let conertre = ''
           let nujue= 0
-          let nujeug = []
-          let setre = []
-          this.truew = []
           console.log(this.calendarData)
           for (var i = 0 ; i < this.calendarData.length; i++) {
             if(this.calendarData[i].schedule_content !== undefined){
            this.calendarData[i].schedule_content = this.calendarData[i].schedule_content.replace(/<\/?[^>]*>/g, '')
             }
             if(data == this.calendarData[i].remind_time){
-              content  = content  + this.calendarData[i].schedule_content + '、'
-              console.log(i,this.calendarData.length)
+              console.log(content,this.calendarData[i].schedule_content)
+              if(content  == this.calendarData[i].schedule_content + '、'){
+                content  = content
+              }else{
+                content  = content  + this.calendarData[i].schedule_content + '、'
+              }
             }
-                console.log(content)
           }
-          console.log(content)
-          // console.log(this.rjtu,12345)
-          // content = this.rjtu.join(',')
          return content
         },
     //数据  第一部分列表

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -640,7 +640,7 @@
       tableBtn(row){
         this.openquery = false
         this.ForeName = row.column_name
-        this.formZd.foreignKey = row.column_id
+        this.formZd.foreignKey = row.id
       },
       fkzdFn() {
         this.queryedit()