Parcourir la source

Merge branch 'hjw-riskMaterials' into 'master'

风险点工作流

See merge request spfm/spfm-market-front!390
徐兴安 il y a 2 ans
Parent
commit
6e2aa7d4b1

+ 1 - 0
src/assets/js/url.js

@@ -13,6 +13,7 @@ const urls = {
     //新需求申请单工作流接口
     formList: {
         startWork: ctxForm + '/startProcess',   //开始工作流
+        startWorkList: ctxForm + '/batchStartProcess',   //开始工作流多人
         nextWork: ctxForm + '/complateTask',  //工作流next流转
         getWorkId: ctxForm + '/getRunningProcessInstance', // 获取工作流任务id
         transferTask: ctxForm + '/process/transferTask/',//转派工作流接口

+ 8 - 0
src/components/el-form.vue

@@ -11,6 +11,7 @@
       @selection-change="selectionChange"
       empty-text="暂无数据"
       @cell-click="getRowList"
+      :cell-style="columnbackgroundStyle"
     >
       <!-- 是否多选 -->
       <el-table-column
@@ -116,6 +117,13 @@ export default {
 
   },
   methods: {
+    columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.type == 'default') {
+        if (column.label === '待办事项名称') {
+          return 'color:#0682CD;'
+        }
+      }
+    },
     selectionChange(val) {
 
       //多选数字回调

+ 1 - 0
src/components/workflowBase.vue

@@ -134,6 +134,7 @@ export default {
   name: "workflow",
   data() {
     return {
+      editStatus: false, //常用意见控制
       transferStatus: false, //转派按钮控制
       TransferStatus: false, //是否点击转派状态
       copyStatus: false, //抄送按钮控制

Fichier diff supprimé car celui-ci est trop grand
+ 1283 - 0
src/pages/main/leader/risk/riskManagement.vue


Fichier diff supprimé car celui-ci est trop grand
+ 1444 - 0
src/pages/main/leader/risk/riskMaterials.vue


+ 13 - 0
src/router/index.js

@@ -2152,6 +2152,19 @@ const routes = [{
             component: resolve => require(['../pages/main/processruns/processruns.vue'], resolve),
             meta: { title: '运行流程' }
         }
+        ,{
+            meta: { name: '风险防控管理', keepAlive: false },
+            path: '/riskMaterials',
+            name: 'riskMaterials',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/leader/risk/riskMaterials.vue'], resolve)
+        },{
+            meta: { name: '风险防控管理', keepAlive: false },
+            path: '/riskManagement',
+            name: 'riskManagement',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/leader/risk/riskManagement.vue'], resolve)
+        },
     ]
 },
 {