|
|
@@ -399,7 +399,7 @@
|
|
|
<!-- 操作记录 -->
|
|
|
<el-col :span="24" class="title">
|
|
|
{{activeTab == 4?"更新":"操作"}}记录
|
|
|
- <el-button v-if="user.id == moldDetail.managerId && activeTab != 4" size="mini" type="primary" style="float: right;" @click="centerDialog5Visible = true">导出</el-button>
|
|
|
+ <el-button v-if="(user.subordinateType == 0 || user.subordinateType == 1 || user.id == moldDetail.managerId) && activeTab != 4" size="mini" type="primary" style="float: right;" @click="centerDialog5Visible = true">导出</el-button>
|
|
|
</el-col>
|
|
|
<el-table v-if="activeTab != 4" :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;">
|
|
|
<el-table-column type="index" width="40"></el-table-column>
|
|
|
@@ -410,9 +410,16 @@
|
|
|
</el-table>
|
|
|
<el-table v-else :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;">
|
|
|
<el-table-column type="index" width="40"></el-table-column>
|
|
|
- <el-table-column prop="content" label="操作" sortable></el-table-column>
|
|
|
- <el-table-column prop="operatorName" label="操作人" align="center" width="200" sortable></el-table-column>
|
|
|
- <el-table-column prop="indate" label="操作时间" width="400" align="center" sortable></el-table-column>
|
|
|
+ <el-table-column prop="mouldId" label="模具编号" sortable></el-table-column>
|
|
|
+ <el-table-column prop="applicantName" label="申请人" align="center" width="200" sortable></el-table-column>
|
|
|
+ <el-table-column prop="operatorName" label="审批人" align="center" width="200" sortable></el-table-column>
|
|
|
+ <el-table-column prop="isPass" label="状态" width="200" align="center" sortable>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.isPass == 1">已通过</span>
|
|
|
+ <span v-else>未通过</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="indate" label="时间" width="400" align="center" sortable></el-table-column>
|
|
|
</el-table>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -457,7 +464,6 @@
|
|
|
|
|
|
<!-- 批量导出操作记录弹窗 -->
|
|
|
<el-dialog title="批量导出操作记录" v-if="centerDialog5Visible" :visible.sync="centerDialog5Visible" width="450px">
|
|
|
- <!-- <span style="line-height: 40px;">请选择需要导出的时间段：</span> -->
|
|
|
<div style="text-align:center;">
|
|
|
<el-date-picker v-model="recordTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
</div>
|
