suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工艺问题修改

Browse Source
dev-scheduling
zhangdi 3 months ago
parent ce1d2785cb
commit 9dbeff6cb0
4 changed files with 353 additions and 309 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/api/processManagement/taskProcessing.js
  2. 21
      src/views/processManagement/components/processMainte/processPlanning.vue
  3. 1
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
  4. 194
      src/views/productionTesting/components/trialItem.vue

2
src/api/processManagement/taskProcessing.js
Unescape View File

@ -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,
}); });

21
src/views/processManagement/components/processMainte/processPlanning.vue
Unescape View File

@ -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) {
@ -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 {
}); });
// 赋值（方式1）或追加（方式2） // 赋值（方式1）或追加（方式2）
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,7 +1363,7 @@ 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;
} }

1
src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
Unescape View File

@ -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) {

194
src/views/productionTesting/components/trialItem.vue
Unescape View File

@ -1,15 +1,30 @@
<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"
:table-loading="loading"
:data="data"
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> <template #menu-left>
<el-button type="primary" @click="handleAdd">新 增</el-button> <el-button type="primary" @click="handleAdd">新 增</el-button>
<!-- <el-button type="primary" @click="handleSet">批量设置分类</el-button> --> <!-- <el-button type="primary" @click="handleSet">批量设置分类</el-button> -->
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="handleEdit(scope.row,scope.$index)">修改</el-button> <el-button type="text" @click="handleEdit(scope.row, scope.$index)">修改</el-button>
<el-button type="text" @click="handleDelete(scope.row)">删除</el-button> <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</avue-crud> </avue-crud>
@ -19,7 +34,7 @@
<el-button plain type="danger" @click="remove">删除选择行</el-button> <el-button plain type="danger" @click="remove">删除选择行</el-button>
<!-- <el-button type="primary" @click="handleSave">保存</el-button> --> <!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
</div> </div>
<div style="margin-top: 20px;"> <div style="margin-top: 20px">
<el-table :data="tidList" @selection-change="selectionChangeProject" @select="selectChange"> <el-table :data="tidList" @selection-change="selectionChangeProject" @select="selectChange">
<el-table-column type="selection" width="55px"></el-table-column> <el-table-column type="selection" width="55px"></el-table-column>
<el-table-column label="编码" prop="code"> <el-table-column label="编码" prop="code">
@ -32,6 +47,11 @@
<el-input v-model="scope.row.name"></el-input> <el-input v-model="scope.row.name"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="定额工时" prop="standardWorkMinute">
<template #default="scope">
<el-input v-model="scope.row.standardWorkMinute"></el-input>
</template>
</el-table-column>
<el-table-column label="类型" prop="itemType"> <el-table-column label="类型" prop="itemType">
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.itemType" placeholder="请选择" style="width: 240px"> <el-select v-model="scope.row.itemType" placeholder="请选择" style="width: 240px">
@ -57,7 +77,14 @@
</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 {
@ -74,7 +101,7 @@ export default {
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
search:{}, search: {},
option: { option: {
tip: false, tip: false,
align: 'center', align: 'center',
@ -123,7 +150,7 @@ export default {
// editDisplay: false, // editDisplay: false,
span: 24, span: 24,
search: true, search: true,
searchLabelWidth:50, searchLabelWidth: 50,
rules: [ rules: [
{ {
required: true, required: true,
@ -140,7 +167,7 @@ export default {
// editDisplay: false, // editDisplay: false,
span: 24, span: 24,
search: true, search: true,
searchLabelWidth:50, searchLabelWidth: 50,
rules: [ rules: [
{ {
required: true, required: true,
@ -154,9 +181,9 @@ export default {
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:[
// { // {
@ -176,37 +203,53 @@ export default {
}, },
], ],
}, },
] {
label: '额定工时',
prop: 'standardWorkMinute',
addDisplay: false,
// editDisplay: false,
span: 24,
search: true,
searchLabelWidth: 50,
rules: [
{
required: true,
message: '请输入名称',
trigger: 'click',
}, },
typeList:[] ],
} },
],
},
typeList: [],
};
}, },
mounted() { mounted() {
this.getTypeList() this.getTypeList();
}, },
methods: { methods: {
getTypeList(){ getTypeList() {
getType().then(res =>{ getType().then(res => {
this.typeList = res.data.data this.typeList = res.data.data;
}) });
}, },
handleAdd() { handleAdd() {
this.showDialog = true this.showDialog = true;
this.tidList = [] this.tidList = [];
}, },
insertEvent() { insertEvent() {
const record = { _select: false }; const record = { _select: false };
this.tidList.push(record) this.tidList.push(record);
}, },
searchChange(params, done){ searchChange(params, done) {
this.page.currentPage = 1; this.page.currentPage = 1;
this.onLoad(); this.onLoad();
done(); done();
}, },
searchReset(){ searchReset() {
this.page.currentPage = 1 this.page.currentPage = 1;
this.search = {} this.search = {};
this.onLoad() this.onLoad();
}, },
currentChange(currentPage) { currentChange(currentPage) {
this.page.currentPage = currentPage; this.page.currentPage = currentPage;
@ -218,7 +261,7 @@ export default {
this.onLoad(); this.onLoad();
}, },
remove() { remove() {
let arr = this.tidList.filter(item => item._select) let arr = this.tidList.filter(item => item._select);
if (arr.length != 0) { if (arr.length != 0) {
this.$confirm('确定将选择数据删除?', { this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -226,74 +269,75 @@ export default {
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
if (this.rowId) { if (this.rowId) {
let deleteData = this.tidList.filter(item => item._select) let deleteData = this.tidList.filter(item => item._select);
this.deleteTidArr = deleteData.filter(item => item.tidId) this.deleteTidArr = deleteData.filter(item => item.tidId);
} }
let deleteArr = this.tidList.filter(item => !item._select) let deleteArr = this.tidList.filter(item => !item._select);
this.tidList = deleteArr this.tidList = deleteArr;
}) });
} else { } else {
this.$message.error('请至少选择一条数据进行操作！') this.$message.error('请至少选择一条数据进行操作！');
} }
}, },
selectChange(list, row) { selectChange(list, row) {
row._select = !row._select row._select = !row._select;
}, },
handleEdit(row,index) { handleEdit(row, index) {
getDetail({id:row.id}).then(res =>{ getDetail({ id: row.id }).then(res => {
res.data.data.itemType = res.data.data.itemType + '' res.data.data.itemType = res.data.data.itemType + '';
this.$refs.crud.rowEdit(res.data.data, index) this.$refs.crud.rowEdit(res.data.data, index);
}) });
}, },
rowUpdate(form, index, done, loading){ rowUpdate(form, index, done, loading) {
editItem(form).then(res =>{ editItem(form).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success('修改成功') this.$message.success('修改成功');
this.onLoad() this.onLoad();
done() done();
} }
}) });
}, },
handleSave() { handleSave() {
if (this.tidList.length == 0) { if (this.tidList.length == 0) {
this.$message.error('请至少填写一条数据') this.$message.error('请至少填写一条数据');
} else { } else {
let tmp = this.tidList.find(item => !item.code || !item.name || !item.itemType) let tmp = this.tidList.find(item => !item.code || !item.name || !item.itemType);
if (tmp) { if (tmp) {
this.$message.error('数据请填写完整!') this.$message.error('数据请填写完整!');
}else{ } else {
addItem(this.tidList).then(res =>{ addItem(this.tidList).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success('新增成功') this.$message.success('新增成功');
this.showDialog = false this.showDialog = false;
this.onLoad() this.onLoad();
} }
}) });
} }
} }
}, },
handleDelete(row){ handleDelete(row) {
this.$confirm('确定将选择数据删除?', { this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
deleteItem({ids:row.id}).then(res =>{ deleteItem({ ids: row.id }).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success('删除成功') this.$message.success('删除成功');
this.onLoad() this.onLoad();
} }
}) });
}) });
}, },
onLoad() { onLoad() {
this.loading = true this.loading = true;
getList({current:this.page.currentPage,size:this.page.pageSize,...this.search}).then(res =>{ getList({ current: this.page.currentPage, size: this.page.pageSize, ...this.search }).then(
this.data = res.data.data.records res => {
this.page.total = res.data.data.total this.data = res.data.data.records;
this.loading = false this.page.total = res.data.data.total;
}) this.loading = false;
}
);
// this.data = [ // this.data = [
// { amId: 3, code: '003', name: '泄漏率检测' }, // { amId: 3, code: '003', name: '泄漏率检测' },
// { amId: 4, code: '002', name: '外观检测' }, // { amId: 4, code: '002', name: '外观检测' },
@ -301,8 +345,8 @@ export default {
// ] // ]
// this.loading = false // this.loading = false
}, },
} },
} };
</script> </script>
<style></style> <style></style>
Write Preview
Loading…
Cancel
Save