Merge pull request 'master' (#32) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/32

src/router/index.js

@@ -70,6 +70,15 @@ const router = createRouter({
             breadcrumb: true
           }
         },
+        {
+          path: '/workflow/process',
+          name: 'process',
+          component: () => import('@/views/workflow/process/index.vue'),
+          meta: {
+              title: '流程管理',
+              breadcrumb: true
+          }
+        },
         {
           path: '/workflow/process/edit',
           name: 'processAdd',

src/views/monitor/logininfor/index.vue

@@ -148,6 +148,8 @@ const getList = async () => {
       list.value = res.data.rows
       total.value = res.data.total
       loading.value = false
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 }

src/views/monitor/online/index.vue

@@ -78,6 +78,8 @@ const getList = async () => {
       list.value = res.data.rows
       total.value = res.data.total
       loading.value = false
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 }

src/views/monitor/operlog/index.vue

@@ -247,6 +247,8 @@ const getList = async () => {
       list.value = res.data.rows;
       total.value = res.data.total;
       loading.value = false;
+    }else {
+      ElMessage.error(res.msg);
     }
   });
 };

src/views/rapid/gen/index.vue

@@ -271,6 +271,8 @@ const getList = async () => {
       list.value = res.data.rows
       total.value = res.data.total
       loading.value = false
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 }

src/views/system/config/index.vue

@@ -18,7 +18,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleSearch()" :icon="Search">搜索</el-button>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
         <el-button @click="handleReset" :icon="Refresh">重置</el-button>
       </el-form-item>
     </el-form>
@@ -160,10 +160,7 @@ const formRules = ref({
     {required: true, message: "系统内置不能为空", trigger: "change"},
   ],
 })
