sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sxyanzhu:95623ffc73336c703225ff09be69bada24b2ce54
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:c63d824aaf5030e6583c5fe6118a722c4f654aa4
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "95623ffc73336c703225ff09be69bada24b2ce54" and "c63d824aaf5030e6583c5fe6118a722c4f654aa4" have entirely different histories.
95623ffc73 ... c63d824aaf

3 changed files with 3 additions and 15 deletions
Show Stats Expand all files Collapse all files

2
ruoyi-ui/src/views/flow/flowLabourInfo/approveFlowLabourDrawer.vue
View File

@ -126,7 +126,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="欠薪金额"> <el-form-item label="欠薪金额">
{{ dataInfo.laborAmount }} <el-tag size="small">元</el-tag> {{ dataInfo.laborNumber }} <el-tag size="small">元</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

2
ruoyi-ui/src/views/flow/flowLabourInfo/detailFlowLabourDrawer.vue
View File

@ -125,7 +125,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="欠薪金额"> <el-form-item label="欠薪金额">
{{ dataInfo.laborAmount }} <el-tag size="small">元</el-tag> {{ dataInfo.laborNumber }} <el-tag size="small">元</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

14
ruoyi-ui/src/views/flow/flowLabourInfo/index.vue
View File

@ -176,19 +176,11 @@
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}") }}</span> <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="原因说明"
align="center"
prop="laborReason"
width="120"
show-overflow-tooltip
/>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="120" width="120"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -362,11 +354,7 @@ export default {
if (this.myMinRoles.includes("lc_jfdb")) { if (this.myMinRoles.includes("lc_jfdb")) {
this.jdsp = true; this.jdsp = true;
} }
if ( if (this.myMinRoles.includes("admin") ||this.myMinRoles.includes("super") || this.myMinRoles.includes("jtgs")) {
this.myMinRoles.includes("admin") ||
this.myMinRoles.includes("super") ||
this.myMinRoles.includes("jtgs")
) {
this.jtsp = true; this.jtsp = true;
} }
this.getList(); this.getList();