Merge branch 'dev'

src/router/index.js

@@ -53,6 +53,18 @@ const routes = [
         name: 'system_user',
         meta: { title: '用户管理' },
       },
+      {
+        path: '/saas/currency',
+        component: () => import('@/views/basics/currency.vue'),
+        name: 'basics_currency',
+        meta: { title: '汇率币种' },
+      },
+      {
+        path: '/saas/timed_task',
+        component: () => import('@/views/system/timed_task.vue'),
+        name: 'system_timed_task',
+        meta: { title: '定时任务' },
+      },
     ],
   },
 ]

src/views/home/navMenu.vue

@@ -179,6 +179,22 @@ export default {
               index: 'user',
               children: [],
             },
+            {
+              id: 4,
+              path: '',
+              label: '汇率币种',
+              icon: 'el-icon-bank-card',
+              index: '/saas/currency',
+              children: [],
+            },
+            // {
+            //   id: 4,
+            //   path: '',
+            //   label: '定时任务',
+            //   icon: 'el-icon-message-solid',
+            //   index: '/saas/timed_task',
+            //   children: [],
+            // },
           ],
         },
       ],

src/views/taskManage/index.vue

@@ -11,10 +11,10 @@
       <el-tree
         :data="treeData"
         :props="defaultProps"
+        ref="tree"
         highlight-current
         :node-key="'statusCode'"
         :expand-on-click-node="false"
-        current-node-key="PRE_HANDLING"
         default-expand-all
         @node-click="handleNodeClick"
       >
@@ -42,11 +42,17 @@
             v-model="searchForm.prop"
             placeholder="请选择"
             clearable
-            style="width:100px"
+            style="width: 100px"
           >
-          <el-option label="开始时间" value="startTime"></el-option>
-          <el-option label="创建时间" value="createTime"></el-option>
-        </el-select>
+            <el-option
+              label="开始时间"
+              value="startTime"
+            ></el-option>
+            <el-option
+              label="创建时间"
+              value="createTime"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <choose-time-period
@@ -450,6 +456,7 @@ import assignWork from '@/assets/work/assign.png'
 import startWork from '@/assets/work/start.png'
 import archiveWork from '@/assets/work/archive.png'
 import completeWork from '@/assets/work/complete.png'
+import rejectWork from '@/assets/work/reject.png'
 
 export default {
   name: 'task_center',
@@ -482,7 +489,11 @@ export default {
       selections: [],
       is_tab: '1',
       statusCode: 'PRE_HANDLING',
-      searchForm: { timeProp: 'create_time', leaders: [], prop: 'createTime' },
+      searchForm: {
+        timeProp: 'create_time',
+        leaders: [],
+        prop: 'createTime',
+      },
       isEdit: false,
       sourceData: [],
       currentRowId: '',
@@ -609,8 +620,7 @@ export default {
           align: 'center',
           render: (item) => (
             <span>
-              {(item.orderStatus === 'PRE_HANDLING' ||
-                item.orderStatus === 'IN_COMPLETE') && (
+              {
                 <span
                   title="详情"
                   class="icon-view icon-tools-view"
@@ -620,7 +630,7 @@ export default {
                     onClick={() => this.showDetail(item)}
                   ></i>
                 </span>
-              )}
+              }
               {item.orderStatus === 'TO_BE_ASSIGN' && (
                 <span title="指派给" class="icon-view">
                   <img
@@ -663,6 +673,16 @@ export default {
                   />
                 </span>
               )}
+              {item.orderStatus === 'IN_COMPLETE' && (
+                <span title="驳回" class="icon-view">
+                  <img
+                    width="24"
+                    height="24"
+                    src={rejectWork}
+                    onClick={() => this.reject(item)}
+                  />
+                </span>
+              )}
             </span>
           ),
         },
@@ -731,7 +751,6 @@ export default {
       this.centerPageOptions.currentPage = currentPage
       this.getlist()
     },
-    operation() {},
     async getSystemUserList() {
       try {
         const res = await getSystemUserList()
@@ -769,6 +788,9 @@ export default {
         if (res.code === 200) {
           this.treeData = [res.data]
         }
+        this.$nextTick(() => {
+          this.$refs.tree.setCurrentKey(this.statusCode)
+        })
       } catch (e) {
         console.error(e)
       }
@@ -805,16 +827,21 @@ export default {
         )
         if (res.code === 200) {
           this.assignVisible = false
-          this.getlist()
           this.getOrderTree()
+          this.getlist()
         }
       } catch (e) {
         console.error(e)
       }
     },
     handleNodeClick(data) {
+      if (data.statusCode === 'IN_PROGRESS') {
+        this.$set(this.searchForm, 'leaders', [
+          this.userInfo.id,
+        ])
+      }
       if (data.statusCode !== 'IN_PROGRESS') {
-        this.searchForm.leaders = ''
+        this.searchForm.leaders = []
       }
       this.statusCode = data.statusCode
       this.getlist()
@@ -831,11 +858,16 @@ export default {
           startTime: this.periodTime && this.periodTime[0],
           endTime: this.periodTime && this.periodTime[1],
           ...this.searchForm,
-          leaders: this.searchForm.leaders && this.searchForm.leaders.join(','),
+          leaders:
+            this.searchForm.leaders &&
+            this.searchForm.leaders.join(','),
         })
         .then((res) => {
+          if (res.code !== 200) return
           this.sourceData = res.data.records
           this.centerPageOptions.total = res.data.total
+        })
+        .finally(() => {
           this.loading = false
         })
     },
@@ -879,6 +911,15 @@ export default {
         console.error(e)
       }
     },
+    async reject() {
+      try {
+        await this.$confirm('确定驳回吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+      } catch {}
+    },
     async submitTime() {
       if (!this.estimateCompleteTime) {
         return this.$message.warning('请选择预计完成时间')
@@ -935,19 +976,6 @@ export default {
       this.textarea = ''
     },
   },
-  watch: {
-    statusCode(val) {
-      if (val === 'IN_PROGRESS') {
-        this.$set(
-          this.searchForm,
-          'leaders',
-          [this.userInfo.id],
-        )
-      } else {
-        this.$set(this.searchForm, 'leaders', [])
-      }
-    },
-  },
 }
 </script>
 <style lang="scss" scoped>