|
|
@@ -102,7 +102,7 @@
|
|
|
label="SOP名称"
|
|
|
width="360"
|
|
|
></el-table-column>
|
|
|
- <el-table-column prop="sopType" label="SOP类型" >
|
|
|
+ <el-table-column prop="sopType" label="SOP类型">
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag :options="dict.type.sop_type" :value="scope.row.sopType" />
|
|
|
</template>
|
|
|
@@ -195,7 +195,20 @@
|
|
|
<!-- </el-form-item>-->
|
|
|
<!-- </el-col>-->
|
|
|
<!-- </el-row>-->
|
|
|
-
|
|
|
+ <el-form-item label="SOP类型" prop="sopType">
|
|
|
+ <el-select
|
|
|
+ v-model="form.sopType"
|
|
|
+ placeholder="请选择SOP类型"
|
|
|
+ clearable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sop_type"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="所属岗位" prop="workstationId">
|
|
|
<treeselect
|
|
|
v-model="form.workstationId"
|
|
|
@@ -227,21 +240,6 @@
|
|
|
placeholder="选择设备/工艺"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
- <el-form-item label="SOP类型" prop="sopType">
|
|
|
- <el-select
|
|
|
- v-model="form.sopType"
|
|
|
- placeholder="请选择SOP类型"
|
|
|
- clearable
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sop_type"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button v-no-more-click type="primary" @click="submitForm"
|
|
|
@@ -546,7 +544,7 @@ export default {
|
|
|
handleAdd(row) {
|
|
|
this.reset();
|
|
|
this.open = true;
|
|
|
- this.title = "添加SOP";
|
|
|
+ this.title = "新增SOP";
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
@@ -583,9 +581,10 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
/** 删除按钮操作 */
|
|
|
+ // confirm('是否确认删除名称为"' + row.sopName + '"的数据项?')
|
|
|
handleDelete(row) {
|
|
|
this.$modal
|
|
|
- .confirm('是否确认删除名称为"' + row.sopName + '"的数据项?')
|
|
|
+ .confirm("是否确认删除所选数据项?")
|
|
|
.then(function () {
|
|
|
return deleteIsMarsSopByMarsSopIds(row.sopId);
|
|
|
})
|