bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题清单修复

This commit is contained in:
BianLzhaoMin 2024-12-17 16:21:09 +08:00
parent f2cc3f0df6
commit 6d182a00fc
4 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components.d.ts vendored
View File

@ -8,16 +8,11 @@ export {}
declare module 'vue' { declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus/es')['ElButton'] ElButton: typeof import('element-plus/es')['ElButton']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCascader: typeof import('element-plus/es')['ElCascader'] ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol'] ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog'] ElDialog: typeof import('element-plus/es')['ElDialog']
ElForm: typeof import('element-plus/es')['ElForm'] ElForm: typeof import('element-plus/es')['ElForm']
@ -25,6 +20,7 @@ declare module 'vue' {
ElIcon: typeof import('element-plus/es')['ElIcon'] ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage'] ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput'] ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption'] ElOption: typeof import('element-plus/es')['ElOption']
@ -34,6 +30,7 @@ declare module 'vue' {
ElSelect: typeof import('element-plus/es')['ElSelect'] ElSelect: typeof import('element-plus/es')['ElSelect']
ElStep: typeof import('element-plus/es')['ElStep'] ElStep: typeof import('element-plus/es')['ElStep']
ElSteps: typeof import('element-plus/es')['ElSteps'] ElSteps: typeof import('element-plus/es')['ElSteps']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable'] ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTag: typeof import('element-plus/es')['ElTag'] ElTag: typeof import('element-plus/es')['ElTag']

30
package-lock.json generated
View File

@ -2769,9 +2769,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/eventemitter3": { "node_modules/eventemitter3": {
"version": "2.0.3", "version": "5.0.1",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/eventemitter3/-/eventemitter3-2.0.3.tgz", "resolved": "https://repo.huaweicloud.com/repository/npm/eventemitter3/-/eventemitter3-5.0.1.tgz",
"integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==", "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/extend": { "node_modules/extend": {
@ -2796,9 +2796,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/fast-diff": { "node_modules/fast-diff": {
"version": "1.1.2", "version": "1.3.0",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/fast-diff/-/fast-diff-1.1.2.tgz", "resolved": "https://repo.huaweicloud.com/repository/npm/fast-diff/-/fast-diff-1.3.0.tgz",
"integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
"license": "Apache-2.0" "license": "Apache-2.0"
}, },
"node_modules/fast-glob": { "node_modules/fast-glob": {
@ -4021,9 +4021,9 @@
} }
}, },
"node_modules/parchment": { "node_modules/parchment": {
"version": "1.1.4", "version": "3.0.0",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/parchment/-/parchment-1.1.4.tgz", "resolved": "https://repo.huaweicloud.com/repository/npm/parchment/-/parchment-3.0.0.tgz",
"integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==", "integrity": "sha512-HUrJFQ/StvgmXRcQ1ftY6VEZUq3jA2t9ncFN4F84J/vN0/FPpQF+8FKXb3l6fLces6q0uOHj6NJn+2xvZnxO6A==",
"license": "BSD-3-Clause" "license": "BSD-3-Clause"
}, },
"node_modules/pascal-case": { "node_modules/pascal-case": {
@ -4312,9 +4312,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/quill": { "node_modules/quill": {
"version": "1.3.7", "version": "2.0.3",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/quill/-/quill-1.3.7.tgz", "resolved": "https://repo.huaweicloud.com/repository/npm/quill/-/quill-2.0.3.tgz",
"integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", "integrity": "sha512-xEYQBqfYx/sfb33VJiKnSJp8ehloavImQ2A6564GAbqG55PGw1dAWUn1MUbQB62t0azawUS2CZZhWCjO8gRvTw==",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"dependencies": { "dependencies": {
"eventemitter3": "^5.0.1", "eventemitter3": "^5.0.1",
@ -4327,9 +4327,9 @@
} }
}, },
"node_modules/quill-delta": { "node_modules/quill-delta": {
"version": "3.6.3", "version": "5.1.0",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/quill-delta/-/quill-delta-3.6.3.tgz", "resolved": "https://repo.huaweicloud.com/repository/npm/quill-delta/-/quill-delta-5.1.0.tgz",
"integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==", "integrity": "sha512-X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"fast-diff": "^1.3.0", "fast-diff": "^1.3.0",

6
src/views/user/orderManagementCz/components/cost-settlement-model.vue
View File

@ -277,7 +277,7 @@
</div> </div>
<el-dialog v-model="innerVisible" width="500" title="附件详情" append-to-body> <el-dialog v-model="innerVisible" width="500" title="附件详情" append-to-body>
<!-- <el-table <el-table
:data="viewFileInfoList" :data="viewFileInfoList"
border border
show-overflow-tooltip show-overflow-tooltip
@ -303,7 +303,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
</el-table> --> </el-table>
</el-dialog> </el-dialog>
</el-dialog> </el-dialog>
</template> </template>
@ -699,6 +699,8 @@ const onClose = () => {
const onViewFileImg = (row: any, index: number) => { const onViewFileImg = (row: any, index: number) => {
viewFileInfoList.value = [] viewFileInfoList.value = []
viewFileInfoList.value = fileListAll.value.filter((e: any) => e.fileType == index) viewFileInfoList.value = fileListAll.value.filter((e: any) => e.fileType == index)
console.log(viewFileInfoList.value, ' viewFileInfoList.value')
innerVisible.value = true innerVisible.value = true
} }

38
src/views/user/orderManagementCz/components/rent-termination-model.vue
View File

@ -98,12 +98,15 @@
placeholder="请输入" placeholder="请输入"
v-if="row.isEdit" v-if="row.isEdit"
/> />
<span v-else>
{{ row.repairPrice }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="维修附件"> <el-table-column align="center" label="维修附件">
<template #default="scope"> <template #default="scope">
<UploadComponentNew <UploadComponentNew
v-if="scope.row.isEdit && scope.row.repairInfoList.length == 0" v-if="scope.row.isEdit"
:currentIndex="scope.$index" :currentIndex="scope.$index"
listType="text" listType="text"
:maxSize="2" :maxSize="2"
@ -129,7 +132,7 @@
:key="item.fileUrl" :key="item.fileUrl"
v-for="item in scope.row.repairInfoList" v-for="item in scope.row.repairInfoList"
> >
{{ item.fileName }} 查看
</a> </a>
</template> </template>
</template> </template>
@ -141,12 +144,16 @@
inputmode="numeric" inputmode="numeric"
v-model="row.scrapPrice" v-model="row.scrapPrice"
placeholder="请输入" placeholder="请输入"
/></template> />
<span v-else>
{{ row.scrapPrice }}
</span>
</template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="报废附件"> <el-table-column align="center" label="报废附件">
<template #default="scope"> <template #default="scope">
<UploadComponentNew <UploadComponentNew
v-if="scope.row.isEdit && scope.row.scrapInfoList.length == 0" v-if="scope.row.isEdit"
:currentIndex="scope.$index" :currentIndex="scope.$index"
listType="text" listType="text"
:maxSize="2" :maxSize="2"
@ -172,7 +179,7 @@
:key="item.fileUrl" :key="item.fileUrl"
v-for="item in scope.row.scrapInfoList" v-for="item in scope.row.scrapInfoList"
> >
{{ item.fileName }} 查看
</a> </a>
</template> </template>
</template> </template>
@ -185,12 +192,16 @@
placeholder="请输入" placeholder="请输入"
v-if="row.isEdit" v-if="row.isEdit"
/> />
<span v-else>
{{ row.lossPrice }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="丢失附件"> <el-table-column align="center" label="丢失附件">
<template #default="scope"> <template #default="scope">
<UploadComponentNew <UploadComponentNew
v-if="scope.row.isEdit && scope.row.lossInfoList.length == 0" v-if="scope.row.isEdit"
:currentIndex="scope.$index" :currentIndex="scope.$index"
listType="text" listType="text"
:maxSize="2" :maxSize="2"
@ -216,7 +227,7 @@
:key="item.fileUrl" :key="item.fileUrl"
v-for="item in scope.row.lossInfoList" v-for="item in scope.row.lossInfoList"
> >
{{ item.fileName }} 查看
</a> </a>
</template> </template>
</template> </template>
@ -712,7 +723,7 @@
</template> </template>
<el-dialog v-model="innerVisible" width="30%" title="附件详情"> <el-dialog v-model="innerVisible" width="30%" title="附件详情">
<!-- <el-table <el-table
border border
:data="viewFileInfoList" :data="viewFileInfoList"
show-overflow-tooltip show-overflow-tooltip
@ -738,7 +749,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
</el-table> --> </el-table>
</el-dialog> </el-dialog>
</el-dialog> </el-dialog>
</template> </template>
@ -1074,7 +1085,6 @@ const getOrderDetailsData = async () => {
orderDetails.value.detailsList.forEach((j: any) => { orderDetails.value.detailsList.forEach((j: any) => {
if (e.maId == j.maId) { if (e.maId == j.maId) {
j.repairPrice = e.repairPrice j.repairPrice = e.repairPrice
j.isEdit = true
} }
}) })
}) })
@ -1084,7 +1094,6 @@ const getOrderDetailsData = async () => {
orderDetails.value.detailsList.forEach((j: any) => { orderDetails.value.detailsList.forEach((j: any) => {
if (e.maId == j.maId) { if (e.maId == j.maId) {
j.scrapPrice = e.scrapPrice j.scrapPrice = e.scrapPrice
j.isEdit = true
} }
}) })
}) })
@ -1094,7 +1103,6 @@ const getOrderDetailsData = async () => {
orderDetails.value.detailsList.forEach((j: any) => { orderDetails.value.detailsList.forEach((j: any) => {
if (e.maId == j.maId) { if (e.maId == j.maId) {
j.lossPrice = e.lossPrice j.lossPrice = e.lossPrice
j.isEdit = true
} }
}) })
}) })
@ -1405,12 +1413,6 @@ const handleSelectionChange = (list: any) => {
const onEditDeviceInfo = (row: any) => { const onEditDeviceInfo = (row: any) => {
row.isEdit = !row.isEdit row.isEdit = !row.isEdit
if (!row.isEdit) {
row.repairPrice = 0
row.scrapPrice = 0
row.lossPrice = 0
}
} }
watch( watch(