|
|
|
@ -70,6 +70,7 @@ |
|
|
|
@row-click="handleRowClick" |
|
|
|
@selection-change="handleSelectionChange" |
|
|
|
@filter-change="filterChange" |
|
|
|
@cell-dblclick="dblhandleCurrentChange" |
|
|
|
> |
|
|
|
<el-table-column type="selection" width="44px"></el-table-column> |
|
|
|
<el-table-column |
|
|
|
@ -88,8 +89,41 @@ |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column label="说明" width="400" align="center"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input |
|
|
|
ref="inputRef" |
|
|
|
v-if="scope.row.isEditCell" |
|
|
|
v-model.number="scope.row.remark" |
|
|
|
class="el-input" |
|
|
|
v-focus |
|
|
|
@blur="cellBlur(scope.row, scope.column)" |
|
|
|
/> |
|
|
|
<span v-else>{{ scope.row.remark }}</span> |
|
|
|
<el-button |
|
|
|
style="margin-left: 5px" |
|
|
|
v-if="scope.row.isEditCell" |
|
|
|
type="success" |
|
|
|
icon="el-icon-check" |
|
|
|
size="small" |
|
|
|
circle |
|
|
|
@click="submitName(scope.row)" |
|
|
|
></el-button> |
|
|
|
<el-button |
|
|
|
v-show="scope.row.isEditCell" |
|
|
|
class="cancel-btn" |
|
|
|
size="mini" |
|
|
|
icon="el-icon-refresh" |
|
|
|
type="warning" |
|
|
|
@click.native.prevent="handleCancel(scope.row)" |
|
|
|
> |
|
|
|
cancel |
|
|
|
</el-button> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<!-- 操作名称 --> |
|
|
|
<el-table-column |
|
|
|
<!-- <el-table-column |
|
|
|
prop="actionName" |
|
|
|
label="操作名称(单击箭头过滤)" |
|
|
|
width="165" |
|
|
|
@ -113,7 +147,7 @@ |
|
|
|
</el-tag> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table-column> --> |
|
|
|
<!-- 状态 --> |
|
|
|
<el-table-column |
|
|
|
prop="stateName" |
|
|
|
@ -193,154 +227,6 @@ |
|
|
|
/> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- 任务日志详细 --> |
|
|
|
<el-dialog |
|
|
|
title="任务详细" |
|
|
|
:visible.sync="openView" |
|
|
|
width="700px" |
|
|
|
append-to-body |
|
|
|
> |
|
|
|
<el-form ref="form" :model="form" label-width="120px" size="mini"> |
|
|
|
<el-row> |
|
|
|
<el-col :span="24"> |
|
|
|
<div class="overall"> |
|
|
|
<!-- 步骤条 --> |
|
|
|
<div class="steps-box"> |
|
|
|
<ul class="steps"> |
|
|
|
<li |
|
|
|
v-for="(item, index) in stepList" |
|
|
|
:key="index" |
|
|
|
:class="{ active: activeIndex - 1 === index }" |
|
|
|
> |
|
|
|
<p :class="{ li_active: activeIndex > index }"> |
|
|
|
<i :class="item.icon"></i> |
|
|
|
</p> |
|
|
|
<div |
|
|
|
class="text" |
|
|
|
:class="{ li_active: activeIndex > index }" |
|
|
|
> |
|
|
|
{{ item.title }} |
|
|
|
</div> |
|
|
|
</li> |
|
|
|
</ul> |
|
|
|
</div> |
|
|
|
<!-- 步骤条对应内容 --> |
|
|
|
<div class="Article-content"> |
|
|
|
<el-tabs v-model="activeName"> |
|
|
|
<el-tab-pane label="基本信息" name="first"> |
|
|
|
<div class="dialog-body"> |
|
|
|
<div |
|
|
|
class="content" |
|
|
|
v-for="(item, index) in stepList" |
|
|
|
:key="index" |
|
|
|
v-show="activeIndex == index + 1" |
|
|
|
> |
|
|
|
<div> |
|
|
|
<el-card style="height: 300px; margin: 2px"> |
|
|
|
<div |
|
|
|
v-if="activeIndex == 1" |
|
|
|
slot="header" |
|
|
|
class="clearfix" |
|
|
|
> |
|
|
|
<span>当前状态：等待执行</span> |
|
|
|
</div> |
|
|
|
<div |
|
|
|
v-else-if="activeIndex == 2" |
|
|
|
slot="header" |
|
|
|
class="clearfix" |
|
|
|
> |
|
|
|
<span>当前状态：执行中...</span> |
|
|
|
</div> |
|
|
|
<div |
|
|
|
v-else-if="activeIndex == 3" |
|
|
|
slot="header" |
|
|
|
class="clearfix" |
|
|
|
> |
|
|
|
<div id="chatarea"> |
|
|
|
<div |
|
|
|
style="display: inline; color: #71d87f" |
|
|
|
v-if="form.stateName == 'Succeeded'" |
|
|
|
> |
|
|
|
执行结果：执行成功 |
|
|
|
</div> |
|
|
|
<div |
|
|
|
style="display: inline; color: #ff5640" |
|
|
|
v-else-if="form.stateName == 'Failed'" |
|
|
|
> |
|
|
|
执行结果：执行失败 |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="模块名称：">{{ |
|
|
|
form.name |
|
|
|
}}</el-form-item> |
|
|
|
<el-form-item label="操作名称：">{{ |
|
|
|
form.actionName |
|
|
|
}}</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="创建人：">{{ |
|
|
|
form.creator |
|
|
|
}}</el-form-item> |
|
|
|
<el-form-item label="创建时间："> |
|
|
|
<el-date-picker |
|
|
|
value-format="yyyy-MM-dd hh:mm:ss" |
|
|
|
format="yyyy-MM-dd hh:mm:ss" |
|
|
|
v-model="form.createdAt" |
|
|
|
type="date" |
|
|
|
class="picker" |
|
|
|
disabled |
|
|
|
></el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form-item |
|
|
|
label="异常信息：" |
|
|
|
style="color: #ff5640" |
|
|
|
v-if="form.stateName == 'Failed'" |
|
|
|
> |
|
|
|
<el-button |
|
|
|
class="result-info__btn--err" |
|
|
|
type="text" |
|
|
|
@click="downloadErrData(form.error)" |
|
|
|
>下载错误数据</el-button |
|
|
|
> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item |
|
|
|
label="生成数据：" |
|
|
|
style="color: #ff5640" |
|
|
|
v-else-if=" |
|
|
|
form.stateName == 'Succeeded' && |
|
|
|
form.actionName == '导出' |
|
|
|
" |
|
|
|
> |
|
|
|
<el-button |
|
|
|
class="result-info__btn--err" |
|
|
|
type="text" |
|
|
|
@click="downloadErrData(form.downFileName)" |
|
|
|
>下载生成数据</el-button |
|
|
|
> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</div> |
|
|
|
</el-card> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</el-tab-pane> |
|
|
|
</el-tabs> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<el-button @click="openView = false">关 闭</el-button> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!--统计功能表单渲染--> |
|
|
|
<el-dialog |
|
|
|
:visible.sync="dialogFormVisible" |
|
|
|
@ -670,6 +556,7 @@ export default { |
|
|
|
taskId: "", |
|
|
|
name: "", |
|
|
|
type: "", |
|
|
|
Sorting: "", |
|
|
|
}, |
|
|
|
page: 1, |
|
|
|
dialogFormVisible: false, |
|
|
|
@ -746,11 +633,11 @@ export default { |
|
|
|
prop: "createdAt", |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "说明", |
|
|
|
prop: "remark", |
|
|
|
width: 220, |
|
|
|
}); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "说明", |
|
|
|
// prop: "remark", |
|
|
|
// width: 220, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "状态", |
|
|
|
// prop: "stateName", |
|
|
|
@ -760,6 +647,60 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
dblhandleCurrentChange(row, column, cell, event) { |
|
|
|
if (column.label === "说明") { |
|
|
|
row.isEditCell = true; |
|
|
|
this.$set(row, "isEditCell", true); |
|
|
|
this.$nextTick(() => { |
|
|
|
//自动获取焦点 element组件autofocus失效 |
|
|
|
//this.$refs.inputRef.focus(); |
|
|
|
this.$refs["inputRef"].focus(); |
|
|
|
}); |
|
|
|
} |
|
|
|
this.list = this.list.filter((item) => { |
|
|
|
return item; |
|
|
|
}); |
|
|
|
}, |
|
|
|
// 可以编辑框失去焦点 |
|
|
|
cellBlur(row, column) { |
|
|
|
row.isEditCell = false; |
|
|
|
this.$set(row, "isEditCell", false); |
|
|
|
}, |
|
|
|
// 在线编辑中提交 |
|
|
|
submitName(row) { |
|
|
|
let getguid = row.id; |
|
|
|
let getremark = row.remark; |
|
|
|
this.$axios |
|
|
|
.gets("/api/settleaccount/Job/updateRemark", { |
|
|
|
p_id: getguid, |
|
|
|
remark: getremark, |
|
|
|
}) |
|
|
|
.then((response) => { |
|
|
|
if (response == true) { |
|
|
|
this.$notify({ |
|
|
|
title: "成功", |
|
|
|
message: "更新成功", |
|
|
|
type: "success", |
|
|
|
duration: 2000, |
|
|
|
}); |
|
|
|
this.getList(); |
|
|
|
} |
|
|
|
}) |
|
|
|
.catch(() => { |
|
|
|
this.listLoading = false; |
|
|
|
}); |
|
|
|
}, |
|
|
|
// 取消 |
|
|
|
handleCancel(row) { |
|
|
|
row.isEditCell = false; |
|
|
|
//row.stockQty = row.originalstockQty; |
|
|
|
this.$set(row, "isEditCell", false); |
|
|
|
// this.$message({ |
|
|
|
// message: "取消后，恢复当前原值！", |
|
|
|
// type: "warning", |
|
|
|
// }); |
|
|
|
this.getList(); |
|
|
|
}, |
|
|
|
handleSelectionChange(val) { |
|
|
|
this.multipleSelection = val; |
|
|
|
}, |
|
|
|
@ -825,8 +766,9 @@ export default { |
|
|
|
this.$axios |
|
|
|
.posts("/api/settleaccount/Job/versionlist", this.listQuery) |
|
|
|
.then((response) => { |
|
|
|
let res = response.reverse(); //降序排列 |
|
|
|
this.JobVersionList = []; |
|
|
|
response.forEach((element) => { |
|
|
|
res.forEach((element, index) => { |
|
|
|
let options = {}; |
|
|
|
options.value = element; |
|
|
|
options.label = element; |
|
|
|
@ -853,11 +795,11 @@ export default { |
|
|
|
}, |
|
|
|
getdateValue(val) { |
|
|
|
this.startTime = val; |
|
|
|
this.getbalanceIndexData(); |
|
|
|
//this.getbalanceIndexData(); |
|
|
|
}, |
|
|
|
getdateVal(val) { |
|
|
|
this.endTime = val; |
|
|
|
this.getbalanceIndexData(); |
|
|
|
//this.getbalanceIndexData(); |
|
|
|
}, |
|
|
|
|
|
|
|
getCurrentMonthFirst() { |
|
|
|
@ -994,9 +936,12 @@ export default { |
|
|
|
}); |
|
|
|
}, |
|
|
|
handleCreate() { |
|
|
|
this.$nextTick(() => { |
|
|
|
// this.$nextTick(() => { |
|
|
|
// this.$refs["formCount"].resetFields(); |
|
|
|
// }); |
|
|
|
if (this.$refs["formCount"] !== undefined) { |
|
|
|
this.$refs["formCount"].resetFields(); |
|
|
|
}); |
|
|
|
} |
|
|
|
this.formTitle = "报表统计"; |
|
|
|
this.isEdit = false; |
|
|
|
this.form = {}; |
|
|
|
@ -1124,6 +1069,10 @@ export default { |
|
|
|
.posts("/api/settleaccount/Job/list", this.listQuery) |
|
|
|
.then((response) => { |
|
|
|
this.list = response; |
|
|
|
//动态加一个是否编辑的标识 |
|
|
|
this.list.forEach((element) => { |
|
|
|
element["isEditCell"] = false; |
|
|
|
}); |
|
|
|
setTimeout(() => { |
|
|
|
//大数据量加载时 |
|
|
|
this.listLoading = false; |
|
|
|
|
44673626
3 years ago