This commit is contained in:
bb_pan 2025-10-13 21:54:00 +08:00
parent 560b24b6f0
commit e470a4fc56
6 changed files with 466 additions and 131 deletions

View File

@ -146,6 +146,14 @@ export const getDeviceListApi = (data) => {
})
}
export const getDeviceByOrderIdApi = (data) => {
return request({
url: '/material-mall/order/getDeviceByOrderId',
method: 'GET',
params: data
})
}
// 提交申请接口
export const equipmentSubmitApiNew = (data = {}) => {
return request({

View File

@ -96,21 +96,21 @@
/>
</el-form-item>-->
<el-form-item prop="minBuyPrice" label="资产原值:">
<el-form-item prop="minOriginalValue" label="资产原值:">
<el-input
clearable
style="width: 90px"
placeholder="请输入"
v-model.trim="queryParams.minBuyPrice"
v-model.trim="queryParams.minOriginalValue"
/>
</el-form-item>
<el-form-item prop="maxBuyPrice" label="-" style="margin-left: -6%;">
<el-form-item prop="maxOriginalValue" label="-" style="margin-left: -6%;">
<el-input
clearable
style="width: 90px"
placeholder="请输入"
v-model.trim="queryParams.maxBuyPrice"
v-model.trim="queryParams.maxOriginalValue"
/>
</el-form-item>
@ -228,7 +228,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="300" fixed="right">
<template slot-scope="{ row }">
<el-button type="text" @click="showEquipmentInput(row.id, true)">
<el-button type="text" @click="handleViewDetail(row)">
<i class="el-icon-view"></i> 查看
</el-button>
<el-button
@ -298,8 +298,8 @@ export default {
originalCode: '',
manufacturer: '',
productionDate: '',
minBuyPrice: '',
maxBuyPrice: '',
minOriginalValue: '',
maxOriginalValue: '',
pageNum: 1,
pageSize: 10
@ -378,7 +378,9 @@ export default {
}
})
},
handleViewDetail(row) {
this.$router.push({ path: '/equipment/details', query: { id: row.maId } })
},
/**
* 删除项目
*/

View File

@ -546,7 +546,15 @@ export default {
const res = await addInterDevice(this.form)
if (res.code === 200) {
this.goBack()
// this.goBack()
this.$router.push({
name: 'equipmentInput',
params: {
orderId: this.orderId,
isAddVisible: false,
isApprovalVisible: false
}
})
}
}
}

View File

