|
|
@@ -135,7 +135,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="计划名称" align="center" prop="planName">
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="巡检物资柜" align="center" prop="cabinetName">
|
|
|
+ <el-table-column label="物资柜" align="center" prop="cabinetName">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tooltip :content="scope.row.cabinetName" placement="top">
|
|
|
<span style="color:#1890ff;cursor: pointer" @click="PlanDetail(scope.row)">{{ getDisplayText(scope.row.cabinetName) }}</span>
|
|
|
@@ -211,23 +211,12 @@
|
|
|
<el-form-item label="计划名称" prop="planName">
|
|
|
<el-input v-model="form.planName" placeholder="请输入计划名称"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="计划日期" prop="planDate">
|
|
|
- <el-date-picker
|
|
|
- style="width: 350px"
|
|
|
- v-model="form.planDate"
|
|
|
- placeholder="请选择日期"
|
|
|
- :picker-options="FormpickerOptions"
|
|
|
- align="right"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="所属区域" prop="workstationId">
|
|
|
<treeselect style="width: 348px" v-model="form.workstationId" :options="workstationOption"
|
|
|
- :normalizer="normalizer" placeholder="选择所属区域"
|
|
|
+ :normalizer="normalizer" placeholder="选择所属区域"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="检查物资柜" prop="cabinetIds">
|
|
|
-
|
|
|
+ <el-form-item label="物资柜" prop="cabinetIds">
|
|
|
<el-select
|
|
|
:disabled="visibleSelect"
|
|
|
style="width: 348px"
|
|
|
@@ -244,6 +233,18 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="计划日期" prop="planDate">
|
|
|
+ <el-date-picker
|
|
|
+ style="width: 350px"
|
|
|
+ v-model="form.planDate"
|
|
|
+ placeholder="请选择日期"
|
|
|
+ :picker-options="FormpickerOptions"
|
|
|
+ align="right"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+
|
|
|
<el-form-item label="检察员" prop="checkUserId">
|
|
|
<el-select
|
|
|
style="width: 348px"
|
|
|
@@ -820,7 +821,7 @@ export default {
|
|
|
handleDelete(row) {
|
|
|
const checkIds = row.planId || this.ids
|
|
|
this.$modal
|
|
|
- .confirm('是否确认删除编号为"' + checkIds + '"的数据项?')
|
|
|
+ .confirm('是否确认删除所选数据项?')
|
|
|
.then(function() {
|
|
|
return deletePlan(checkIds)
|
|
|
})
|