-//搜索功能
+
-const handleSearch = () => {
-  getList()
-}
 //重置搜索
 const handleReset = () => {
   queryForm.value.resetFields()

src/views/system/dept/index.vue

@@ -182,8 +182,12 @@ const getEditOption = (deptId) => {
 const getList = async () => {
   loading.value = true
   getDeptList(queryParams).then(res => {
-    list.value = res.data
+    if (res.code === 1000) {
-    loading.value = false
+      list.value = res.data
+      loading.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
   })
 }
 const getDetail = (deptId) => {

src/views/system/menu/index.vue

@@ -44,8 +44,10 @@
       <el-table-column prop="createTime" label="创建时间"/>
       <el-table-column label="操作" prop="operation">
         <template #default="scope">
-          <el-button type="primary" v-if="scope.row.menuType!=='B'" size="mini" @click="handleAdd(scope.row)" link>新增</el-button>
+          <el-button type="primary" v-if="scope.row.menuType!=='B'" size="mini" @click="handleAdd(scope.row)" link>新增
-          <div v-else style="display: inline-block">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+          </el-button>
+          <div v-else style="display: inline-block">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          </div>
           <el-button type="primary" size="mini" @click="handleEdit(scope.row.menuId)" link>修改</el-button>
           <el-button type="primary" size="mini" @click="handleAssignRoles(scope.row)" link>分配角色</el-button>
           <popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)"/>
@@ -230,8 +232,12 @@ const getSelectIcon = (val) => {
 const getList = async () => {
   loading.value = true
   getMenuList(queryParams).then(res => {
-    list.value = res.data
+    if (res.code === 1000) {
-    loading.value = false
+      list.value = res.data
+      loading.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
   })
 }
 

src/views/system/notice/inform/index.vue

@@ -100,7 +100,9 @@ const getList = async () => {
     } else {
       ElMessage.error(res.msg);
     }
-  });
+  }).catch(err => {
+    loading.value = false;
+  })
 };
 //查看详情
 const handleViewDetails = (noticeId) => {

src/views/system/notice/publish/index.vue

@@ -332,7 +332,9 @@ const getList = async () => {
     } else {
       ElMessage.error(res.msg);
     }
-  });
+  }).catch(err => {
+    loading.value = false;
+  })
 };
 //查看公告详情
 const handleViewDetails = async (row) => {

src/views/system/post/index.vue

@@ -141,12 +141,16 @@ const getList = async () => {
     ...queryParams,
     ...pageInfo
   }).then(res => {
-    res.data.rows = res.data.rows.sort((a, b) => {
+    if (res.code === 1000) {
-      return a.postSort - b.postSort
+      res.data.rows = res.data.rows.sort((a, b) => {
-    })
+        return a.postSort - b.postSort
-    total.value = res.data.total;
+      })
-    list.value = res.data.rows
+      total.value = res.data.total;
-    loading.value = false
+      list.value = res.data.rows
+      loading.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
   })
 }
 const handleReset = (instance) => {

src/views/system/role/index.vue

@@ -284,6 +284,8 @@ const getList = async () => {
       list.value = res.data.rows
       total.value = res.data.total
       loading.value = false
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 };

src/views/tool/interface-switch/index.vue

@@ -113,11 +113,12 @@ const getList =  () => {
   }
   loading.value = true
   getMappingList(params).then(res => {
-    // console.log('res',res)
     if (res.code === 1000) {
       loading.value = false
       list.value = res.data.rows
       total.value = res.data.total
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 };

src/views/workflow/about/index.vue

@@ -118,11 +118,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
-
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 

src/views/workflow/approve/index.vue

@@ -140,11 +140,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
-
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 //切换每页显示条数

src/views/workflow/initiated/index.vue

@@ -120,10 +120,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 

src/views/workflow/listen/index.vue

@@ -204,10 +204,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 

src/views/workflow/process/ProcessEdit.vue

@@ -290,7 +290,7 @@ const doPublish = () => {
     addProcessDefinition(template).then(res => {
       if (res.code === 1000) {
         ElMessage.success(res.msg)
-        // this.$router.push("/formsPanel")
+        router.push("/workflow/process")
       } else {
         ElMessage.error(res.msg)
       }

src/views/workflow/process/ProcessTree.vue

@@ -322,7 +322,7 @@ const insertNode = debounce((type, parentNode) => {
       break;
   }
   init()
-}, 1000)
+}, 100)
 /**
  * 更新父id
  * @param newId
@@ -688,8 +688,8 @@ defineExpose({
   display: flex;
   justify-content: center;
   position: relative;
-  /*border-top: 2px solid #cccccc;
+  //border-top: 2px solid #cccccc;
-  border-bottom: 2px solid #cccccc;*/
+  //border-bottom: 2px solid #cccccc;
 }
 
 .branch-node-item {
@@ -700,7 +700,7 @@ defineExpose({
   align-items: center;
   border-top: 2px solid #000000;
   border-bottom: 2px solid #000000;
-//border-radius: 40px;
+
   &:before {
     content: "";
     position: absolute;

src/views/workflow/process/index.vue

@@ -161,10 +161,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 

src/views/workflow/process/nodes/ConcurrentNode.vue

@@ -149,18 +149,18 @@ const designStart = () => {
       display: inline-block;
 
       .node-body-main-header {
-        padding: 10px 0px 5px;
+        padding: 10px 0 5px;
-        font-size: xx-small;
         position: relative;
-
+        font-size: 14px;
+        display: flex;
+        align-items: center;
         .title {
-          color: #718dff;
+          color: #2E7CF0;
-
+          height: auto;
+          display: flex;
+          align-items: center;
           .name {
-            display: inline-block;
+            height: auto;
-            height: 14px;
-            width: 130px;
-            margin-left: 2px;
           }
         }
 

src/views/workflow/process/nodes/ConditionNode.vue

@@ -248,9 +248,9 @@ defineExpose({
       display: inline-block;
 
       .node-body-main-header {
-        padding: 10px 0px 5px;
+        padding: 10px 0 5px;
         position: relative;
-        font-size: 14px !important;
+        font-size: 14px;
         display: flex;
         align-items: center;
 
@@ -260,13 +260,10 @@ defineExpose({
           height: auto;
           display: flex;
           align-items: center;
+          .name {
+            height: auto;
+          }
         }
-
-        .name {
-          color: #2E7CF0;
-          height: auto;
-        }
-
         .level {
           position: absolute;
           right: 15px;

src/views/workflow/task/index.vue

@@ -56,6 +56,7 @@ import {useProcessStore} from '@/stores/processStore.js'
 import Paging from "@/components/pagination/index.vue";
 import {useCacheStore} from '@/stores/cache.js'
 import PointTag from "@/components/PointTag.vue";
+import {ElMessage} from "element-plus";
 
 const processStore = useProcessStore()
 const dictStore = useCacheStore()
@@ -100,9 +101,15 @@ const getList = async () => {
   }
   loading.value = true
   getTaskList(params).then(res => {
-    list.value = res.data.rows
+    if (res.code === 1000) {
-    total.value = res.data.total
+      list.value = res.data.rows
+      total.value = res.data.total
+    } else {
+      ElMessage.error(res.msg)
+    }
     loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }