|
|
@@ -3,7 +3,7 @@
|
|
|
<!-- newOperations盒子开始-->
|
|
|
<div class="left">
|
|
|
<!-- <h1>我是左边</h1> -->
|
|
|
- <SopLeft v-if="this.activeName == 'first'" @product-line-selected="handleProductLineSelected"/>
|
|
|
+ <SopLeft v-if="this.activeName == 'first'" @product-line-selected="handleProductLineSelected" @work-shop-selected="handleWorkshopSelected"/>
|
|
|
<IsolationLeftVue v-else :points="points" @selection-changed="handleSelectPoint" />
|
|
|
</div>
|
|
|
<div class="right">
|
|
|
@@ -24,21 +24,21 @@
|
|
|
<el-form ref="form" :model="form" label-width="70px">
|
|
|
<el-form-item label="名称" prop="sopName">
|
|
|
<el-input
|
|
|
- v-model="form.SOPId"
|
|
|
+ v-model="form.sopName"
|
|
|
placeholder="请输入SOP名称"
|
|
|
style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="编号" prop="SOPId">
|
|
|
+ <el-form-item label="编号" prop="sopCode">
|
|
|
<el-input
|
|
|
- v-model="form.SOPId"
|
|
|
+ v-model="form.sopCode"
|
|
|
placeholder="请输入SOP编号"
|
|
|
style="width: 100%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="SOP类型" prop="SOPType">
|
|
|
+ <el-form-item label="SOP类型" prop="sopType">
|
|
|
<el-select
|
|
|
- v-model="form.spoint"
|
|
|
+ v-model="form.sopType"
|
|
|
placeholder="请选择SOP类型"
|
|
|
clearable
|
|
|
style="width: 100%"
|
|
|
@@ -51,10 +51,10 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="作业内容" prop="workContent">
|
|
|
+ <el-form-item label="作业内容" prop="sopContent">
|
|
|
<el-input
|
|
|
type="textarea"
|
|
|
- v-model="form.workContent"
|
|
|
+ v-model="form.sopContent"
|
|
|
:rows="5"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -117,7 +117,7 @@
|
|
|
<el-button
|
|
|
style="float: right; height: 30px; line-height: 10px"
|
|
|
type="primary"
|
|
|
- @click="sumbit"
|
|
|
+ @click="submit"
|
|
|
>确 定</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
@@ -147,6 +147,7 @@
|
|
|
<script>
|
|
|
import IsolationLeftVue from "@/components/separationPoint/index.vue";
|
|
|
import SopLeft from "@/components/separationPoint/workshop.vue";
|
|
|
+import {addinsertIsSop} from "@/api/mes/sop/sopindex"
|
|
|
export default {
|
|
|
name: "addView",
|
|
|
components: {
|
|
|
@@ -158,7 +159,7 @@ export default {
|
|
|
activeName: "first",
|
|
|
form: {
|
|
|
sopName: "",
|
|
|
- sopId: "",
|
|
|
+ sopCode: "",
|
|
|
SOPType: "",
|
|
|
workshopName: "", //车间名称
|
|
|
workline: "", //产线
|
|
|
@@ -200,19 +201,41 @@ export default {
|
|
|
// 右侧底部已选隔离点
|
|
|
tableData: [],
|
|
|
points:null,//车间逆向传递拿到的隔离点数据
|
|
|
+ emitWorkShop:null,//车间逆向传递拿到车间相关数据
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
handleClick(tab, event) {
|
|
|
// console.log(tab, event);
|
|
|
},
|
|
|
- preStep() {
|
|
|
+ preStep() {
|
|
|
this.activeName = "first";
|
|
|
},
|
|
|
nextStep() {
|
|
|
this.activeName = "second";
|
|
|
console.log("我点击了下一步");
|
|
|
},
|
|
|
+ // 新增sop确认按钮
|
|
|
+ submit(){
|
|
|
+ const selectedpointIds=this.form.spoint.join(',')
|
|
|
+
|
|
|
+ const data={
|
|
|
+ pointIds:selectedpointIds,
|
|
|
+ sopContent:this.form.sopContent,
|
|
|
+ sopCode:this.form.sopCode,
|
|
|
+ sopName: this.form.sopName,
|
|
|
+ sopType: this.form.sopType,
|
|
|
+ workareaId:this.points.value,
|
|
|
+ workshopId:this.emitWorkShop.value,
|
|
|
+ }
|
|
|
+
|
|
|
+ addinsertIsSop(data).then(res => {
|
|
|
+ console.log(res,'新增接口');
|
|
|
+ if(res.code==200){
|
|
|
+ this.$router.go(-1);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
// 子组件逆向传递选中的隔离点
|
|
|
handleSelectPoint(points) {
|
|
|
console.log(points, "逆向传递选中的隔离点");
|
|
|
@@ -247,7 +270,14 @@ export default {
|
|
|
handleProductLineSelected(selectedOption) {
|
|
|
console.log(selectedOption, '父组件接收到的 selectedOption');
|
|
|
this.points = selectedOption;
|
|
|
+ this.form.workline=selectedOption.label
|
|
|
},
|
|
|
+ // 车间子组件逆传递车间相关数据
|
|
|
+ handleWorkshopSelected(selectedOption){
|
|
|
+ console.log(selectedOption,'handleWorkshopSelected')
|
|
|
+ this.emitWorkShop=selectedOption
|
|
|
+ this.form.workshopName=selectedOption.label
|
|
|
+ }
|
|
|
// methods结束
|
|
|
},
|
|
|
};
|