|
|
@@ -23,11 +23,11 @@
|
|
|
:value="dict.dictValue" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="完成时间" prop="completedTime">
|
|
|
- <el-date-picker clearable size="small" v-model="queryParams.completedTime" type="date" value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择完成时间">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
+<!-- <el-form-item label="完成时间" prop="completedTime">-->
|
|
|
+<!-- <el-date-picker clearable size="small" v-model="queryParams.completedTime" type="date" value-format="yyyy-MM-dd"-->
|
|
|
+<!-- placeholder="选择完成时间">-->
|
|
|
+<!-- </el-date-picker>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
@@ -56,19 +56,30 @@
|
|
|
<span>{{ formatTime(scope.row.createTime) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="终止时间" align="center" prop="terminatedTime" width="180">
|
|
|
+ <el-table-column label="取消日期" align="center" prop="terminatedTime" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.terminatedTime, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="终止原因" align="center" prop="remark" />
|
|
|
+ <el-table-column label="取消原因" align="center" prop="remark" />
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button v-if="scope.row.currentStep == 5 && scope.row.status == 1" size="mini" type="text"
|
|
|
@click="confirmHandle(scope.row)">确认</el-button>
|
|
|
- <el-button size="mini" type="text" icon="el-icon-delete" @click="endProcess(scope.row)"
|
|
|
- v-hasPermi="['qw:collectionSchedule:stop']" :disabled="scope.row.status !== 1"
|
|
|
- :style="{ color: scope.row.status === 1 ? '#f56c6c' : '#999' }">终止</el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ @click="endProcess(scope.row)"
|
|
|
+ v-hasPermi="['qw:collectionSchedule:stop']"
|
|
|
+ :disabled="scope.row.status !== 1"
|
|
|
+ :style="{ color: scope.row.status === 1 ? '#d81e06' : '#999' }">
|
|
|
+ {{
|
|
|
+ scope.row.status === 1 ? '取消' :
|
|
|
+ scope.row.status === 2 ? '已完成' :
|
|
|
+ scope.row.status === 3 ? '已取消' : ''
|
|
|
+ }}
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -79,8 +90,8 @@
|
|
|
<!-- 终止原因弹窗 -->
|
|
|
<el-dialog title="终止进度" :visible.sync="endProcessVisible" width="400px" @close="resetEndForm">
|
|
|
<el-form :model="endForm" ref="endFormRef" label-width="80px">
|
|
|
- <el-form-item label="终止原因" prop="remark" :rules="[{ required: true, message: '请输入终止原因', trigger: 'blur' }]">
|
|
|
- <el-input v-model="endForm.remark" type="textarea" :rows="4" placeholder="请输入终止原因" />
|
|
|
+ <el-form-item label="终止原因" prop="remark" :rules="[{ required: true, message: '请输入取消原因', trigger: 'blur' }]">
|
|
|
+ <el-input v-model="endForm.remark" type="textarea" :rows="4" placeholder="请输入取消原因" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -349,7 +360,8 @@ export default {
|
|
|
const seconds = pad(date.getSeconds());
|
|
|
|
|
|
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
}
|
|
|
};
|
|
|
</script>
|
