退料报废功能优化

2024-06-27 17:23:45 +08:00 · 2024-06-27 17:23:45 +08:00 · 0f488e2b31
parent 5f68d7194a
commit 0f488e2b31
11 changed files with 53 additions and 20 deletions
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@ -63,7 +63,7 @@
                        placeholder="请选择设备类型"
                        clearable
                        filterable
-                        :disabled="isEdit"
+                        :disabled="isEdit || leaseApplyDetails.length > 0"
                    >
                        <el-option label="机具设备" value="101"></el-option>
                        <el-option label="调试设备" value="102"></el-option>
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
@ -78,6 +78,7 @@
                    end-placeholder="结束日期"
                    type="date"
                    value-format="yyyy-MM-dd"
+                    placeholder="请选择时间"
                    style="width: 240px"
                >
                </el-date-picker>
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
@ -423,6 +423,7 @@ export default {
                let params = {
                    flag: 1,
                    companyId: this.companyId,
+                    backSource: 2,
                    ...this.queryParams,
                }
                console.log('paramsparamsparams', params)
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
@ -108,7 +108,7 @@ export const dialogConfigReturn = {
        { t_width: '', t_props: 'typeName', t_label: '设备类型' },
        { t_width: '', t_props: 'typeModelName', t_label: '规格型号' },
        { t_width: '', t_props: 'maCode', t_label: '设备编码' },
-        { t_width: '', t_props: 'status', t_label: '退料状态' },
+        // { t_width: '', t_props: 'status', t_label: '退料状态' },
    ],

 }
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/home.vue
@ -125,7 +125,6 @@ export default {
        },
        /* 驳回退料 */
        handleRejectReturn(data) {
-            console.log('驳回退料', data)
            this.$emit('openReturnPage', data)
        },
        /* 外层弹框关闭 */
