FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-17 14:21:23 +08:00
parent 731d54a585 95aff9cecb
commit 795287d6e7
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+2 -2
View File
@@ -112,13 +112,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="endTime" prop="overTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50"> <el-table-column :label="$t('m.operation')" align="center" width="50">
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+2 -2
View File
@@ -112,13 +112,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="endTime" prop="overTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50"> <el-table-column :label="$t('m.operation')" align="center" width="50">
src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+2 -2
View File
@@ -112,13 +112,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="endTime" prop="overTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50"> <el-table-column :label="$t('m.operation')" align="center" width="50">
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -2
View File
@@ -112,13 +112,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="endTime" prop="overTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50"> <el-table-column :label="$t('m.operation')" align="center" width="50">
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+2 -2
View File
@@ -112,13 +112,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="endTime" prop="overTime"
label="完成日期" label="完成日期"
align="center" align="center"
width="380" width="380"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span> <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50"> <el-table-column :label="$t('m.operation')" align="center" width="50">