@ -29,7 +29,7 @@
<el-input
clearable
style="width: 200px"
placeholder="请输入关键字"
placeholder="请输入内容"
v-model.trim="queryParams.createUser"
/>
</el-form-item>
@ -56,39 +56,39 @@
</el-select>
</el-form-item>
<el-form-item prop="devName" label="装备名称:">
<el-form-item prop="name" label="装备名称:">
<el-input
clearable
style="width: 200px"
placeholder="请输入关键字"
v-model.trim="queryParams.devName"
placeholder="请输入内容"
v-model.trim="queryParams.name"
/>
</el-form-item>
<el-form-item prop="devModel" label="规格型号:">
<el-form-item prop="specificationModel" label="规格型号:">
<el-input
clearable
style="width: 200px"
placeholder="请输入关键字"
v-model.trim="queryParams.devModel"
placeholder="请输入内容"
v-model.trim="queryParams.specificationModel"
/>
</el-form-item>
<el-form-item prop="identifyCode" label="装备原始编码:">
<el-form-item prop="originalCode" label="装备原始编码:">
<el-input
clearable
style="width: 200px"
placeholder="请输入关键字"
v-model.trim="queryParams.identifyCode"
placeholder="请输入内容"
v-model.trim="queryParams.originalCode"
/>
</el-form-item>
<el-form-item prop="brand" label="生产厂家:">
<el-form-item prop="manufacturer" label="生产厂家:">
<el-input
clearable
style="width: 200px"
placeholder="请输入关键字"
v-model.trim="queryParams.brand"
placeholder="请输入内容"
v-model.trim="queryParams.manufacturer"
/>
</el-form-item>
@ -160,36 +160,66 @@
<el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
column-key="orderNumber" fixed min-width="200"
/>
<el-table-column prop="proType" label="专业" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column prop="major" label="专业" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column prop="orderNumber" label="工序" align="center" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
{{ scope.row.mainGx }} > {{ scope.row.childGx }}
{{ scope.row.mainProcess }}{{ scope.row.subProcess ? '>' + scope.row.subProcess : '' }}
</template>
</el-table-column>
<el-table-column prop="orderNumber" label="装备类目" show-overflow-tooltip align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.devCategory }} > {{ scope.row.devSubcategory }}
{{ scope.row.mainCategory ? scope.row.mainCategory + '>' : '' }}
{{ scope.row.branch ? scope.row.subCategory + '>' : scope.row.subCategory }}{{ scope.row.branch }}
</template>
</el-table-column>
<el-table-column prop="devName" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="devModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="identifyCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="unitName" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="brand" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="name" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="specificationModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="originalCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="unit" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="manufacturer" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="productionDate" label="出厂日期" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="orderNumber" label="采购日期" align="center"/>-->
<el-table-column prop="buyPrice" label="资产原值(元)" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="originalValue" label="资产原值(元)" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="orderNumber" label="最大使用年限(年)" align="center"/>-->
<!-- <el-table-column prop="orderNumber" label="下次维保日期" align="center"/>-->
<el-table-column prop="operateAddress" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="装备外观" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="合格证" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="定期检验报告" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="采购发票" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="devCount" label="特征项1" align="center"/>-->
<!-- <el-table-column prop="devCount" label="特征值1" align="center"/>-->
<el-table-column prop="province" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="appearanceImages" label="装备外观" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 1)">查看</span>
</template>
</el-table-column>
<el-table-column prop="certificates" label="合格证" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 2)">查看</span>
</template>
</el-table-column>
<el-table-column prop="inspectionReports" label="定期检验报告" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 3)">查看</span>
</template>
</el-table-column>
<el-table-column prop="purchaseInvoices" label="采购发票" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 4)">查看</span>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in columns"
v-if="item.visible"
:key="index"
align="center"
show-overflow-tooltip
:label="item.label"
:prop="item.prop"
>
<template v-slot="{ row }" v-if="/^feature(Item|Value)\d+$/.test(item.prop)">
<span>
{{ getFeatureValue(row, item.prop) }}
</span>
</template>
</el-table-column>
<el-table-column prop="createUser" label="申请人" show-overflow-tooltip align="center" fixed="right"
min-width="100"
/>
@ -207,7 +237,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="300" fixed="right">
<template slot-scope="{ row }">
<el-button type="text" @click="showEquipmentInput(row.maId, true)">
<el-button type="text" @click="handleViewDetail(row)">
<i class="el-icon-view"></i> 查看
</el-button>
<el-button
@ -240,6 +270,22 @@
:is-view="isViewMode"
@getOrderId="getOrderId"
/>
<!-- 弹框 -->
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
<el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
<el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column label="附件名称" prop="fileName" align="center">
<!-- 插槽 -->
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleFile(row)">{{ row.fileName }}</span>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
</span>
</el-dialog>
</div>
@ -250,7 +296,7 @@ import EquipmentEntryEditDialog from '@/views/EquipmentEntryApply/equipmentInput
// 使defineComponent
import {
equipmentDraftListApiNew,
getDeviceByOrderIdApi,
equipmentPassAndRejectApiNew,
equipmentSubmitApiNew,
removeDeviceApi
@ -271,11 +317,12 @@ export default {
} else if (this.isAddVisible) {
this.pageTitle = '查看装备'
this.submitButtonText = ''
this.getList()
} else {
this.pageTitle = '编辑装备'
this.submitButtonText = '提交申请'
this.getList()
}
this.getList()
},
data() {
return {
@ -290,10 +337,10 @@ export default {
createUser: '',
createTime: '',
status: '',
devName: '',
devModel: '',
identifyCode: '',
brand: '',
name: '',
specificationModel: '',
originalCode: '',
manufacturer: '',
productionDate: '',
minBuyPrice: '',
maxBuyPrice: '',
@ -310,7 +357,30 @@ export default {
},
isViewMode: false, //
pageTitle:'',
submitButtonText: ''
submitButtonText: '',
columns: [
{ key: 26, label: `特征项1`, prop: 'featureItem1', visible: true },
{ key: 27, label: `特征值1`, prop: 'featureValue1', visible: true },
{ key: 28, label: `特征项2`, prop: 'featureItem2', visible: true },
{ key: 29, label: `特征值2`, prop: 'featureValue2', visible: true },
{ key: 30, label: `特征项3`, prop: 'featureItem3', visible: true },
{ key: 31, label: `特征值3`, prop: 'featureValue3', visible: true },
{ key: 32, label: `特征项4`, prop: 'featureItem4', visible: true },
{ key: 33, label: `特征值4`, prop: 'featureValue4', visible: true },
{ key: 34, label: `特征项5`, prop: 'featureItem5', visible: true },
{ key: 35, label: `特征值5`, prop: 'featureValue5', visible: true },
{ key: 36, label: `特征项6`, prop: 'featureItem6', visible: true },
{ key: 37, label: `特征值6`, prop: 'featureValue6', visible: true },
{ key: 38, label: `特征项7`, prop: 'featureItem7', visible: true },
{ key: 39, label: `特征值7`, prop: 'featureValue7', visible: true },
{ key: 40, label: `特征项8`, prop: 'featureItem8', visible: true },
{ key: 41, label: `特征值8`, prop: 'featureValue8', visible: true },
{ key: 42, label: `特征项9`, prop: 'featureItem9', visible: true },
{ key: 43, label: `特征值9`, prop: 'featureValue9', visible: true },
],
dialogVisible: false,
dialogTitle: '',
dialogList: [],
}
},
watch: {
@ -340,7 +410,7 @@ export default {
async getList() {
try {
this.queryParams.orderId = this.orderId
const res = await equipmentDraftListApiNew(this.queryParams)
const res = await getDeviceByOrderIdApi(this.queryParams)
this.tableData = res.data.rows
this.total = res.data.total
} catch (error) {
@ -463,7 +533,43 @@ export default {
this.orderId = orderId.toString()
this.isViewMode = isView || false //
this.isEditVisible = true
}
},
handleViewDetail(row) {
this.$router.push({ path: '/equipment/details', query: { id: row.maId } })
},
getFeatureValue(row, prop) {
const match = prop.match(/feature(Item|Value)(\d+)/)
if (!match) return '-'
const type = match[1] // 'Item' or 'Value'
const index = Number(match[2]) - 1
const list = row.propertyVoList || []
if (!list[index]) return '-'
return type === 'Item' ? list[index].propertyName : list[index].propertyValue
},
handleFile(row) {
//
window.open(row.fileUrl, '_blank')
},
//
handleView(row, type) {
if (type == 1) {
this.dialogTitle = '装备外观'
this.dialogList = row.appearanceImages || []
} else if (type == 2) {
this.dialogTitle = '合格证'
this.dialogList = row.certificates || []
} else if (type == 3) {
this.dialogTitle = '定期检验报告'
this.dialogList = row.inspectionReports || []
} else if (type == 4) {
this.dialogTitle = '采购发票'
this.dialogList = row.purchaseInvoices || []
}
this.dialogVisible = true
},
}
}
</script>

View File

@ -13,7 +13,7 @@
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
placeholder="请输入内容"
v-model.trim="queryParams.createUser"
/>
</el-form-item>
@ -41,39 +41,39 @@
</el-select>
</el-form-item>
<el-form-item prop="devName" label="装备名称:">
<el-form-item prop="name" label="装备名称:">
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
v-model.trim="queryParams.devName"
placeholder="请输入内容"
v-model.trim="queryParams.name"
/>
</el-form-item>
<el-form-item prop="devModel" label="规格型号:">
<el-form-item prop="specificationModel" label="规格型号:">
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
v-model.trim="queryParams.devModel"
placeholder="请输入内容"
v-model.trim="queryParams.specificationModel"
/>
</el-form-item>
<el-form-item prop="identifyCode" label="装备原始编码:">
<el-form-item prop="originalCode" label="装备原始编码:">
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
v-model.trim="queryParams.identifyCode"
placeholder="请输入内容"
v-model.trim="queryParams.originalCode"
/>
</el-form-item>
<el-form-item prop="brand" label="生产厂家:">
<el-form-item prop="manufacturer" label="生产厂家:">
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
v-model.trim="queryParams.brand"
placeholder="请输入内容"
v-model.trim="queryParams.manufacturer"
/>
</el-form-item>
@ -97,21 +97,21 @@
/>
</el-form-item>-->
<el-form-item prop="minBuyPrice" label="资产原值:">
<el-form-item prop="originalValue" label="资产原值:">
<el-input
clearable
style="width: 105px"
placeholder="请输入"
v-model.trim="queryParams.minBuyPrice"
v-model.trim="queryParams.minOriginalValue"
/>
</el-form-item>
<el-form-item prop="maxBuyPrice" label="-" style="margin-left: -5.5%;">
<el-form-item prop="maxOriginalValue" label="-" style="margin-left: -5.5%;">
<el-input
clearable
style="width: 105px"
placeholder="请输入"
v-model.trim="queryParams.maxBuyPrice"
v-model.trim="queryParams.maxOriginalValue"
/>
</el-form-item>
@ -143,36 +143,66 @@
<el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
column-key="orderNumber" fixed min-width="200"
/>
<el-table-column prop="proType" label="专业" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column prop="major" label="专业" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column prop="orderNumber" label="工序" align="center" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
{{ scope.row.mainGx }} > {{ scope.row.childGx }}
{{ scope.row.mainProcess }}{{ scope.row.subProcess ? '>' + scope.row.subProcess : '' }}
</template>
</el-table-column>
<el-table-column prop="orderNumber" label="装备类目" show-overflow-tooltip align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.devCategory }} > {{ scope.row.devSubcategory }}
{{ scope.row.mainCategory ? scope.row.mainCategory + '>' : '' }}
{{ scope.row.branch ? scope.row.subCategory + '>' : scope.row.subCategory }}{{ scope.row.branch }}
</template>
</el-table-column>
<el-table-column prop="deviceName" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="devModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="identifyCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="unitName" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="brand" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="name" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="specificationModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="originalCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="unit" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="manufacturer" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="productionDate" label="出厂日期" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="orderNumber" label="采购日期" align="center"/>-->
<el-table-column prop="buyPrice" label="资产原值(元)" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="originalValue" label="资产原值(元)" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="orderNumber" label="最大使用年限(年)" align="center"/>-->
<!-- <el-table-column prop="orderNumber" label="下次维保日期" align="center"/>-->
<el-table-column prop="operateAddress" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="装备外观" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="合格证" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="定期检验报告" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="采购发票" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="devCount" label="特征项1" align="center"/>-->
<!-- <el-table-column prop="devCount" label="特征值1" align="center"/>-->
<el-table-column prop="province" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="appearanceImages" label="装备外观" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 1)">查看</span>
</template>
</el-table-column>
<el-table-column prop="certificates" label="合格证" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 2)">查看</span>
</template>
</el-table-column>
<el-table-column prop="inspectionReports" label="定期检验报告" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 3)">查看</span>
</template>
</el-table-column>
<el-table-column prop="purchaseInvoices" label="采购发票" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 4)">查看</span>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in columns"
v-if="item.visible"
:key="index"
align="center"
show-overflow-tooltip
:label="item.label"
:prop="item.prop"
>
<template v-slot="{ row }" v-if="/^feature(Item|Value)\d+$/.test(item.prop)">
<span>
{{ getFeatureValue(row, item.prop) }}
</span>
</template>
</el-table-column>
<el-table-column prop="createUser" label="申请人" show-overflow-tooltip align="center" fixed="right"
min-width="100"
/>
@ -191,7 +221,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="300" fixed="right">
<template slot-scope="{ row }">
<el-button type="text" @click="showEquipmentInput(row.id, true)">
<el-button type="text" @click="handleViewDetail(row)">
<i class="el-icon-view"></i> 查看
</el-button>
@ -222,12 +252,29 @@
:limit.sync="queryParams.pageSize"
/>
</el-form>
<!-- 弹框 -->
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
<el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
<el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column label="附件名称" prop="fileName" align="center">
<!-- 插槽 -->
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleFile(row)">{{ row.fileName }}</span>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import {
equipmentDraftListApiNew,
getDeviceListApi,
equipmentDelApiNew,
equipmentPassAndRejectApiNew
} from '@/api/EquipmentEntryApply/index'
@ -244,18 +291,41 @@ export default {
createUser: '',
createTime: '',
entryStatus: '',
devName: '',
devModel: '',
identifyCode: '',
brand: '',
name: '',
specificationModel: '',
originalCode: '',
manufacturer: '',
productionDate: '',
minBuyPrice: '',
originalValue: '',
maxBuyPrice: '',
pageNum: 1,
pageSize: 10
},
tableData: []
tableData: [],
columns: [
{ key: 26, label: `特征项1`, prop: 'featureItem1', visible: true },
{ key: 27, label: `特征值1`, prop: 'featureValue1', visible: true },
{ key: 28, label: `特征项2`, prop: 'featureItem2', visible: true },
{ key: 29, label: `特征值2`, prop: 'featureValue2', visible: true },
{ key: 30, label: `特征项3`, prop: 'featureItem3', visible: true },
{ key: 31, label: `特征值3`, prop: 'featureValue3', visible: true },
{ key: 32, label: `特征项4`, prop: 'featureItem4', visible: true },
{ key: 33, label: `特征值4`, prop: 'featureValue4', visible: true },
{ key: 34, label: `特征项5`, prop: 'featureItem5', visible: true },
{ key: 35, label: `特征值5`, prop: 'featureValue5', visible: true },
{ key: 36, label: `特征项6`, prop: 'featureItem6', visible: true },
{ key: 37, label: `特征值6`, prop: 'featureValue6', visible: true },
{ key: 38, label: `特征项7`, prop: 'featureItem7', visible: true },
{ key: 39, label: `特征值7`, prop: 'featureValue7', visible: true },
{ key: 40, label: `特征项8`, prop: 'featureItem8', visible: true },
{ key: 41, label: `特征值8`, prop: 'featureValue8', visible: true },
{ key: 42, label: `特征项9`, prop: 'featureItem9', visible: true },
{ key: 43, label: `特征值9`, prop: 'featureValue9', visible: true },
],
dialogVisible: false,
dialogTitle: '',
dialogList: [],
}
},
mounted() {
@ -266,7 +336,7 @@ export default {
* 获取装备申请列表
*/
getEquipmentApplyList() {
equipmentDraftListApiNew(this.queryParams)
getDeviceListApi(this.queryParams)
.then(res => {
this.tableData = res.data.rows
this.total = res.data.total
@ -306,7 +376,9 @@ export default {
}
})
},
handleViewDetail(row) {
this.$router.push({ path: '/equipment/details', query: { id: row.maId } })
},
//
showDetails(num) {
@ -393,8 +465,40 @@ export default {
}
})
}
},
getFeatureValue(row, prop) {
const match = prop.match(/feature(Item|Value)(\d+)/)
if (!match) return '-'
const type = match[1] // 'Item' or 'Value'
const index = Number(match[2]) - 1
const list = row.propertyVoList || []
if (!list[index]) return '-'
return type === 'Item' ? list[index].propertyName : list[index].propertyValue
},
handleFile(row) {
//
window.open(row.fileUrl, '_blank')
},
//
handleView(row, type) {
if (type == 1) {
this.dialogTitle = '装备外观'
this.dialogList = row.appearanceImages || []
} else if (type == 2) {
this.dialogTitle = '合格证'
this.dialogList = row.certificates || []
} else if (type == 3) {
this.dialogTitle = '定期检验报告'
this.dialogList = row.inspectionReports || []
} else if (type == 4) {
this.dialogTitle = '采购发票'
this.dialogList = row.purchaseInvoices || []
}
this.dialogVisible = true
},
}
}
</script>

