Skip to content

S
saas-manage
Commit 15d04078 by yangzhi
Options

Merge branch 'dev'

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