|
@@ -1,29 +1,6 @@
|
|
<template>
|
|
<template>
|
|
<div class="app-container">
|
|
<div class="app-container">
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
- <!--<el-form-item label="内容表id" prop="subId">-->
|
|
|
|
- <!--<el-input-->
|
|
|
|
- <!--v-model="queryParams.subId"-->
|
|
|
|
- <!--placeholder="请输入内容表id"-->
|
|
|
|
- <!--clearable-->
|
|
|
|
- <!--size="small"-->
|
|
|
|
- <!--@keyup.enter.native="handleQuery"-->
|
|
|
|
- <!--/>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="审批id" prop="approveId">-->
|
|
|
|
- <!--<el-input-->
|
|
|
|
- <!--v-model="queryParams.approveId"-->
|
|
|
|
- <!--placeholder="请输入审批id"-->
|
|
|
|
- <!--clearable-->
|
|
|
|
- <!--size="small"-->
|
|
|
|
- <!--@keyup.enter.native="handleQuery"-->
|
|
|
|
- <!--/>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="类型" prop="torchvocType">-->
|
|
|
|
- <!--<el-select v-model="queryParams.torchvocType" placeholder="请选择类型" clearable size="small">-->
|
|
|
|
- <!--<el-option label="请选择字典生成" value="" />-->
|
|
|
|
- <!--</el-select>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
<el-form-item label="投用步骤内容" prop="content">
|
|
<el-form-item label="投用步骤内容" prop="content">
|
|
<el-input
|
|
<el-input
|
|
v-model="queryParams.content"
|
|
v-model="queryParams.content"
|
|
@@ -42,24 +19,6 @@
|
|
@keyup.enter.native="handleQuery"
|
|
@keyup.enter.native="handleQuery"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="确认人1" prop="confirm1">
|
|
|
|
- <el-input
|
|
|
|
- v-model="queryParams.confirm1"
|
|
|
|
- placeholder="请输入确认人1"
|
|
|
|
- clearable
|
|
|
|
- size="small"
|
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
|
- />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="确认人2" prop="confirm2">
|
|
|
|
- <el-input
|
|
|
|
- v-model="queryParams.confirm2"
|
|
|
|
- placeholder="请输入确认人2"
|
|
|
|
- clearable
|
|
|
|
- size="small"
|
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
|
- />
|
|
|
|
- </el-form-item>
|
|
|
|
<el-form-item label="确认时间" prop="confirmationDate">
|
|
<el-form-item label="确认时间" prop="confirmationDate">
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
v-model="queryParams.confirmationDate"
|
|
v-model="queryParams.confirmationDate"
|
|
@@ -68,58 +27,6 @@
|
|
placeholder="选择确认时间">
|
|
placeholder="选择确认时间">
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <!--<el-form-item label="创建人" prop="createrCode">-->
|
|
|
|
- <!--<el-input-->
|
|
|
|
- <!--v-model="queryParams.createrCode"-->
|
|
|
|
- <!--placeholder="请输入创建人"-->
|
|
|
|
- <!--clearable-->
|
|
|
|
- <!--size="small"-->
|
|
|
|
- <!--@keyup.enter.native="handleQuery"-->
|
|
|
|
- <!--/>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="创建时间" prop="createdate">-->
|
|
|
|
- <!--<el-date-picker clearable size="small" style="width: 200px"-->
|
|
|
|
- <!--v-model="queryParams.createdate"-->
|
|
|
|
- <!--type="date"-->
|
|
|
|
- <!--value-format="yyyy-MM-dd"-->
|
|
|
|
- <!--placeholder="选择创建时间">-->
|
|
|
|
- <!--</el-date-picker>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="修改人" prop="updaterCode">-->
|
|
|
|
- <!--<el-input-->
|
|
|
|
- <!--v-model="queryParams.updaterCode"-->
|
|
|
|
- <!--placeholder="请输入修改人"-->
|
|
|
|
- <!--clearable-->
|
|
|
|
- <!--size="small"-->
|
|
|
|
- <!--@keyup.enter.native="handleQuery"-->
|
|
|
|
- <!--/>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="修改时间" prop="updatedate">-->
|
|
|
|
- <!--<el-date-picker clearable size="small" style="width: 200px"-->
|
|
|
|
- <!--v-model="queryParams.updatedate"-->
|
|
|
|
- <!--type="date"-->
|
|
|
|
- <!--value-format="yyyy-MM-dd"-->
|
|
|
|
- <!--placeholder="选择修改时间">-->
|
|
|
|
- <!--</el-date-picker>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="部门编号" prop="deptId">-->
|
|
|
|
- <!--<el-input-->
|
|
|
|
- <!--v-model="queryParams.deptId"-->
|
|
|
|
- <!--placeholder="请输入部门编号"-->
|
|
|
|
- <!--clearable-->
|
|
|
|
- <!--size="small"-->
|
|
|
|
- <!--@keyup.enter.native="handleQuery"-->
|
|
|
|
- <!--/>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <el-form-item label="备注" prop="remarks">
|
|
|
|
- <el-input
|
|
|
|
- v-model="queryParams.remarks"
|
|
|
|
- placeholder="请输入备注"
|
|
|
|
- clearable
|
|
|
|
- size="small"
|
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
|
- />
|
|
|
|
- </el-form-item>
|
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -228,10 +135,6 @@
|
|
|
|
|
|
<el-table v-loading="loading" :data="torchvocList" @selection-change="handleSelectionChange" :height="clientHeight" border>
|
|
<el-table v-loading="loading" :data="torchvocList" @selection-change="handleSelectionChange" :height="clientHeight" border>
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
- <!--<el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>-->
|
|
|
|
- <!--<el-table-column label="内容表id" align="center" prop="subId" :show-overflow-tooltip="true"/>-->
|
|
|
|
- <!--<el-table-column label="审批id" align="center" prop="approveId" :show-overflow-tooltip="true"/>-->
|
|
|
|
- <!--<el-table-column label="类型" align="center" prop="torchvocType" :show-overflow-tooltip="true"/>-->
|
|
|
|
<el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
|
|
<el-table-column label="审批状态" align="center" prop="approveStatus" width="100">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
|
|
<el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
|
|
@@ -259,24 +162,10 @@
|
|
<span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
|
|
<span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <!--<el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>-->
|
|
|
|
- <!--<el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
|
|
|
|
- <!--<template slot-scope="scope">-->
|
|
|
|
- <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
|
|
|
|
- <!--</template>-->
|
|
|
|
- <!--</el-table-column>-->
|
|
|
|
- <!--<el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>-->
|
|
|
|
- <!--<el-table-column label="修改时间" align="center" prop="updatedate" width="100">-->
|
|
|
|
- <!--<template slot-scope="scope">-->
|
|
|
|
- <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
|
|
|
|
- <!--</template>-->
|
|
|
|
- <!--</el-table-column>-->
|
|
|
|
- <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
|
|
|
|
<el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
|
|
<el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
|
|
<el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
|
|
<el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
|
|
<el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
|
|
<el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
-
|
|
|
|
<el-button
|
|
<el-button
|
|
size="mini"
|
|
size="mini"
|
|
type="text"
|
|
type="text"
|
|
@@ -314,17 +203,6 @@
|
|
<!-- 添加或修改火炬,VOC系统对话框 -->
|
|
<!-- 添加或修改火炬,VOC系统对话框 -->
|
|
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
- <!--<el-form-item label="内容表id" prop="subId">-->
|
|
|
|
- <!--<el-input v-model="form.subId" placeholder="请输入内容表id" />-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="审批id" prop="approveId">-->
|
|
|
|
- <!--<el-input v-model="form.approveId" placeholder="请输入审批id" />-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="类型" prop="torchvocType">-->
|
|
|
|
- <!--<el-select v-model="form.torchvocType" placeholder="请选择类型">-->
|
|
|
|
- <!--<el-option label="请选择字典生成" value="" />-->
|
|
|
|
- <!--</el-select>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
<el-form-item label="投用步骤内容">
|
|
<el-form-item label="投用步骤内容">
|
|
<el-input v-model="form.content" placeholder="请输入投用步骤内容" />
|
|
<el-input v-model="form.content" placeholder="请输入投用步骤内容" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -357,40 +235,9 @@
|
|
placeholder="选择确认时间">
|
|
placeholder="选择确认时间">
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <!--<el-form-item label="删除状态" prop="delFlag">-->
|
|
|
|
- <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="创建人" prop="createrCode">-->
|
|
|
|
- <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="创建时间" prop="createdate">-->
|
|
|
|
- <!--<el-date-picker clearable size="small" style="width: 200px"-->
|
|
|
|
- <!--v-model="form.createdate"-->
|
|
|
|
- <!--type="date"-->
|
|
|
|
- <!--value-format="yyyy-MM-dd"-->
|
|
|
|
- <!--placeholder="选择创建时间">-->
|
|
|
|
- <!--</el-date-picker>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="修改人" prop="updaterCode">-->
|
|
|
|
- <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="修改时间" prop="updatedate">-->
|
|
|
|
- <!--<el-date-picker clearable size="small" style="width: 200px"-->
|
|
|
|
- <!--v-model="form.updatedate"-->
|
|
|
|
- <!--type="date"-->
|
|
|
|
- <!--value-format="yyyy-MM-dd"-->
|
|
|
|
- <!--placeholder="选择修改时间">-->
|
|
|
|
- <!--</el-date-picker>-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
- <!--<el-form-item label="部门编号" prop="deptId">-->
|
|
|
|
- <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
<el-form-item label="备注" prop="remarks">
|
|
<el-form-item label="备注" prop="remarks">
|
|
<el-input v-model="form.remarks" placeholder="请输入备注" />
|
|
<el-input v-model="form.remarks" placeholder="请输入备注" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <!--<el-form-item label="归属部门" prop="deptId">-->
|
|
|
|
- <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
|
|
|
|
- <!--</el-form-item>-->
|
|
|
|
</el-form>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|