View File

@ -23,7 +23,7 @@
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
placeholder="请输入内容"
v-model.trim="queryParams.createUser"
/>
</el-form-item>
@ -51,39 +51,39 @@
</el-select>
</el-form-item>
<el-form-item prop="devName" label="装备名称:">
<el-form-item prop="name" label="装备名称:">
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
v-model.trim="queryParams.devName"
placeholder="请输入内容"
v-model.trim="queryParams.name"
/>
</el-form-item>
<el-form-item prop="devModel" label="规格型号:">
<el-form-item prop="specificationModel" label="规格型号:">
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
v-model.trim="queryParams.devModel"
placeholder="请输入内容"
v-model.trim="queryParams.specificationModel"
/>
</el-form-item>
<el-form-item prop="identifyCode" label="装备原始编码:">
<el-form-item prop="originalCode" label="装备原始编码:">
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
v-model.trim="queryParams.identifyCode"
placeholder="请输入内容"
v-model.trim="queryParams.originalCode"
/>
</el-form-item>
<el-form-item prop="brand" label="生产厂家:">
<el-form-item prop="manufacturer" label="生产厂家:">
<el-input
clearable
style="width: 240px"
placeholder="请输入关键字"
v-model.trim="queryParams.brand"
placeholder="请输入内容"
v-model.trim="queryParams.manufacturer"
/>
</el-form-item>
@ -154,36 +154,66 @@
<el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
column-key="orderNumber" fixed min-width="200"
/>
<el-table-column prop="proType" label="专业" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column prop="major" label="专业" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column prop="orderNumber" label="工序" align="center" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
{{ scope.row.mainGx }} > {{ scope.row.childGx }}
{{ scope.row.mainProcess }}{{ scope.row.subProcess ? '>' + scope.row.subProcess : '' }}
</template>
</el-table-column>
<el-table-column prop="orderNumber" label="装备类目" show-overflow-tooltip align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.devCategory }} > {{ scope.row.devSubcategory }}
</template>
{{ scope.row.mainCategory ? scope.row.mainCategory + '>' : '' }}
{{ scope.row.branch ? scope.row.subCategory + '>' : scope.row.subCategory }}{{ scope.row.branch }}
</template>
</el-table-column>
<el-table-column prop="devName" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="devModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="identifyCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="unitName" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="brand" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="name" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="specificationModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="originalCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="unit" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="manufacturer" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="productionDate" label="出厂日期" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="orderNumber" label="采购日期" align="center"/>-->
<el-table-column prop="buyPrice" label="资产原值(元)" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="originalValue" label="资产原值(元)" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="orderNumber" label="最大使用年限(年)" align="center"/>-->
<!-- <el-table-column prop="orderNumber" label="下次维保日期" align="center"/>-->
<el-table-column prop="operateAddress" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="装备外观" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="合格证" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="定期检验报告" show-overflow-tooltip align="center" min-width="100"/>
<el-table-column prop="orderNumber" label="采购发票" show-overflow-tooltip align="center" min-width="100"/>
<!-- <el-table-column prop="devCount" label="特征项1" align="center"/>-->
<!-- <el-table-column prop="devCount" label="特征值1" align="center"/>-->
<el-table-column prop="appearanceImages" label="装备外观" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 1)">查看</span>
</template>
</el-table-column>
<el-table-column prop="certificates" label="合格证" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 2)">查看</span>
</template>
</el-table-column>
<el-table-column prop="inspectionReports" label="定期检验报告" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 3)">查看</span>
</template>
</el-table-column>
<el-table-column prop="purchaseInvoices" label="采购发票" show-overflow-tooltip align="center" min-width="100">
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleView(row, 4)">查看</span>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in columns"
v-if="item.visible"
:key="index"
align="center"
show-overflow-tooltip
:label="item.label"
:prop="item.prop"
>
<template v-slot="{ row }" v-if="/^feature(Item|Value)\d+$/.test(item.prop)">
<span>
{{ getFeatureValue(row, item.prop) }}
</span>
</template>
</el-table-column>
<el-table-column prop="createUser" label="申请人" show-overflow-tooltip align="center" fixed="right"
min-width="100"
/>
@ -202,7 +232,7 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="300" fixed="right">
<template slot-scope="{ row }">
<el-button type="text" @click="showEquipmentInput(row.maId, true)">
<el-button type="text" @click="handleViewDetail(row)">
<i class="el-icon-view"></i> 查看
</el-button>
@ -233,12 +263,29 @@
:limit.sync="queryParams.pageSize"
/>
</el-form>
<!-- 弹框 -->
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
<el-table :data="dialogList" fit highlight-current-row style="width: 100%" :max-height="500">
<el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column label="附件名称" prop="fileName" align="center">
<!-- 插槽 -->
<template v-slot="{ row }">
<span style="color: #00a288; cursor: pointer" @click="handleFile(row)">{{ row.fileName }}</span>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import {
equipmentDraftListApiNew,
getDeviceByOrderIdApi,
equipmentDelApiNew,
equipmentPassAndRejectApiNew
} from '@/api/EquipmentEntryApply/index'
@ -256,10 +303,10 @@ export default {
createUser: '',
createTime: '',
entryStatus: '',
devName: '',
devModel: '',
identifyCode: '',
brand: '',
name: '',
specificationModel: '',
originalCode: '',
manufacturer: '',
productionDate: '',
minBuyPrice: '',
maxBuyPrice: '',
@ -268,7 +315,30 @@ export default {
pageNum: 1,
pageSize: 10
},
tableData: []
tableData: [],
columns: [
{ key: 26, label: `特征项1`, prop: 'featureItem1', visible: true },
{ key: 27, label: `特征值1`, prop: 'featureValue1', visible: true },
{ key: 28, label: `特征项2`, prop: 'featureItem2', visible: true },
{ key: 29, label: `特征值2`, prop: 'featureValue2', visible: true },
{ key: 30, label: `特征项3`, prop: 'featureItem3', visible: true },
{ key: 31, label: `特征值3`, prop: 'featureValue3', visible: true },
{ key: 32, label: `特征项4`, prop: 'featureItem4', visible: true },
{ key: 33, label: `特征值4`, prop: 'featureValue4', visible: true },
{ key: 34, label: `特征项5`, prop: 'featureItem5', visible: true },
{ key: 35, label: `特征值5`, prop: 'featureValue5', visible: true },
{ key: 36, label: `特征项6`, prop: 'featureItem6', visible: true },
{ key: 37, label: `特征值6`, prop: 'featureValue6', visible: true },
{ key: 38, label: `特征项7`, prop: 'featureItem7', visible: true },
{ key: 39, label: `特征值7`, prop: 'featureValue7', visible: true },
{ key: 40, label: `特征项8`, prop: 'featureItem8', visible: true },
{ key: 41, label: `特征值8`, prop: 'featureValue8', visible: true },
{ key: 42, label: `特征项9`, prop: 'featureItem9', visible: true },
{ key: 43, label: `特征值9`, prop: 'featureValue9', visible: true },
],
dialogVisible: false,
dialogTitle: '',
dialogList: [],
}
},
mounted() {
@ -287,7 +357,7 @@ export default {
* 获取装备申请列表
*/
getEquipmentApplyList() {
equipmentDraftListApiNew(this.queryParams)
getDeviceByOrderIdApi(this.queryParams)
.then(res => {
this.tableData = res.data.rows
this.total = res.data.total
@ -327,7 +397,9 @@ export default {
}
})
},
handleViewDetail(row) {
this.$router.push({ path: '/equipment/details', query: { id: row.maId } })
},
//
showDetails(num) {
this.$emit('switch-view', num)
@ -476,8 +548,43 @@ export default {
})
})
}
},
handleViewDetail(row) {
this.$router.push({ path: '/equipment/details', query: { id: row.maId } })
},
getFeatureValue(row, prop) {
const match = prop.match(/feature(Item|Value)(\d+)/)
if (!match) return '-'
const type = match[1] // 'Item' or 'Value'
const index = Number(match[2]) - 1
const list = row.propertyVoList || []
if (!list[index]) return '-'
return type === 'Item' ? list[index].propertyName : list[index].propertyValue
},
handleFile(row) {
//
window.open(row.fileUrl, '_blank')
},
//
handleView(row, type) {
if (type == 1) {
this.dialogTitle = '装备外观'
this.dialogList = row.appearanceImages || []
} else if (type == 2) {
this.dialogTitle = '合格证'
this.dialogList = row.certificates || []
} else if (type == 3) {
this.dialogTitle = '定期检验报告'
this.dialogList = row.inspectionReports || []
} else if (type == 4) {
this.dialogTitle = '采购发票'
this.dialogList = row.purchaseInvoices || []
}
this.dialogVisible = true
},
}
}
</script>