sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ECUP-256

deli_scp
王宇飞 3 days ago
parent
9962e4b6bc
commit
9be92c9d01
3 changed files with 157 additions and 17 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/locales/en-US.ts
  2. 5
      src/locales/zh-CN.ts
  3. 164
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

5
src/locales/en-US.ts
View File

@ -1609,7 +1609,10 @@ export default {
按物料更新:'Update by material',
'填写物料号（填写多个物料号）':'Fill in the material number (fill in multiple material numbers)',
'填写供应商代码（填写多个供应商）':'Fill in the vendor code (fill in multiple vendors)',
钢卷号:'Coil number',
炉号:'Furnace number',
热处理日期:'Heat treatment date',
有效期:'Expiry date',
},

5
src/locales/zh-CN.ts
View File

@ -1607,7 +1607,10 @@ export default {
按物料更新:'按物料更新',
'填写物料号（填写多个物料号）':'填写物料号（填写多个物料号）',
'填写供应商代码（填写多个供应商）':'填写供应商代码（填写多个供应商）',
钢卷号:'钢卷号',
炉号:'炉号',
热处理日期:'热处理日期',
有效期:'有效期',
},

164
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
View File

@ -1,18 +1,18 @@
<template>
<el-dialog v-model="dialogTableVisible" :title="t('ts.标签')" width="1100">
<el-dialog v-model="dialogTableVisible" :title="t('ts.标签')" width="1150">
<div v-loading="isLoading">
<el-table
:data="showTableData()"
border
row-key="id"
style="width: 1050px; max-height: 70vh; overflow-y: auto"
style="width: 1100px; max-height: 70vh; overflow-y: auto;"
v-if="tableData.length > 0 && dialogTableVisible == true"
>
<el-table-column type="expand" width="50">
<el-table-column type="expand" width="100">
<template #default="scope">
<div
style="margin-left: 400px; margin-top: -8px; margin-bottom: -8px"
style="margin-left: 50px; margin-top: -8px; margin-bottom: -8px"
v-if="
scope.row.packUnit &&
scope.row.packQty &&
@ -23,14 +23,14 @@
<el-table
:data="scope.row.packageList"
border
style="width: 550px"
style="width: 1050px;"
row-key="id"
:row-class-name="getRowClass"
>
<el-table-column type="expand" width="50">
<template #default="scope1">
<div style="margin-left: 150px; margin-top: -8px; margin-bottom: -8px">
<el-table :data="scope1.row.children" border style="width: 300px" row-key="id">
<el-table :data="scope1.row.children" border style="width: 800px" row-key="id">
<el-table-column :label="t('ts.箱行号')" width="100" prop="xPoNumber" align="center">
<template #default="scope2">
{{ scope2.$index + 1 }}
@ -44,6 +44,42 @@
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.钢卷号')" width="100" prop="steelCoilNumber" align="center">
<template #default="scope1">
<el-input
v-model="scope1.row.steelCoilNumber"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.炉号')" width="100" prop="heatNumber" align="center">
<template #default="scope1">
<el-input
v-model="scope1.row.heatNumber"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.热处理日期')" width="150" prop="heatTreatmentDate" align="center">
<template #default="scope1">
<el-date-picker style="width: 100%"
v-model="scope1.row.heatTreatmentDate"
:clearable="true"
placeholder="热处理日期"
format="YYYY-MM-DD"
value-format="x"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.有效期')" width="150" prop="effectiveDate" align="center">
<template #default="scope1">
<el-date-picker style="width: 100%"
v-model="scope1.row.effectiveDate"
:clearable="true"
placeholder="有效期"
format="YYYY-MM-DD"
value-format="x"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.添加箱')" width="100" prop="add" align="center">
<template #header>
<el-button
@ -91,6 +127,40 @@
</template>
</el-table-column>
<el-table-column :label="t('ts.数量')" width="100" prop="qtyOne" align="center" />
<el-table-column :label="t('ts.钢卷号')" width="100" prop="steelCoilNumber" align="center">
<template #default="scope1">
<span>{{ scope1.row.steelCoilNumber }}</span>
</template>
</el-table-column>
<el-table-column :label="t('ts.炉号')" width="100" prop="heatNumber" align="center">
<template #default="scope1">
<span>{{ scope1.row.heatNumber }}</span>
</template>
</el-table-column>
<el-table-column :label="t('ts.热处理日期')" width="150" prop="heatTreatmentDate" align="center">
<template #default="scope1">
<el-date-picker style="width: 100%"
disabled
v-model="scope1.row.heatTreatmentDate"
:clearable="true"
placeholder="热处理日期"
format="YYYY-MM-DD"
value-format="x"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.有效期')" width="150" prop="effectiveDate" align="center">
<template #default="scope1">
<el-date-picker style="width: 100%"
disabled
v-model="scope1.row.effectiveDate"
:clearable="true"
placeholder="有效期"
format="YYYY-MM-DD"
value-format="x"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.操作')" width="100" prop="action" align="center">
<template #default="scope1">
<el-button
@ -109,11 +179,11 @@
</el-table>
</div>
<div
style="margin-left: 550px; margin-top: -8px; margin-bottom: -8px"
style="margin-left: 250px; margin-top: -8px; margin-bottom: -8px"
v-if="scope.row.packUnit && scope.row.packQty && !scope.row.secondPackUnit"
>
<div v-for="(item, index) in scope.row.packageList" :key="index">
<el-table :data="item.children" border style="width: 300px" row-key="id">
<el-table :data="item.children" border style="width: 800px" row-key="id">
<el-table-column :label="t('ts.箱行号')" width="100" prop="xPoNumber" align="center">
<template #default="scope1">
{{ scope1.$index + 1 }}
@ -127,6 +197,42 @@
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.钢卷号')" width="100" prop="steelCoilNumber" align="center">
<template #default="scope1">
<el-input
v-model="scope1.row.steelCoilNumber"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.炉号')" width="100" prop="heatNumber" align="center">
<template #default="scope1">
<el-input
v-model="scope1.row.heatNumber"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.热处理日期')" width="150" prop="heatTreatmentDate" align="center">
<template #default="scope1">
<el-date-picker style="width: 100%"
v-model="scope1.row.heatTreatmentDate"
:clearable="true"
placeholder="热处理日期"
format="YYYY-MM-DD"
value-format="x"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.有效期')" width="150" prop="effectiveDate" align="center">
<template #default="scope1">
<el-date-picker style="width: 100%"
v-model="scope1.row.effectiveDate"
:clearable="true"
placeholder="有效期"
format="YYYY-MM-DD"
value-format="x"
/>
</template>
</el-table-column>
<el-table-column :label="t('ts.添加箱')" width="100" prop="add" align="center">
<template #header>
<el-button
@ -227,6 +333,7 @@ const intData = async () => {
})
}
const expandChange = (row: any, expandedRows: any[]) => {
console.log('展开数据',row)
// 判断托信息和箱信息是否都存在
if (row.secondPackUnit && row.secondPackQty && row.packUnit && row.packQty) {
// 总共需要多少箱
@ -258,7 +365,11 @@ const expandChange = (row: any, expandedRows: any[]) => {
// tPoNumber: i + 1,
xNumber: '',
qtyOne: '',
isTuo: 1 //有托
isTuo: 1, //有托
steelCoilNumber:row.steelCoilNumber,// 钢卷号
heatNumber:row.heatNumber,// 炉号
heatTreatmentDate:row.heatTreatmentDate, // 热处理日期
effectiveDate:row.effectiveDate // 有效日期
}
// 如果有余数
@ -291,7 +402,11 @@ const expandChange = (row: any, expandedRows: any[]) => {
for (let j = 0; j < cur.xNumber; j++) {
twoId.value++
cur.children[j] = {
id: twoId.value
id: twoId.value,
steelCoilNumber:row.steelCoilNumber,// 钢卷号
heatNumber:row.heatNumber,// 炉号
heatTreatmentDate:row.heatTreatmentDate, // 热处理日期
effectiveDate:row.effectiveDate // 有效日期
// xPoNumber: j + 1
}
// 如果有余数
@ -311,6 +426,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
})
}
}
// 只有箱规格
if (!row.secondPackUnit && row.packUnit && row.packQty) {
// 数量%每箱数量 获取总共几箱
@ -326,7 +442,8 @@ const expandChange = (row: any, expandedRows: any[]) => {
id: oneId.value,
// xPoNumber: i + 1,
qtyOne: row.qty,
isTuo: 0 //无托
isTuo: 0, //无托
}
}
row.packageList.forEach((cur) => {
@ -334,7 +451,11 @@ const expandChange = (row: any, expandedRows: any[]) => {
for (let j = 0; j < row.allXiangQty; j++) {
twoId.value++
cur.children[j] = {
id: twoId.value
id: twoId.value,
steelCoilNumber:row.steelCoilNumber,// 钢卷号
heatNumber:row.heatNumber,// 炉号
heatTreatmentDate:row.heatTreatmentDate, // 热处理日期
effectiveDate:row.effectiveDate // 有效日期
// xPoNumber: j + 1
}
// 数量除以箱数量获取余数
@ -435,7 +556,11 @@ const addT = (oneRow) => {
// : 1, //行号是上一行的行号加1
xNumber: '',
qtyOne: '',
isTuo: 1 //有托
isTuo: 1, //有托
steelCoilNumber:oneRow.steelCoilNumber,// 钢卷号
heatNumber:oneRow.heatNumber,// 炉号
heatTreatmentDate:oneRow.heatTreatmentDate, // 热处理日期
effectiveDate:oneRow.effectiveDate // 有效日期
})
oneRow.allTuoQty = oneRow.packageList.length
}
@ -446,6 +571,7 @@ const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
}
// 添加箱
const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
console.log('添加箱',oneRow)
twoId.value++
// 有父级托的时候
if (type == 1) {
@ -461,7 +587,11 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
// twoRow?.children?.length > 0
// ? twoRow?.children[twoRow.children.length - 1]?.xPoNumber + 1
// : 1,
qtyTwo: oneRow.packQty
qtyTwo: oneRow.packQty,
steelCoilNumber:oneRow.steelCoilNumber,// 钢卷号
heatNumber:oneRow.heatNumber,// 炉号
heatTreatmentDate:oneRow.heatTreatmentDate, // 热处理日期
effectiveDate:oneRow.effectiveDate // 有效日期
})
twoRow.xNumber = twoRow.children.length
let num = 0
@ -474,7 +604,11 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
oneRow.isTuo = 1 //无托
twoRow.children.push({
id: twoId.value,
qtyTwo: oneRow.packQty
qtyTwo: oneRow.packQty,
steelCoilNumber:oneRow.steelCoilNumber,// 钢卷号
heatNumber:oneRow.heatNumber,// 炉号
heatTreatmentDate:oneRow.heatTreatmentDate, // 热处理日期
effectiveDate:oneRow.effectiveDate // 有效日期
})
//无托的时候默认显示一条托用来记录托数量
let num = 0

Write Preview
Loading…
Cancel
Save