|
|
|
@ -14,6 +14,9 @@ |
|
|
|
<el-form-item label="备品备件编码"> |
|
|
|
<el-input v-model="queryForm.partNo" clearable style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="备品备件名称"> |
|
|
|
<el-input v-model="queryForm.partDescription" clearable style="width: 150px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="序列号"> |
|
|
|
<el-input v-model="queryForm.batchNo" clearable style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
@ -60,9 +63,9 @@ |
|
|
|
<el-form-item label="设备编码"> |
|
|
|
<el-input v-model="queryForm.orderRef1" clearable style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="操作员"> |
|
|
|
<el-input v-model="queryForm.userName" clearable style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<!-- <el-form-item label="操作员">--> |
|
|
|
<!-- <el-input v-model="queryForm.userName" clearable style="width: 100px"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<el-form-item label="供应商名称"> |
|
|
|
<el-input v-model="queryForm.supplierName" clearable style="width: 150px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
@ -152,6 +155,7 @@ export default { |
|
|
|
buDesc: '', |
|
|
|
direction: '', |
|
|
|
partNo: '', |
|
|
|
partDescription: '', |
|
|
|
batchNo: '', |
|
|
|
warehouseId: '', |
|
|
|
locationId: '', |
|
|
|
@ -159,7 +163,7 @@ export default { |
|
|
|
supplierName: '', |
|
|
|
startTransDate: this.dayjs().format('YYYY-MM-DD'), |
|
|
|
endTransDate: this.dayjs().format('YYYY-MM-DD 23:59:59'), |
|
|
|
username: this.$store.state.user.name, |
|
|
|
userName: this.$store.state.user.name, |
|
|
|
limit: 1, |
|
|
|
page: '' |
|
|
|
}, |
|
|
|
@ -417,7 +421,26 @@ export default { |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 140, |
|
|
|
}, { |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 200101104, |
|
|
|
serialNumber: '200101104TableRemark3', |
|
|
|
tableId: "200101104Table", |
|
|
|
tableName: "出入库明细表", |
|
|
|
columnProp: 'remark3', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '领用人', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 140, |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 200101104, |
|
|
|
serialNumber: '200101104TableUserName', |
|
|
|
@ -662,6 +685,34 @@ export default { |
|
|
|
//this.columnList1 = [] |
|
|
|
switch (columnId) { |
|
|
|
case 1: |
|
|
|
// 检查是否有领用人列,如果没有则添加 |
|
|
|
const hasRemark3 = data.rows.some(item => item.columnProp === 'remark3') |
|
|
|
if (!hasRemark3) { |
|
|
|
// 找到备注列的位置 |
|
|
|
const remarkIndex = data.rows.findIndex(item => item.columnProp === 'remark') |
|
|
|
if (remarkIndex !== -1) { |
|
|
|
// 在备注列后面插入领用人列 |
|
|
|
const newColumn = { |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 200101104, |
|
|
|
serialNumber: '200101104TableRemark3', |
|
|
|
tableId: "200101104Table", |
|
|
|
tableName: "出入库明细表", |
|
|
|
columnProp: 'remark3', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '领用人', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 140, |
|
|
|
} |
|
|
|
data.rows.splice(remarkIndex + 1, 0, newColumn) |
|
|
|
} |
|
|
|
} |
|
|
|
this.columnList = data.rows |
|
|
|
break; |
|
|
|
} |
|
|
|
@ -682,6 +733,34 @@ export default { |
|
|
|
if (!data.rows.length == 0) { |
|
|
|
switch (columnId) { |
|
|
|
case 1: |
|
|
|
// 检查是否有领用人列,如果没有则添加 |
|
|
|
const hasRemark3 = data.rows.some(item => item.columnProp === 'remark3') |
|
|
|
if (!hasRemark3) { |
|
|
|
// 找到备注列的位置 |
|
|
|
const remarkIndex = data.rows.findIndex(item => item.columnProp === 'remark') |
|
|
|
if (remarkIndex !== -1) { |
|
|
|
// 在备注列后面插入领用人列 |
|
|
|
const newColumn = { |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 200101104, |
|
|
|
serialNumber: '200101104TableRemark3', |
|
|
|
tableId: "200101104Table", |
|
|
|
tableName: "出入库明细表", |
|
|
|
columnProp: 'remark3', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '领用人', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 140, |
|
|
|
} |
|
|
|
data.rows.splice(remarkIndex + 1, 0, newColumn) |
|
|
|
} |
|
|
|
} |
|
|
|
this.columnList = data.rows |
|
|
|
break; |
|
|
|
} |
|
|
|
|