From 1f83edc71dd1b14ea254a248ddc4b9456fdc2c0e Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 9 Jul 2024 17:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../return/scrap/component/config.js          |  6 ++--
 .../return/scrap/component/return.vue         |  3 +-
 sgzb-ui/src/views/repairTest/repair/index.vue |  2 +-
 .../views/repairTest/repairScrap/index.vue    |  2 +-
 .../forecastWaste/auditing/index.vue          | 24 +++++---------
 .../forecastWaste/listing/index.vue           | 18 +++++------
 .../scrapManage/scrap/disposition/index.vue   | 31 ++++++-------------
 .../scrapManage/scrap/scrapAuditing/index.vue | 15 +++------
 8 files changed, 38 insertions(+), 63 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
index 50a6b5e4..1fe68cc9 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
@@ -140,7 +140,7 @@ export const dialogConfigReturnDet = {
 
 
 export const getSelList = () => {
-    new Promise(async (resolve) => {
+    new Promise(async resolve => {
         const { data: unitRes } = await getUnitInfoSelectApi()
         unitList = unitRes.map((e) => {
             e.value = e.unitId
@@ -157,7 +157,7 @@ export const getSelList = () => {
         typeList = typeRes
         resolve()
     }).then(() => {
-        config.formLabel.map((item) => {
+        config.formLabel.map(item => {
             if (item.f_model === 'unitId') {
                 item.f_selList = unitList
                 return item
@@ -172,7 +172,7 @@ export const getSelList = () => {
             }
         })
 
-        configReturn.formLabel.map((item) => {
+        configReturn.formLabel.map(item => {
             if (item.f_model === 'typeId') {
                 item.f_selList = proList
                 return item
diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
index aee77ed4..379d05e1 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
@@ -258,7 +258,7 @@
                             size="small"
                             maxlength="50"
                             style="width: 350px"
-                        ></el-input>
+                        />
                     </el-form-item>
                     <el-form-item label="损坏原因：" prop="scrapType">
                         <el-radio-group
@@ -462,6 +462,7 @@ export default {
         },
         // 编辑退料
         handleEditReturn(data) {
+            //  manageType  0、编码退料 1、数量退料
             if (data.manageType == 0) {
                 this.isQuery = true
                 this.isNumDetails = false
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index 10940fa2..f6008e34 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -166,7 +166,7 @@
                 align="center"
                 :selectable="
                     (row) => {
-                        return row.repairStatusCode == 44
+                        return row.repairStatusCode == 44 && row.commit == 0
                     }
                 "
             />
diff --git a/sgzb-ui/src/views/repairTest/repairScrap/index.vue b/sgzb-ui/src/views/repairTest/repairScrap/index.vue
index 5b294878..abe9724f 100644
--- a/sgzb-ui/src/views/repairTest/repairScrap/index.vue
+++ b/sgzb-ui/src/views/repairTest/repairScrap/index.vue
@@ -167,7 +167,7 @@
                 align="center"
                 :selectable="
                     (row) => {
-                        return row.repairStatusCode == 44
+                        return row.repairStatusCode == 44 && row.commit == 0
                     }
                 "
             />
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
index 6e574d1a..9db3d089 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
@@ -207,22 +207,18 @@ export default {
             getForecastWasteListApi,
             getSelList,
             getTypeListSel,
-            /* 驳回原因 */
-            rejectReason: '',
-            /* 选中的审核数据 */
-            selAuditingList: [],
-            /* 请求参数 */
-            sendParams: {},
-            /* 当前登录的用户id */
-            userId: sessionStorage.getItem('userId'),
+            rejectReason: '', // 驳回原因
+            selAuditingList: [], // 选中的审核数据
+            sendParams: {}, // 弹框内列表请求参数
+            userId: sessionStorage.getItem('userId'), // 当前登录的用户id
+            tbAllChecked: false, // 判断当前设备是否全部审核过
+            dataCondition: [], // 导出taskId列表
+            isRefresh: false,
             /* 审核参数 */
             auditingParams: {
                 taskId: '',
                 scrapDetailList: [],
             },
-            tbAllChecked: false, // 判断当前设备是否全部审核过
-            dataCondition: [], // 导出taskId列表
-            isRefresh: false,
         }
     },
     created() {
@@ -256,6 +252,7 @@ export default {
         getDialogTbSelList(list) {
             this.selAuditingList = list
         },
+        /* 主列表复选框勾选后数据 */
         getTableSelectionList(list) {
             this.dataCondition = []
             if (list.length > 0)
@@ -341,11 +338,6 @@ export default {
         },
         /* 数据导出 */
         handleExport(data) {
-            console.log(
-                '🚀 ~ 导出 ~ this.dataCondition:',
-                data,
-                this.dataCondition,
-            )
             if (this.dataCondition.length > 0)
                 data.dataCondition = this.dataCondition
             this.download(
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
index 2f24fda4..7cd90dd5 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
@@ -26,7 +26,6 @@
                         >
 
                         <!-- 批量提交报废 -->
-
                         <el-button
                             type="success"
                             plain
@@ -191,27 +190,28 @@ export default {
             getPreScrapListApi,
             getDialogListApi,
             tableSelList: [],
-            sendParams: {
-                taskId: '',
-            }, // 列表查看时参数
             temp: false,
             getSelList,
             getTypeListSel,
             imgCommonUrl: process.env.VUE_APP_BASE_API + '/system',
-
-            /* 提交报废申请参数 */
+            auditingList: [],
+            pageContent: '驳回退料',
+            parentId: '',
+            // 提交报废申请参数
             submitScrapParams: {
                 taskIdList: [],
                 deptIds: [],
             },
-            auditingList: [],
+            // 驳回退料弹框内数据查询参数
             sendParamsAuditing: {
                 taskId: '',
                 pageNum: 1,
                 pageSize: 10,
             },
-            pageContent: '驳回退料',
-            parentId: '',
+            // 弹框内列表查询参数
+            sendParams: {
+                taskId: '',
+            },
         }
     },
     created() {
diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
index ce37c3cd..5471b65e 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
@@ -158,18 +158,17 @@
         </DialogModel>
     </div>
 </template>
-
 <script>
-import {
-    getDispositionListApi,
-    submitDispositionApi,
-    getDialogListApi,
-} from '@/api/scrap/forecastWaste.js'
 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'
+import {
+    getDispositionListApi,
+    submitDispositionApi,
+    getDialogListApi,
+} from '@/api/scrap/forecastWaste.js'
 export default {
     components: {
         TableModel,
@@ -183,26 +182,15 @@ export default {
             dialogConfig,
             getDispositionListApi,
             getDialogListApi,
-            /* 选中的列表数据 */
-            selectionList: [],
-            /* 驳回原因 */
-            rejectReason: '',
+            selectionList: [], // 选中的列表数据
+            rejectReason: '', // 驳回原因
             fileType: ['png', 'jpg', 'jpeg', 'pdf', 'doc', 'xls', 'docx'],
             uploadFileList: [],
             sendParams: {},
             fileList: [],
             tbSelectList: [],
-            /* 处置提交参数 */
-
-            dispositionParams: [],
-            // dispositionParams: {
-            //     taskId: '',
-            //     fileUrl: '', // 附件url
-            //     fileName: '', // 附件名称
-            //     disposition: 1, // 处置状态 0、未通过 1、通过
-            // },
-            /* 附件预览地址 */
-            filePreviewUrl: process.env.VUE_APP_BASE_API + '/system',
+            dispositionParams: [], // 处置参数
+            filePreviewUrl: process.env.VUE_APP_BASE_API + '/system', // 附件预览地址
             getSelList,
         }
     },
@@ -266,7 +254,6 @@ export default {
                 this.$message.error('请先上传文件')
                 return
             }
-
             let fileUrl = ''
             let fileName = ''
             this.uploadFileList.map((e) => {
diff --git a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
index e0aab3ac..08965376 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
@@ -198,13 +198,11 @@ export default {
             dialogConfig,
             getScrapListApi,
             getDialogListApi,
-            /* 选中的列表数据 */
-            selectionList: [],
-            /* 驳回原因 */
-            rejectReason: '',
-            sendParams: {}, // 列表查看时参数
+            selectionList: [], // 选中的列表数据
+            rejectReason: '', // 驳回原因
             deptId: sessionStorage.getItem('deptId'),
-
+            auditingList: [], // 审批详情的列表
+            getSelList,
             /* 审核参数 */
             auditingParams: {
                 deptId: parseInt(sessionStorage.getItem('deptId')),
@@ -213,10 +211,7 @@ export default {
                 status: '',
                 reasonRejection: '',
             },
-
-            /* 审批详情的列表 */
-            auditingList: [],
-            getSelList,
+            sendParams: {}, // 弹框内列表查看时参数
         }
     },
     created() {