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

生产管理问题修改

Browse Source
dev-scheduling
zhangdi 3 weeks ago
parent 3081be5225
commit 8ee0e7b255
6 changed files with 124 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/views/productionManagement/beforeAndAfterPlating/afterPlating.vue
  2. 101
      src/views/productionManagement/beforeAndAfterPlating/components/afterPlatingEntryDialog.vue
  3. 13
      src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingBoundDialog.vue
  4. 1
      src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue
  5. 15
      src/views/productionManagement/beforeAndAfterPlating/index.vue
  6. 46
      src/views/productionManagement/js/platingColumnData.js

5
src/views/productionManagement/beforeAndAfterPlating/afterPlating.vue
Unescape View File

@ -23,6 +23,9 @@
<template #menu-left>
<el-button type="primary" @click="handleAdd(tabPosition)">新 增</el-button>
</template>
<template #tsId="scope">
{{ scope.row.tsId == '' ? scope.row.ocId : scope.row.tsId }}
</template>
</avue-crud>
<!-- 镀前入库新增 -->
<before-plating-entry-dialog
@ -169,7 +172,7 @@ export default {
this.showDialog = false;
this.boundDialog = false;
this.afterBoundDialog = false;
this.onLoad(this.page,this.query)
this.onLoad(this.page, this.query);
},
tabPositionChange(value, event) {
this.option.column = columnData[this.tabPosition];

101
src/views/productionManagement/beforeAndAfterPlating/components/afterPlatingEntryDialog.vue
Unescape View File

@ -29,24 +29,33 @@
@selection-change="selectionChangeProject"
@select="selectChange"
v-loading="tableLoading"
:height="tableHeight"
>
<el-table-column type="selection" fixed></el-table-column>
<el-table-column label="移交类型" prop="paCode" align="center" width="120">
<el-table-column label="移交类型" prop="hrTypeBool" align="center" width="120">
<template #default="scope">
<el-input v-model="scope.row.woCode" placeholder="请输入"></el-input>
<!-- <el-input v-model="scope.row.woCode" placeholder="请输入"></el-input> -->
<el-select v-model="scope.row.hrTypeBool" disabled placeholder="请选择" clearable>
<el-option
v-for="item in descriptionList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="转交部门" prop="paCode" align="center" width="100">
<el-table-column label="转交部门" prop="useDept" align="center" width="100">
<template #header>
<span><i style="color: red">*</i>转交部门</span>
</template>
</el-table-column>
<el-table-column label="下级B号" prop="paCode" align="center" width="120">
<el-table-column label="下级B号" prop="roamNoNext" align="center" width="120">
</el-table-column>
<el-table-column label="下级B号名称" prop="paCode" align="center" width="120">
</el-table-column>
<el-table-column label="单号" prop="paCode" align="center" width="120"> </el-table-column>
<el-table-column label="车间订单" prop="woCode" align="center" width="100">
<!--<el-table-column label="下级B号名称" prop="paCode" align="center" width="120">
</el-table-column> -->
<!-- <el-table-column label="单号" prop="paCode" align="center" width="120"> </el-table-column> -->
<el-table-column label="车间订单" prop="woCode" align="center" width="170">
</el-table-column>
<el-table-column label="批次号" prop="batchNo" align="center" width="120"></el-table-column>
<el-table-column
@ -55,19 +64,25 @@
align="center"
width="120"
></el-table-column>
<el-table-column label="出库班组/供应商" prop="teamCode" width="200" align="center">
<el-table-column label="入库班组/供应商" prop="teamCode" width="200" align="center">
</el-table-column>
<el-table-column label="入库工序号" prop="processCode" align="center" width="100">
</el-table-column>
<el-table-column label="入库工序名称" prop="processName" align="center" width="120">
</el-table-column>
<el-table-column label="出库工序号" prop="processCode" align="center" width="100">
<el-table-column label="下序号" prop="nextProcessCode" align="center" width="120">
</el-table-column>
<el-table-column label="出库工序名称" prop="ppsName" align="center" width="120">
<el-table-column label="下序名称" prop="nextProcessName" align="center" width="120">
</el-table-column>
<el-table-column label="下序号" prop="nextOrders" align="center" width="120">
<el-table-column label="下序班组/供应商" prop="nextTeamCode" width="200" align="center">
</el-table-column>
<el-table-column label="下序名称" prop="nextPpsName" align="center" width="120">
<el-table-column label="入库数量" prop="inQuantity" align="center" width="120">
</el-table-column>
<el-table-column label="下序班组/供应商" prop="nextTsName" width="200" align="center">
<el-table-column label="重量" prop="weight" align="center" width="120">
<template #default="scope">
<el-input v-model="scope.row.weight" placeholder="请输入"></el-input>
</template>
</el-table-column>
<el-table-column label="出库数量" prop="quantity" align="center"> </el-table-column>
</el-table>
</el-form>
@ -95,6 +110,17 @@ export default {
},
data() {
return {
tableHeight: 400,
descriptionList: [
{
label: '入库',
value: 1,
},
{
label: '转工',
value: 0,
},
],
sunmitLoading: false,
tableLoading: false,
formError: '',
@ -145,8 +171,32 @@ export default {
},
};
},
mounted() {},
mounted() {
this.$nextTick(() => {
this.calculateTableHeight();
});
},
methods: {
// 计算表格高度
calculateTableHeight() {
this.$nextTick(() => {
const dialogContainer = document.querySelector('.el-dialog__body');
if (!dialogContainer) return;
const containerHeight = dialogContainer.clientHeight;
// 减去其他元素高度
const inputAreaHeight = 50;
const errorHeight = 30;
const formPadding = 40;
const footerHeight = 10;
const calculatedHeight =
containerHeight - inputAreaHeight - errorHeight - formPadding - footerHeight;
this.tableHeight = Math.max(300, Math.min(calculatedHeight, 800));
});
},
open() {
this.cardNo = '';
this.form.beforePlatingEntryData = [];
@ -155,7 +205,8 @@ export default {
this.tableLoading = true;
getAfterPlatCardNo({ cardNo: this.cardNo })
.then(res => {
this.form.beforePlatingEntryData = res.data;
this.form.beforePlatingEntryData.push(res.data.data);
this.tableLoading = false;
})
.catch(err => {
this.tableLoading = false;
@ -190,10 +241,24 @@ export default {
const { _select, ...validData } = row; // 剔除选择状态字段
return validData;
});
this.sunmitLoading = true;
// 调用接口提交（实际项目替换）
try {
savePlateAroundPlateAfterEnter(this.form.beforePlatingEntryData)
let query = [];
this.form.beforePlatingEntryData.forEach(item => {
query.push({
wpId: item.wpId,
tsId: item.teamId,
ocId: item.ocId ? item.ocId : null,
quantity: item.inQuantity,
hrTypeBool:item.hrTypeBool,
useDept:item.useDept,
weight:item.weight
});
});
savePlateAroundPlateAfterEnter(query)
.then(res => {
this.$message.success('提交成功');
this.closeDialog();

13
src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingBoundDialog.vue
Unescape View File

@ -53,16 +53,16 @@
align="center"
width="200"
></el-table-column>
<el-table-column label="入库班组/供应商" prop="teamCode" width="200" align="center">
<el-table-column label="出库班组/供应商" prop="teamCode" width="200" align="center">
</el-table-column>
<el-table-column label="入库工序号" prop="processCode" align="center"> </el-table-column>
<el-table-column label="入库工序名称" prop="processName" align="center" width="200">
<el-table-column label="出库工序号" prop="processCode" align="center"> </el-table-column>
<el-table-column label="出库工序名称" prop="processName" align="center" width="200">
</el-table-column>
<el-table-column label="下序号" prop="nextProcessCode" align="center"> </el-table-column>
<el-table-column label="下序名称" prop="processName" align="center"> </el-table-column>
<el-table-column label="下序班组/供应商" prop="nextTeamCode" width="200" align="center">
</el-table-column>
<el-table-column label="入库数量" prop="inQuantity" align="center"> </el-table-column>
<el-table-column label="出库数量" prop="inQuantity" align="center"> </el-table-column>
</el-table>
</el-form>
@ -129,7 +129,7 @@ export default {
this.tableLoading = true;
getBeforePlatOutCardNo({ cardNo: this.cardNo })
.then(res => {
this.form.beforePlatingEntryData.push(res.data);
this.form.beforePlatingEntryData.push(res.data.data);
this.tableLoading = false;
})
.catch(err => {
@ -175,8 +175,11 @@ export default {
wpId: item.wpId,
tsId: item.teamId,
ocId: item.ocId ? item.ocId : null,
id: item.id,
quantity: item.inQuantity,
});
});
savePlateAroundPlateFrontIssue(query)
.then(res => {
this.$message.success('提交成功');

1
src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue
Unescape View File

@ -257,6 +257,7 @@ export default {
wpId: item.wpId,
tsId: item.teamId,
ocId: item.ocId ? item.ocId : null,
quantity:item.inQuantity
});
});
savePlateAroundPlateFrontEnter(query)

15
src/views/productionManagement/beforeAndAfterPlating/index.vue
Unescape View File

@ -20,6 +20,7 @@
:data="data"
v-model="form"
v-model:page="page"
v-model.query="query"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@ -124,7 +125,7 @@ export default {
total: 0,
},
query: {
paType: 1, //1-镀前入库 2-镀前出库 3-镀后入库
paType: 3, //1-镀前入库 2-镀前出库 3-镀后入库
},
};
},
@ -183,21 +184,15 @@ export default {
this.showDialog = false;
this.boundDialog = false;
this.afterBoundDialog = false;
this.onLoad(this.page, this.query);
},
tabPositionChange(value, event) {
this.option.column = columnData[this.tabPosition];
this.option.menu = false;
if (this.tabPosition == 'beforePlatingEntry') {
this.query.paType = 1;
this.onLoad(this.page, this.query);
} else if (this.tabPosition == 'beforePlatingBound') {
this.query.paType = 2;
this.onLoad(this.page, this.query);
} else {
this.option.menu = true;
if (this.tabPosition == 'afterPlatingEntry') {
this.query.paType = 3;
this.onLoad(this.page, this.query);
}
}
},
onLoad(page, params = {}) {
this.loading = true;

46
src/views/productionManagement/js/platingColumnData.js
Unescape View File

@ -60,7 +60,7 @@ export default {
},
{
label: '入库班组/供应商',
prop: 'tsName',
prop: 'tsId',
span: 24,
width: 200,
search: false,
@ -175,7 +175,7 @@ export default {
},
{
label: '出库班组/供应商',
prop: 'tsName',
prop: 'tsId',
width: 200,
span: 24,
search: false,
@ -192,7 +192,7 @@ export default {
},
{
label: '出库工序名称',
prop: 'ppsName',
prop: 'ppsId',
width: 150,
span: 24,
search: true,
@ -201,7 +201,7 @@ export default {
},
{
label: '出库人员',
prop: 'userName',
prop: 'createUser',
width: 150,
span: 24,
search: false,
@ -289,30 +289,30 @@ export default {
},
{
label: '入库班组/供应商',
prop: 'tsName',
prop: 'tsId',
span: 24,
width: 200,
search: false,
},
{
label: '班组',
prop: 'tsId',
type: 'select',
span: 24,
search: true,
hide: true,
// {
// label: '班组',
// prop: 'tsId',
// type: 'select',
// span: 24,
// search: true,
// hide: true,
},
{
label: '供应商',
prop: 'ocId',
type: 'select',
span: 24,
search: true,
hide: true,
// },
// {
// label: '供应商',
// prop: 'ocId',
// type: 'select',
// span: 24,
// search: true,
// hide: true,
},
// },
{
label: '入库工序号',
prop: 'orders',
@ -324,7 +324,7 @@ export default {
},
{
label: '入库工序名称',
prop: 'ppsName',
prop: 'ppsId',
width: 150,
span: 24,
search: true,
@ -333,7 +333,7 @@ export default {
},
{
label: '入库人员',
prop: 'userName',
prop: 'createUser',
width: 150,
span: 24,
search: false,

Write Preview
Loading…
Cancel
Save