@ -140,7 +139,6 @@ export default {

    activated() {
        if (this.isRefresh) {
-            console.log('刷新列表---')
            this.$refs.tbRef.getList()
        }
    },
--- a/sgzb-ui/src/views/claimAndreturn/return/scrap/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/index.vue
@ -1,13 +1,14 @@
 <template>
    <div class="app-container">
-        <keep-alive v-if="isHome">
-            <Home :isRefresh="isRefresh" @openReturnPage="openReturnPage" />
+        <keep-alive include="Home">
+            <component
+                :is="isShowComponent"
+                :isRefresh="isRefresh"
+                @openReturnPage="openReturnPage"
+                :returnInfo="returnInfo"
+                @closeReturnPage="closeReturnPage"
+            />
        </keep-alive>
-        <Return
-            :returnInfo="returnInfo"
-            @closeReturnPage="closeReturnPage"
-            v-else
-        />
    </div>
 </template>

@ -25,16 +26,17 @@ export default {
            isHome: true,
            returnInfo: null,
            isRefresh: false,
+            isShowComponent: 'Home',
        }
    },
    methods: {
        openReturnPage(data) {
            this.returnInfo = data
-            this.isHome = false
+            this.isShowComponent = 'Return'
        },
        closeReturnPage(val) {
            this.isRefresh = false
-            this.isHome = true
+            this.isShowComponent = 'Home'

            if (val == 1) {
                this.isRefresh = true
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@ -621,6 +621,7 @@ export default {
                type: '',
                backCode: '',
                repairStatus: '',
+                backSource: 2,
            },
            dialogQueryParams: {
                pageNum: 1,
--- a/sgzb-ui/src/views/repairTest/repairScrap/index.vue
+++ b/sgzb-ui/src/views/repairTest/repairScrap/index.vue
@ -1,4 +1,5 @@
 <template>
+    <!-- 维修报废 -->
    <div class="app-container" id="repair">
        <el-form
            :model="queryParams"
@ -18,7 +19,7 @@
                    @keyup.enter.native="handleQuery"
                />
            </el-form-item>
-            <el-form-item label="单位名称" prop="backUnit">
+            <el-form-item label="单位名称---" prop="backUnit">
                <el-select
                    v-model="queryParams.backUnit"
                    placeholder="请选择单位名称"
@ -157,6 +158,7 @@
        <el-table
            v-loading="loading"
            @selection-change="handleSelectionChange"
+            :data="typeList"
            border
        >
            <el-table-column type="selection" width="55" align="center" />
@ -171,6 +173,12 @@
            <el-table-column
                label="预报废单号"
                align="center"
+                prop="forecastWasteCode"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="维修单号"
+                align="center"
                prop="repairCode"
                show-overflow-tooltip
            />
@ -210,6 +218,12 @@
                prop="backCode"
                show-overflow-tooltip
            /> -->
+            <!-- <el-table-column
+                label="维修状态"
+                align="center"
+                prop="repairStatus"
+                show-overflow-tooltip
+            /> -->
            <el-table-column
                label="维修状态"
                align="center"
@ -394,6 +408,12 @@
                    prop="scrapNum"
                    :show-overflow-tooltip="true"
                />
+                <el-table-column
+                    label="驳回原因"
+                    align="center"
+                    prop="remark"
+                    :show-overflow-tooltip="true"
+                />
                <el-table-column
                    label="待修状态"
                    align="center"
@ -619,6 +639,7 @@ export default {
                type: '',
                backCode: '',
                repairStatus: '',
+                backSource: 1,
            },
            dialogQueryParams: {
                pageNum: 1,
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@ -1046,7 +1046,7 @@ export default {
                    const scrapDetails = res.rows
                    scrapDetails.forEach((e) => {
                        if (e.scrapNum >= 1) {
-                            item.fileIds = e.fileIds
+                            item.fileIds = e.fileIds || null
                            item.scrapReason = e.scrapReason
                            item.scrapType = e.scrapType
                        }
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
@ -85,7 +85,8 @@ export const dialogConfig = {
        { t_width: '', t_props: 'maCode', t_label: '设备编码' },
        { t_width: '', t_props: 'scrapNum', t_label: '设备数量' },
        { t_width: '', t_props: 'status', t_label: '审批状态', t_slot: 't_type' },
-        { t_width: '', t_props: 'auditRemark', t_label: '报废原因' },
+        { t_width: '', t_props: 'remark', t_label: '报废原因' },
+        { t_width: '', t_props: 'auditRemark', t_label: '驳回原因' },
        { t_width: '', t_props: '', t_label: '损坏原因', t_slot: 't_damage' },
        { t_width: '', t_props: '', t_label: '报废图片', t_slot: 't_img' },
        { t_width: '', t_props: 'remark', t_label: '备注' },
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
@ -191,6 +191,7 @@ import {
    auditingPreScrapApi,
 } from '@/api/scrap/forecastWaste.js'
 import { config, getSelList, getTypeListSel, dialogConfig } from './config'
+import { registerLayout } from 'echarts'
 export default {
    name: 'Inventory',
    components: {
@ -222,6 +223,7 @@ export default {
            },
            tbAllChecked: false, // 判断当前设备是否全部审核过
            dataCondition: [], // 导出taskId列表
+            isRefresh: false,
        }
    },
    created() {
@ -282,9 +284,9 @@ export default {
            const res = await auditingPreScrapApi(this.auditingParams)
            if (res.code == 200) {
                this.$message.success('审核通过！')
-                this.dialogConfig.outerVisible = false
-                this.$refs.tbRef.getList()
                this.auditingParams.scrapDetailList = []
+                this.$refs.dialogTbRef.getList()
+                this.isRefresh = true
            }
        },
        /* 审核驳回 */
@ -324,8 +326,6 @@ export default {

                    this.auditingParams.scrapDetailList.push(deviceInfo)
                })
-
-                console.log(this.selAuditingList, '选择的操作数据')
                const res = await auditingPreScrapApi(this.auditingParams)
                if (res.code == 200) {
                    this.$message.success('已驳回！')
@ -334,6 +334,9 @@ export default {
                    this.$nextTick(() => {
                        this.$refs.dialogTbRef.getList()
                    })
+                    this.isRefresh = true
+                } else {
+                    this.dialogConfig.innerVisible = false
                }
            }
        },
@ -361,6 +364,11 @@ export default {
                /* 监听外层弹框关闭 清空勾选的数据 */
                if (!newVal.outerVisible) {
                    this.selAuditingList = []
+
+                    if (this.isRefresh) {
+                        this.$refs.tbRef.getList()
+                        this.isRefresh = false
+                    }
                }
                if (!newVal.innerVisible) {
                    this.auditingParams.scrapDetailList = []