工艺问题修改

dev-scheduling
zhangdi 2 months ago
parent ce1d2785cb
commit 9dbeff6cb0
  1. 2
      src/api/processManagement/taskProcessing.js
  2. 25
      src/views/processManagement/components/processMainte/processPlanning.vue
  3. 1
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
  4. 634
      src/views/productionTesting/components/trialItem.vue

@ -184,7 +184,7 @@ export const getModelList = (params) => {
// 工艺模板下拉数据导入 // 工艺模板下拉数据导入
export const getModelDetailList = (params) => { export const getModelDetailList = (params) => {
return request({ return request({
url: '/blade-desk/dsProDetail/getModelDetailList', url: '/blade-desk/dsProModel/detail',
method: 'get', method: 'get',
params: params, params: params,
}); });

@ -123,7 +123,9 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
<el-button type="primary" @click="modelLevelChange()">导入模板</el-button> <el-button type="primary" @click="modelLevelChange()" :loading="modelLevelLoading"
>导入模板</el-button
>
</div> </div>
</div> </div>
<!-- 工序 --> <!-- 工序 -->
@ -162,10 +164,7 @@
<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="`tableData1[${scope.$index}].ppsId`" :rules="formRules1.ppsId">
:prop="`tableData1[${scope.$index}].ppsId`"
:rules="formRules1.ppsId"
>
<el-select <el-select
v-model="scope.row.ppsId" v-model="scope.row.ppsId"
placeholder="请选择" placeholder="请选择"
@ -188,10 +187,7 @@
<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="`tableData1[${scope.$index}].caId`" :rules="formRules1.caId">
:prop="`tableData1[${scope.$index}].caId`"
:rules="formRules1.caId"
>
<el-select <el-select
v-model="scope.row.caId" v-model="scope.row.caId"
placeholder="请选择" placeholder="请选择"
@ -562,6 +558,7 @@ export default {
}, },
data() { data() {
return { return {
modelLevelLoading: false,
craftLoading: false, craftLoading: false,
rank: '2', rank: '2',
processLevel: '2', processLevel: '2',
@ -682,6 +679,7 @@ export default {
projectChange(row, index) { projectChange(row, index) {
let selectName = this.projectOptions.find(item => item.id == row.projectCode); let selectName = this.projectOptions.find(item => item.id == row.projectCode);
this.form2.tableData2[index].projectName = selectName.name; this.form2.tableData2[index].projectName = selectName.name;
this.form2.tableData2[index].proHours = selectName.standardWorkMinute != -1 ? selectName.standardWorkMinute : 0;
}, },
// //
standardChange(row, index) { standardChange(row, index) {
@ -702,7 +700,7 @@ export default {
processChange(row, index) { processChange(row, index) {
let selectName = this.processSetOption.find(item => item.id == row.ppsId); let selectName = this.processSetOption.find(item => item.id == row.ppsId);
this.form1.tableData1[index].processName = selectName.name; this.form1.tableData1[index].processName = selectName.name;
this.form1.tableData1[index].processCode = selectName.code; this.form1.tableData1[index].processCode = selectName.code;
if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) { if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) {
// tsbNum tsdNum // tsbNum tsdNum
let sum_ = 0; let sum_ = 0;
@ -774,6 +772,7 @@ export default {
}, },
// //
modelLevelChange() { modelLevelChange() {
this.modelLevelLoading = true;
getModelDetailList({ modelId: this.modelLevel }).then(res => { getModelDetailList({ modelId: this.modelLevel }).then(res => {
const templateData = res.data.data; const templateData = res.data.data;
const existing = [...this.form1.tableData1]; const existing = [...this.form1.tableData1];
@ -796,6 +795,7 @@ export default {
}); });
// 12 // 12
this.form1.tableData1 = [...existing, ...mappedData]; // this.form1.tableData1 = [...existing, ...mappedData]; //
this.modelLevelLoading = false;
this.$message.success('模板导入成功'); this.$message.success('模板导入成功');
}); });
@ -1352,7 +1352,6 @@ export default {
if (this.activeName == '2') { if (this.activeName == '2') {
this.$refs.tableForm2.validate((isValid, invalidFields) => { this.$refs.tableForm2.validate((isValid, invalidFields) => {
if (isValid) { if (isValid) {
// 🔍 // 🔍
const hasCorrosionTest = this.form2.tableData2.some( const hasCorrosionTest = this.form2.tableData2.some(
item => item =>
@ -1364,11 +1363,11 @@ export default {
); );
// 'HTBY' // 'HTBY'
if ((this.parentData.rawData?.remarks?.includes('HTBY') && !hasCorrosionTest)) { if (this.parentData.rawData?.remarks?.includes('HTBY') && !hasCorrosionTest) {
this.$message.error('备注包含 HTBY 时,检测项目必须包含耐蚀性检测!'); this.$message.error('备注包含 HTBY 时,检测项目必须包含耐蚀性检测!');
return; return;
} }
this.craftLoading = true; this.craftLoading = true;
let query_ = { let query_ = {
processEntity: this.treeNodes.rawData.processInfo, // processEntity: this.treeNodes.rawData.processInfo, //
processProjectEntityList: this.form2.tableData2, // processProjectEntityList: this.form2.tableData2, //

@ -681,6 +681,7 @@ export default {
projectChange(row, index) { projectChange(row, index) {
let selectName = this.projectOptions.find(item => item.id == row.projectCode); let selectName = this.projectOptions.find(item => item.id == row.projectCode);
this.form2.tableData2[index].projectName = selectName.name; this.form2.tableData2[index].projectName = selectName.name;
this.form2.tableData2[index].proHours = selectName.standardWorkMinute != -1 ? selectName.standardWorkMinute : 0;
}, },
// //
standardChange(row, index) { standardChange(row, index) {

@ -1,308 +1,352 @@
<template> <template>
<div> <div>
<avue-crud :height="460" :option="option" v-model:search="search" :table-loading="loading" :data="data" v-model:page="page" :before-open="beforeOpen" <avue-crud
v-model="form" ref="crud" @row-update="rowUpdate" :height="460"
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" :option="option"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"> v-model:search="search"
<template #menu-left> :table-loading="loading"
<el-button type="primary" @click="handleAdd"> </el-button> :data="data"
<!-- <el-button type="primary" @click="handleSet">批量设置分类</el-button> --> v-model:page="page"
:before-open="beforeOpen"
v-model="form"
ref="crud"
@row-update="rowUpdate"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left>
<el-button type="primary" @click="handleAdd"> </el-button>
<!-- <el-button type="primary" @click="handleSet">批量设置分类</el-button> -->
</template>
<template #menu="scope">
<el-button type="text" @click="handleEdit(scope.row, scope.$index)">修改</el-button>
<el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
</template>
</avue-crud>
<el-dialog title="项目" append-to-body v-model="showDialog" width="60%">
<div>
<el-button type="primary" @click="insertEvent()">插入一行</el-button>
<el-button plain type="danger" @click="remove">删除选择行</el-button>
<!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
</div>
<div style="margin-top: 20px">
<el-table :data="tidList" @selection-change="selectionChangeProject" @select="selectChange">
<el-table-column type="selection" width="55px"></el-table-column>
<el-table-column label="编码" prop="code">
<template #default="scope">
<el-input v-model="scope.row.code"></el-input>
</template> </template>
<template #menu="scope"> </el-table-column>
<el-button type="text" @click="handleEdit(scope.row,scope.$index)">修改</el-button> <el-table-column label="名称" prop="name">
<el-button type="text" @click="handleDelete(scope.row)">删除</el-button> <template #default="scope">
<el-input v-model="scope.row.name"></el-input>
</template> </template>
</avue-crud> </el-table-column>
<el-dialog title="项目" append-to-body v-model="showDialog" width="60%"> <el-table-column label="定额工时" prop="standardWorkMinute">
<div> <template #default="scope">
<el-button type="primary" @click="insertEvent()">插入一行</el-button> <el-input v-model="scope.row.standardWorkMinute"></el-input>
<el-button plain type="danger" @click="remove">删除选择行</el-button> </template>
<!-- <el-button type="primary" @click="handleSave">保存</el-button> --> </el-table-column>
</div> <el-table-column label="类型" prop="itemType">
<div style="margin-top: 20px;"> <template #default="scope">
<el-table :data="tidList" @selection-change="selectionChangeProject" @select="selectChange"> <el-select v-model="scope.row.itemType" placeholder="请选择" style="width: 240px">
<el-table-column type="selection" width="55px"></el-table-column> <el-option
<el-table-column label="编码" prop="code"> v-for="item in typeList"
<template #default="scope"> :key="item.id"
<el-input v-model="scope.row.code"></el-input> :label="item.dictValue"
</template> :value="item.dictKey"
</el-table-column> />
<el-table-column label="名称" prop="name"> </el-select>
<template #default="scope"> </template>
<el-input v-model="scope.row.name"></el-input> </el-table-column>
</template> </el-table>
</el-table-column> </div>
<el-table-column label="类型" prop="itemType"> <template #footer>
<template #default="scope"> <span class="dialog-footer">
<el-select v-model="scope.row.itemType" placeholder="请选择" style="width: 240px"> <el-button @click="showDialog = false"> </el-button>
<el-option <el-button type="primary" @click="handleSave"> </el-button>
v-for="item in typeList" </span>
:key="item.id" </template>
:label="item.dictValue" </el-dialog>
:value="item.dictKey" </div>
/>
</el-select>
</template>
</el-table-column>
</el-table>
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="showDialog = false"> </el-button>
<el-button type="primary" @click="handleSave"> </el-button>
</span>
</template>
</el-dialog>
</div>
</template> </template>
<script> <script>
import {getList,getType,addItem,getDetail,deleteItem,editItem} from '@/api/productionInspection/trialItem' import {
getList,
getType,
addItem,
getDetail,
deleteItem,
editItem,
} from '@/api/productionInspection/trialItem';
export default { export default {
data() { data() {
return { return {
loading: false, loading: false,
data: [], data: [],
form: {}, form: {},
showDialog: false, showDialog: false,
tidList: [], tidList: [],
rowId: null, //id rowId: null, //id
projectArr: [], projectArr: [],
deleteTidArr: [], // deleteTidArr: [], //
page: { page: {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
search:{}, search: {},
option: { option: {
tip: false, tip: false,
align: 'center', align: 'center',
height: 'auto', height: 'auto',
searchLabelWidth: 120, searchLabelWidth: 120,
simplePage: true, simplePage: true,
searchShow: true, searchShow: true,
searchMenuSpan: 6, searchMenuSpan: 6,
searchIcon: true, searchIcon: true,
searchIndex: 3, searchIndex: 3,
tree: false, tree: false,
border: true, border: true,
selection: false, selection: false,
viewBtn: false, viewBtn: false,
editBtn: false, editBtn: false,
addBtn: false, addBtn: false,
delBtn: false, delBtn: false,
editBtnText: '修改', editBtnText: '修改',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 120, menuWidth: 120,
dialogWidth: 800, dialogWidth: 800,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
excelBtn: false, excelBtn: false,
filterBtn: true, filterBtn: true,
searchShowBtn: false, searchShowBtn: false,
excelBtn: true, excelBtn: true,
index: true, index: true,
showOverflowTooltip: true, showOverflowTooltip: true,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'left',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
addBtnIcon: ' ', addBtnIcon: ' ',
viewBtnIcon: ' ', viewBtnIcon: ' ',
delBtnIcon: ' ', delBtnIcon: ' ',
editBtnIcon: ' ', editBtnIcon: ' ',
column: [ column: [
{ {
label: '编码', label: '编码',
prop: 'code', prop: 'code',
addDisplay: false, addDisplay: false,
// editDisplay: false, // editDisplay: false,
span: 24, span: 24,
search: true, search: true,
searchLabelWidth:50, searchLabelWidth: 50,
rules: [ rules: [
{ {
required: true, required: true,
message: '请输入编码', message: '请输入编码',
trigger: 'click', trigger: 'click',
}, },
], ],
}, },
{ {
label: '名称', label: '名称',
prop: 'name', prop: 'name',
addDisplay: false, addDisplay: false,
// editDisplay: false, // editDisplay: false,
span: 24, span: 24,
search: true, search: true,
searchLabelWidth:50, searchLabelWidth: 50,
rules: [ rules: [
{ {
required: true, required: true,
message: '请输入名称', message: '请输入名称',
trigger: 'click', trigger: 'click',
}, },
], ],
}, },
{ {
label: '类型', label: '类型',
prop: 'itemType', prop: 'itemType',
span: 24, span: 24,
search: true, search: true,
searchLabelWidth:50, searchLabelWidth: 50,
type:"select", type: 'select',
dicUrl:'/blade-system/dict/dictionary?code=InspectionItem-ItemType', dicUrl: '/blade-system/dict/dictionary?code=InspectionItem-ItemType',
props: { label: 'dictValue', value: 'dictKey' }, props: { label: 'dictValue', value: 'dictKey' },
// dicData:[ // dicData:[
// { // {
// label:'', // label:'',
// value:1 // value:1
// }, // },
// { // {
// label:'', // label:'',
// value:2 // value:2
// }, // },
// ], // ],
rules: [ rules: [
{ {
required: true, required: true,
message: '请输入名称', message: '请输入名称',
trigger: 'click', trigger: 'click',
}, },
], ],
}, },
] {
}, label: '额定工时',
typeList:[] prop: 'standardWorkMinute',
addDisplay: false,
// editDisplay: false,
span: 24,
search: true,
searchLabelWidth: 50,
rules: [
{
required: true,
message: '请输入名称',
trigger: 'click',
},
],
},
],
},
typeList: [],
};
},
mounted() {
this.getTypeList();
},
methods: {
getTypeList() {
getType().then(res => {
this.typeList = res.data.data;
});
},
handleAdd() {
this.showDialog = true;
this.tidList = [];
},
insertEvent() {
const record = { _select: false };
this.tidList.push(record);
},
searchChange(params, done) {
this.page.currentPage = 1;
this.onLoad();
done();
},
searchReset() {
this.page.currentPage = 1;
this.search = {};
this.onLoad();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad();
},
remove() {
let arr = this.tidList.filter(item => item._select);
if (arr.length != 0) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
if (this.rowId) {
let deleteData = this.tidList.filter(item => item._select);
this.deleteTidArr = deleteData.filter(item => item.tidId);
}
let deleteArr = this.tidList.filter(item => !item._select);
this.tidList = deleteArr;
});
} else {
this.$message.error('请至少选择一条数据进行操作!');
}
},
selectChange(list, row) {
row._select = !row._select;
},
handleEdit(row, index) {
getDetail({ id: row.id }).then(res => {
res.data.data.itemType = res.data.data.itemType + '';
this.$refs.crud.rowEdit(res.data.data, index);
});
},
rowUpdate(form, index, done, loading) {
editItem(form).then(res => {
if (res.data.code == 200) {
this.$message.success('修改成功');
this.onLoad();
done();
} }
});
}, },
mounted() { handleSave() {
this.getTypeList() if (this.tidList.length == 0) {
this.$message.error('请至少填写一条数据');
} else {
let tmp = this.tidList.find(item => !item.code || !item.name || !item.itemType);
if (tmp) {
this.$message.error('数据请填写完整!');
} else {
addItem(this.tidList).then(res => {
if (res.data.code == 200) {
this.$message.success('新增成功');
this.showDialog = false;
this.onLoad();
}
});
}
}
}, },
methods: { handleDelete(row) {
getTypeList(){ this.$confirm('确定将选择数据删除?', {
getType().then(res =>{ confirmButtonText: '确定',
this.typeList = res.data.data cancelButtonText: '取消',
}) type: 'warning',
}, }).then(() => {
handleAdd() { deleteItem({ ids: row.id }).then(res => {
this.showDialog = true if (res.data.code == 200) {
this.tidList = [] this.$message.success('删除成功');
},
insertEvent() {
const record = { _select: false };
this.tidList.push(record)
},
searchChange(params, done){
this.page.currentPage = 1;
this.onLoad();
done();
},
searchReset(){
this.page.currentPage = 1
this.search = {}
this.onLoad()
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(); this.onLoad();
}, }
remove() { });
let arr = this.tidList.filter(item => item._select) });
if (arr.length != 0) { },
this.$confirm('确定将选择数据删除?', { onLoad() {
confirmButtonText: '确定', this.loading = true;
cancelButtonText: '取消', getList({ current: this.page.currentPage, size: this.page.pageSize, ...this.search }).then(
type: 'warning', res => {
}).then(() => { this.data = res.data.data.records;
if (this.rowId) { this.page.total = res.data.data.total;
let deleteData = this.tidList.filter(item => item._select) this.loading = false;
this.deleteTidArr = deleteData.filter(item => item.tidId) }
} );
let deleteArr = this.tidList.filter(item => !item._select) // this.data = [
this.tidList = deleteArr // { amId: 3, code: '003', name: '' },
}) // { amId: 4, code: '002', name: '' },
} else { // { amId: 5, code: '001', name: '' },
this.$message.error('请至少选择一条数据进行操作!') // ]
} // this.loading = false
}, },
selectChange(list, row) { },
row._select = !row._select };
},
handleEdit(row,index) {
getDetail({id:row.id}).then(res =>{
res.data.data.itemType = res.data.data.itemType + ''
this.$refs.crud.rowEdit(res.data.data, index)
})
},
rowUpdate(form, index, done, loading){
editItem(form).then(res =>{
if(res.data.code == 200){
this.$message.success('修改成功')
this.onLoad()
done()
}
})
},
handleSave() {
if (this.tidList.length == 0) {
this.$message.error('请至少填写一条数据')
} else {
let tmp = this.tidList.find(item => !item.code || !item.name || !item.itemType)
if (tmp) {
this.$message.error('数据请填写完整!')
}else{
addItem(this.tidList).then(res =>{
if(res.data.code == 200){
this.$message.success('新增成功')
this.showDialog = false
this.onLoad()
}
})
}
}
},
handleDelete(row){
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
deleteItem({ids:row.id}).then(res =>{
if(res.data.code == 200){
this.$message.success('删除成功')
this.onLoad()
}
})
})
},
onLoad() {
this.loading = true
getList({current:this.page.currentPage,size:this.page.pageSize,...this.search}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
this.loading = false
})
// this.data = [
// { amId: 3, code: '003', name: '' },
// { amId: 4, code: '002', name: '' },
// { amId: 5, code: '001', name: '' },
// ]
// this.loading = false
},
}
}
</script> </script>
<style></style> <style></style>

Loading…
Cancel
Save