|
@@ -86,14 +86,15 @@
|
|
<el-table-column label="安全分级" align="center" prop="levelName" width="130"/>
|
|
<el-table-column label="安全分级" align="center" prop="levelName" width="130"/>
|
|
<el-table-column label="学院" align="center" prop="deptName" width="130" show-overflow-tooltip/>
|
|
<el-table-column label="学院" align="center" prop="deptName" width="130" show-overflow-tooltip/>
|
|
<el-table-column label="执行周期" align="center" prop="cycle" width="149"/>
|
|
<el-table-column label="执行周期" align="center" prop="cycle" width="149"/>
|
|
- <!--<el-table-column label="执行人身份" align="center" prop="userPosition" />-->
|
|
|
|
<el-table-column label="状态" align="center" prop="status"width="149">
|
|
<el-table-column label="状态" align="center" prop="status"width="149">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span :class="scope.row.status==2?'tableTypeColorA':''">{{scope.row.status==0?'未执行':(scope.row.status==2?'已执行':'')}}</span>
|
|
<span :class="scope.row.status==2?'tableTypeColorA':''">{{scope.row.status==0?'未执行':(scope.row.status==2?'已执行':'')}}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="执行时间" align="center" prop="carryTime" width="130">
|
|
|
|
- <template slot-scope="scope">{{scope.row.carryTime?scope.row.carryTime:'-'}}</template>
|
|
|
|
|
|
+ <el-table-column label="执行时间" align="center" prop="carryTime" width="150">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span>{{ parseTime(scope.row.carryTime,"{y}-{m}-{d} {h}:{i}") }}</span>
|
|
|
|
+ </template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" v-if="tableButtonType">
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" v-if="tableButtonType">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
@@ -118,56 +119,13 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<info-page v-if="pageType == 2" :recordId="recordId"></info-page>
|
|
<info-page v-if="pageType == 2" :recordId="recordId"></info-page>
|
|
- <!-- 添加或修改管控执行记录对话框 -->
|
|
|
|
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
|
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
|
- <el-form-item label="备注" prop="remark">
|
|
|
|
- <el-input v-model="form.remark" placeholder="请输入备注" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="规则ID" prop="ruleId">
|
|
|
|
- <el-input v-model="form.ruleId" placeholder="请输入规则ID" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="规则名称" prop="ruleName">
|
|
|
|
- <el-input v-model="form.ruleName" placeholder="请输入规则名称" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="实验室ID" prop="subId">
|
|
|
|
- <el-input v-model="form.subId" placeholder="请输入实验室ID" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="执行用户ID" prop="joinUserId">
|
|
|
|
- <el-input v-model="form.joinUserId" placeholder="请输入执行用户ID" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="执行人身份" prop="userPosition">
|
|
|
|
- <el-input v-model="form.userPosition" placeholder="请输入执行人身份" />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="执行状态">
|
|
|
|
- <el-radio-group v-model="form.status">
|
|
|
|
- <el-radio label="1">请选择字典生成</el-radio>
|
|
|
|
- </el-radio-group>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="执行时间" prop="carryTime">
|
|
|
|
- <el-date-picker clearable size="small"
|
|
|
|
- v-model="form.carryTime"
|
|
|
|
- type="date"
|
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
|
- placeholder="选择执行时间">
|
|
|
|
- </el-date-picker>
|
|
|
|
- </el-form-item>
|
|
|
|
- </el-form>
|
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
|
- <el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
|
- <el-button @click="cancel">取 消</el-button>
|
|
|
|
- </div>
|
|
|
|
- </el-dialog>
|
|
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import {
|
|
import {
|
|
- listGradeManageRecord,
|
|
|
|
- getGradeManageRecord, delGradeManageRecord,
|
|
|
|
- addGradeManageRecord, updateGradeManageRecord,
|
|
|
|
- queryOption,gradeManageWorkInfo
|
|
|
|
-} from "@/api/hierarchicalControl/indexDemo";
|
|
|
|
|
|
+ laboratoryGradeManageRecordList
|
|
|
|
+} from "@/api/hierarchicalControl/index";
|
|
import {
|
|
import {
|
|
getDeptDropList,
|
|
getDeptDropList,
|
|
laboratoryClassLevelGetList,
|
|
laboratoryClassLevelGetList,
|
|
@@ -219,7 +177,6 @@ export default {
|
|
recordId:"",
|
|
recordId:"",
|
|
//学院列表
|
|
//学院列表
|
|
deptIdOptionList:[],
|
|
deptIdOptionList:[],
|
|
- labMoldList:[],
|
|
|
|
levelOptionList:[],
|
|
levelOptionList:[],
|
|
typeOptionList:[],
|
|
typeOptionList:[],
|
|
cycleList:['一天','一周','一月','季度','半年','一年'],
|
|
cycleList:['一天','一周','一月','季度','半年','一年'],
|
|
@@ -232,16 +189,8 @@ export default {
|
|
this.getDeptDropList();
|
|
this.getDeptDropList();
|
|
this.laboratoryClassLevelGetList();
|
|
this.laboratoryClassLevelGetList();
|
|
this.laboratoryClassTypeGetList();
|
|
this.laboratoryClassTypeGetList();
|
|
- this.queryOption();
|
|
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- queryOption(){
|
|
|
|
- queryOption({}).then(response=>{
|
|
|
|
- if(response.code==200){
|
|
|
|
- this.$set(this,'labMoldList',response.data);
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
//查询安全分级
|
|
//查询安全分级
|
|
laboratoryClassLevelGetList(){
|
|
laboratoryClassLevelGetList(){
|
|
laboratoryClassLevelGetList({}).then(response=>{
|
|
laboratoryClassLevelGetList({}).then(response=>{
|
|
@@ -263,14 +212,8 @@ export default {
|
|
if(type == 1){
|
|
if(type == 1){
|
|
this.pageType = 1;
|
|
this.pageType = 1;
|
|
}else if(type == 2){
|
|
}else if(type == 2){
|
|
- gradeManageWorkInfo(row.id).then( response => {
|
|
|
|
- if (response.code == 504){
|
|
|
|
- this.msgError(response.msg);
|
|
|
|
- }else if (response.code == 200){
|
|
|
|
- this.recordId = row.id;
|
|
|
|
- this.pageType = 2;
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ this.recordId = row.id;
|
|
|
|
+ this.pageType = 2;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -284,9 +227,9 @@ export default {
|
|
this.queryParams.endTime = null
|
|
this.queryParams.endTime = null
|
|
}
|
|
}
|
|
this.loading = true;
|
|
this.loading = true;
|
|
- listGradeManageRecord(this.queryParams).then( response => {
|
|
|
|
- this.gradeManageRecordList = response.rows;
|
|
|
|
- this.total = response.total;
|
|
|
|
|
|
+ laboratoryGradeManageRecordList(this.queryParams).then( response => {
|
|
|
|
+ this.$set(this,'gradeManageRecordList',response.data.records);
|
|
|
|
+ this.$set(this,'total',response.data.total);
|
|
this.loading = false;
|
|
this.loading = false;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -343,62 +286,6 @@ export default {
|
|
});
|
|
});
|
|
this.handleQuery();
|
|
this.handleQuery();
|
|
},
|
|
},
|
|
- /** 新增按钮操作 */
|
|
|
|
- handleAdd() {
|
|
|
|
- this.reset();
|
|
|
|
- this.open = true;
|
|
|
|
- this.title = "添加管控执行记录";
|
|
|
|
- },
|
|
|
|
- /** 修改按钮操作 */
|
|
|
|
- handleUpdate(row) {
|
|
|
|
- this.reset();
|
|
|
|
- const id = row.id || this.ids
|
|
|
|
- getGradeManageRecord(id).then( response => {
|
|
|
|
- this.form = response.data;
|
|
|
|
- this.open = true;
|
|
|
|
- this.title = "修改管控执行记录";
|
|
|
|
- });
|
|
|
|
- },
|
|
|
|
- /** 提交按钮 */
|
|
|
|
- submitForm() {
|
|
|
|
- this.$refs["form"].validate(valid => {
|
|
|
|
- if (valid) {
|
|
|
|
- if (this.form.id != null) {
|
|
|
|
- updateGradeManageRecord(this.form).then( response => {
|
|
|
|
- this.msgSuccess("修改成功");
|
|
|
|
- this.open = false;
|
|
|
|
- this.getList();
|
|
|
|
- });
|
|
|
|
- } else {
|
|
|
|
- addGradeManageRecord(this.form).then( response => {
|
|
|
|
- this.msgSuccess("新增成功");
|
|
|
|
- this.open = false;
|
|
|
|
- this.getList();
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- },
|
|
|
|
- /** 删除按钮操作 */
|
|
|
|
- handleDelete(row) {
|
|
|
|
- const ids = row.id || this.ids;
|
|
|
|
- this.$confirm('是否确认删除管控执行记录编号为"' + ids + '"的数据项?', "警告", {
|
|
|
|
- confirmButtonText: "确定",
|
|
|
|
- cancelButtonText: "取消",
|
|
|
|
- type: "warning"
|
|
|
|
- }).then(function() {
|
|
|
|
- return delGradeManageRecord(ids);
|
|
|
|
- }).then(() => {
|
|
|
|
- this.getList();
|
|
|
|
- this.msgSuccess("删除成功");
|
|
|
|
- }).catch(() => {});
|
|
|
|
- },
|
|
|
|
- /** 导出按钮操作 */
|
|
|
|
- handleExport() {
|
|
|
|
- this.download('laboratory/gradeManageRecord/export', {
|
|
|
|
- ...this.queryParams
|
|
|
|
- }, `laboratory_gradeManageRecord.xlsx`)
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|