From bd896620855d1831caba1485fb15deb9cdb88191 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 13 Jun 2024 14:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E5=BA=9F=E7=AD=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=EF=BC=8C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=8B=E4=BB=B6=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forecastWaste/listing/config.js           |  1 -
 .../scrapManage/scrap/disposition/config.js   |  4 +-
 .../scrapManage/scrap/disposition/index.vue   | 47 ++++++++++---------
 .../scrapManage/scrap/scrapAuditing/config.js |  4 +-
 .../scrapManage/scrap/scrapAuditing/index.vue | 22 ++++++---
 5 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
index fa600db4..a323d9f1 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
@@ -80,7 +80,6 @@ export const dialogConfig = {
         { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
         { t_width: '', t_props: 'maCode', t_label: '设备编码' },
         { t_width: '', t_props: 'scrapNum', t_label: '设备数量' },
-        { t_width: '', t_props: 'auditRemark', t_label: '报废原因' },
         { t_width: '', t_props: '', t_label: '损坏原因', t_slot: 't_damage' },
         { t_width: '', t_props: 'fileUrl', t_label: '报废图片', t_slot: 'imgPreview' },
     ],
diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js b/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
index 914cde0c..0e8292d3 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
+++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
@@ -64,8 +64,8 @@ export const dialogConfig = {
         { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
         { t_width: '', t_props: 'maCode', t_label: '设备编码' },
         { t_width: '', t_props: 'scrapNum', t_label: '设备数量' },
-        { t_width: '', t_props: 'remark', t_label: '报废原因' },
-        { t_width: '', t_props: 'fileUrl', t_label: '报废图片', t_slot: 'imgPreview' },
+        { t_width: '', t_props: '', t_label: '损坏原因', t_slot: 't_damage' },
+        { t_width: '', t_props: '', t_label: '报废图片', t_slot: 't_img' },
     ],
 
 }
diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
index d1714c7e..22633ed1 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
@@ -91,14 +91,19 @@
                         :sendApi="getDialogListApi"
                         :config="dialogConfig"
                     >
-                        <template slot="imgPreview">
-                            <ImagePreview
-                                :src="``"
-                                :width="`30px`"
-                                :height="`30px`"
+                        <!-- 损坏原因 -->
+                        <template slot-scope="{ data }" slot="t_damage">
+                            {{ data.scrapType == 1 ? '人为' : '自然' }}
+                        </template>
+                        <!-- 报废图片 -->
+                        <template slot-scope="{ data }" slot="t_img">
+                            <ScrapImg
+                                v-if="data.fileUrl"
+                                :scrapImgUrl="data.fileUrl"
                             />
-                        </template> </TableModel
-                ></template>
+                        </template>
+                    </TableModel>
+                </template>
 
                 <template v-else-if="dialogConfig.outerTitle === '附件信息'">
                     <el-table :data="fileList" border>
@@ -156,12 +161,14 @@ import {
 import TableModel from '@/components/TableModel'
 import DialogModel from '@/components/DialogModel'
 import ScrapSource from '../../component/scrapSource.vue'
+import ScrapImg from '../../component/scrapImg.vue'
 import { config, dialogConfig, getSelList } from './config.js'
 export default {
     components: {
         TableModel,
         DialogModel,
         ScrapSource,
+        ScrapImg,
     },
     data() {
         return {
@@ -203,7 +210,14 @@ export default {
             this.dialogConfig.outerWidth = '70%'
             this.dialogConfig.outerVisible = true
         },
-        handleDisposition() {
+        handleDisposition(row) {
+            this.dispositionParams = []
+            this.dispositionParams.push({
+                taskId: row.taskId,
+                fileUrl: '', // 附件url
+                fileName: '', // 附件名称
+                disposition: 1, // 处置状态 0、未处置 1、已处置
+            })
             this.dialogConfig.outerTitle = '处置'
             this.dialogConfig.outerWidth = '60%'
             this.dialogConfig.outerVisible = true
@@ -224,6 +238,7 @@ export default {
             data.dispositionFileUrl.split(',').map((e, index) => {
                 this.fileList[index].fileUrl = e
             })
+            this.fileList.splice(this.fileList.length - 1, 1)
             this.dialogConfig.outerTitle = '附件信息'
             this.dialogConfig.outerWidth = '40%'
             this.dialogConfig.outerVisible = true
@@ -241,7 +256,7 @@ export default {
         /* 确定 */
         async handleSubmitInner() {
             if (this.uploadFileList.length < 1) {
-                this.$message.error('请先上传图片')
+                this.$message.error('请先上传文件')
                 return
             }
 
@@ -251,25 +266,15 @@ export default {
                 fileUrl += e.fileUrl + ','
                 fileName += e.fileName + ','
             })
-            this.dispositionParams.fileUrl = fileUrl.substring(
-                fileUrl.length - 1,
-                ',',
-            )
-            this.dispositionParams.fileName = fileName.substring(
-                fileName.length - 1,
-                ',',
-            )
-
             this.dispositionParams.map((e) => {
                 e.fileUrl = fileUrl.substring(fileUrl.length - 1, ',')
                 e.fileName = fileName.substring(fileUrl.length - 1, ',')
             })
             const res = await submitDispositionApi(this.dispositionParams)
-
             if (res.code == 200) {
                 this.$message.success('处置成功！')
                 this.dialogConfig.outerVisible = false
-                this.$refs.tbRef()
+                this.$refs.tbRef.getList()
             }
         },
         /* 获取上传后的图片信息 */
@@ -289,7 +294,7 @@ export default {
                     taskId: e.taskId,
                     fileUrl: '', // 附件url
                     fileName: '', // 附件名称
-                    disposition: 1, // 处置状态 0、未通过 1、通过
+                    disposition: 1, // 处置状 0、未处置 1、已处置
                 }
 
                 this.dispositionParams.push(prams)
diff --git a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
index 39e909ac..cfbaa2aa 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
+++ b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
@@ -72,8 +72,8 @@ export const dialogConfig = {
         { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
         { t_width: '', t_props: 'maCode', t_label: '设备编码' },
         { t_width: '', t_props: 'scrapNum', t_label: '设备数量' },
-        { t_width: '', t_props: 'remark', t_label: '报废原因' },
-        { t_width: '', t_props: 'fileUrl', t_label: '报废图片', t_slot: 'imgPreview' },
+        { t_width: '', t_props: '', t_label: '损坏原因', t_slot: 't_damage' },
+        { t_width: '', t_props: '', t_label: '报废图片', t_slot: 't_img' },
     ],
 
 }
diff --git a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
index 6dfe632e..9225eebf 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
@@ -48,6 +48,7 @@
                     v-hasPermi="['scrap:auditing']"
                     @click="handleAuditing(data)"
                 >
+                    <!--   v-if="auditingIsShow(data)" -->
                     审核
                 </el-button>
                 <el-button
@@ -75,14 +76,19 @@
                         :sendApi="getDialogListApi"
                         :config="dialogConfig"
                     >
-                        <template slot="imgPreview" slot-scope="{ data }">
-                            <ImagePreview
-                                :src="``"
-                                :width="`30px`"
-                                :height="`30px`"
+                        <!-- 损坏原因 -->
+                        <template slot-scope="{ data }" slot="t_damage">
+                            {{ data.scrapType == 1 ? '人为' : '自然' }}
+                        </template>
+                        <!-- 报废图片 -->
+                        <template slot-scope="{ data }" slot="t_img">
+                            <ScrapImg
+                                v-if="data.fileUrl"
+                                :scrapImgUrl="data.fileUrl"
                             />
-                        </template> </TableModel
-                ></template>
+                        </template>
+                    </TableModel>
+                </template>
                 <template v-if="dialogConfig.outerTitle === '审核'">
                     <TableModel
                         :config="dialogConfig"
@@ -149,6 +155,7 @@ import TableModel from '@/components/TableModel'
 import DialogModel from '@/components/DialogModel'
 import ScrapSource from '../../component/scrapSource.vue'
 import AuditingDetails from '../../component/auditingDetails.vue'
+import ScrapImg from '../../component/scrapImg.vue'
 import { config, dialogConfig, getSelList } from './config'
 import {
     getScrapListApi,
@@ -161,6 +168,7 @@ export default {
         DialogModel,
         ScrapSource,
         AuditingDetails,
+        ScrapImg,
     },
     data() {
         return {