工艺逻辑提交

dev-scheduling
zhangdi 3 months ago
parent 34e7c39b88
commit 08cecfcf40
  1. 17
      src/views/processManagement/components/processMainte/partDetails.vue
  2. 22
      src/views/processManagement/components/processMainte/processPlanning.vue

@ -380,7 +380,6 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectStandard" label="检验标准"> <el-table-column prop="projectStandard" label="检验标准">
<template #default="scope"> <template #default="scope">
<el-select <el-select
v-model="scope.row.projectStandard" v-model="scope.row.projectStandard"
placeholder="请选择" placeholder="请选择"
@ -394,10 +393,8 @@
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</template>
</el-table-column>
</template>
</el-table-column>
<el-table-column prop="proHours" label="定额工时(分钟)"> </el-table-column> <el-table-column prop="proHours" label="定额工时(分钟)"> </el-table-column>
<el-table-column prop="prepareHours" label="准备工时(分钟)"></el-table-column> <el-table-column prop="prepareHours" label="准备工时(分钟)"></el-table-column>
</el-table> </el-table>
@ -639,7 +636,7 @@ export default {
versionOptions: [], // versionOptions: [], //
plateList: [], // plateList: [], //
projectOptions: [], projectOptions: [],
standardList:[],// standardList: [], //
}; };
}, },
mounted() { mounted() {
@ -648,7 +645,7 @@ export default {
this.getCcraftInfo(); this.getCcraftInfo();
this.getPartInfo(); this.getPartInfo();
this.getPlatingList(); this.getPlatingList();
this.getStandardList() this.getStandardList();
}, },
methods: { methods: {
getStandardList() { getStandardList() {
@ -767,6 +764,7 @@ export default {
}; };
getPartManagementDetail(query).then(res => { getPartManagementDetail(query).then(res => {
this.formData = res.data.data.dsPartEntity; this.formData = res.data.data.dsPartEntity;
this.dataTable = res.data.data.dsPartEntities;
}); });
} else if (this.detailsType === 'taskProcessing') { } else if (this.detailsType === 'taskProcessing') {
getPartDetail(this.rowData.id).then(res => { getPartDetail(this.rowData.id).then(res => {
@ -865,13 +863,12 @@ export default {
top: -5px; top: -5px;
/* 或者使用 flex: 0 0 200px; 根据需要调整宽度 */ /* 或者使用 flex: 0 0 200px; 根据需要调整宽度 */
} }
.box-card-two{ .box-card-two {
height: calc(100vh - 200px); height: calc(100vh - 200px);
} }
.box-card { .box-card {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
.process-left { .process-left {
// padding: 20px; // padding: 20px;

@ -261,20 +261,21 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="检验项目"> <el-table-column prop="projecCode" label="检验项目">
<template #header> <template #header>
<span><i style="color: red">*</i>检验项目</span> <span><i style="color: red">*</i>检验项目</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item <el-form-item
:prop="`tableData2[${scope.$index}].projectName`" :prop="`tableData2[${scope.$index}].projecCode`"
:rules="formRules2.projectName" :rules="formRules2.projecCode"
> >
<el-select <el-select
v-model="scope.row.projectName" v-model="scope.row.projecCode"
placeholder="请选择" placeholder="请选择"
clearable clearable
filterable filterable
@change="projectChange(scope.row, scope.$index)"
> >
<el-option <el-option
v-for="(item, index) in projectOptions" v-for="(item, index) in projectOptions"
@ -299,6 +300,7 @@
placeholder="请选择" placeholder="请选择"
clearable clearable
filterable filterable
@change="standardChange(scope.row, scope.$index)"
> >
<el-option <el-option
v-for="(item, index) in standardList" v-for="(item, index) in standardList"
@ -599,7 +601,7 @@ export default {
processNo: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }], processNo: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
}, },
formRules2: { formRules2: {
projectName: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], projecCode: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
projectStandard: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }], projectStandard: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
proHours: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }], proHours: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
}, },
@ -628,6 +630,16 @@ export default {
this.getStandardList(); this.getStandardList();
}, },
methods: { methods: {
//
projectChange() {
let selectName = this.projectOptions.find(item => item.id == row.projecCode);
this.form2.tableData2[index].projectName = selectName.name;
},
//
standardChange() {
let selectName = this.standardList.find(item => item.id == row.projectStandard);
this.form2.tableData2[index].projectStandardName = selectName.name;
},
getStandardList() { getStandardList() {
getStandardList().then(res => { getStandardList().then(res => {
this.standardList = res.data.data; this.standardList = res.data.data;

Loading…
Cancel
Save