diff --git a/sgzb-ui/src/api/scrap/forecastWaste.js b/sgzb-ui/src/api/scrap/forecastWaste.js
index 932f9fc5..67ea629b 100644
--- a/sgzb-ui/src/api/scrap/forecastWaste.js
+++ b/sgzb-ui/src/api/scrap/forecastWaste.js
@@ -27,7 +27,7 @@ export const submitScrapApi = (data) => {
 
 /* 报废列表 */
 export const getScrapListApi = (data) => {
-    return request.post('/material/scrap/scrapTaskReviewList', data)
+    return request.get('/material/scrap/scrapTaskReviewList', { params: data })
 }
 
 /* 报废审核接口 */
@@ -37,10 +37,11 @@ export const auditingScrapApi = (data) => {
 
 /* 处置列表接口 */
 export const getDispositionListApi = (data) => {
-    return request.post('/material/scrap/obtainDisposalList', data)
+    return request.get('/material/scrap/obtainDisposalList', { params: data })
 }
 /* 处置发送接口 */
 export const submitDispositionApi = (data) => {
     return request.post('/material/scrap/obtainDisposal', data)
 }
 
+
diff --git a/sgzb-ui/src/components/FormModel/index.vue b/sgzb-ui/src/components/FormModel/index.vue
index 06c8cc7e..742b699c 100644
--- a/sgzb-ui/src/components/FormModel/index.vue
+++ b/sgzb-ui/src/components/FormModel/index.vue
@@ -42,6 +42,7 @@
                     :options="item.f_selList"
                     :props="item.optionProps"
                     :show-all-levels="false"
+                    @change="casCadeChange"
                     clearable
                     style="width: 240px"
                 />
@@ -86,6 +87,12 @@
                     return []
                 },
             },
+            routerParams: {
+                type: String,
+                default: () => {
+                    return null
+                },
+            },
         },
         data() {
             return {
@@ -98,6 +105,12 @@
                 this.$set(this.queryParams, e.f_model, '')
             })
         },
+        mounted() {
+            this.queryParams.keyword = this.routerParams
+            if (this.queryParams.keyword) {
+                this.$emit('queryList', this.queryParams)
+            }
+        },
         methods: {
             /* 查询按钮 */
             handleQuery() {
@@ -108,6 +121,10 @@
                 this.$refs.queryForm.resetFields()
                 this.$emit('queryList', this.queryParams, 'reset')
             },
+            /* 级联选择框的change事件 */
+            casCadeChange(val) {
+                this.queryParams.type = val[val.length - 1]
+            },
         },
     }
 </script>
diff --git a/sgzb-ui/src/components/TableModel/index.vue b/sgzb-ui/src/components/TableModel/index.vue
index 9af0289d..1a05cc31 100644
--- a/sgzb-ui/src/components/TableModel/index.vue
+++ b/sgzb-ui/src/components/TableModel/index.vue
@@ -3,6 +3,7 @@
         <!-- 查询表单 -->
         <FormModel
             :formLabel="config.formLabel"
+            :routerParams="config.routerParams"
             @queryList="queryList"
             v-if="config.isFormShow"
         >
@@ -19,6 +20,10 @@
             ref="tableRef"
             select-on-indeterminate
             @selection-change="handleSelectionChange"
+            v-loading="loading"
+            element-loading-text="数据正在加载，请稍后"
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(0, 0, 0, 0.6)"
         >
             <el-table-column
                 type="selection"
@@ -140,6 +145,7 @@
                 },
                 /* 操作列显示隐藏数据源 */
                 columCheckList: [],
+                loading:false
             }
         },
 
@@ -181,11 +187,13 @@
                     this.pageParams,
                     this.sendParams,
                 )
+                this.loading = true
                 const res = await this.sendApi(this.pageParams)
+                this.loading = false
 
                 if (res.code == 200) {
-                    this.tableList = res.rows
-                    this.total = res.total
+                    this.tableList = res.rows || res.data.rows
+                    this.total = res.total || res.data.total
                 }
             },
 
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index 4cad01f1..b4d27604 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -8,9 +8,9 @@
             v-show="showSearch"
             label-width="80px"
         >
-            <el-form-item label="关键字" prop="keyword">
+            <el-form-item label="关键字" prop="keyWord">
                 <el-input
-                    v-model="queryParams.keyword"
+                    v-model="queryParams.keyWord"
                     placeholder="请输入关键字"
                     clearable
                     style="width: 240px"
@@ -474,7 +474,7 @@ export default {
                 time: [],
                 unitId: null,
                 proId: null,
-                keyword: '',
+                keyWord: '',
                 types: 2,
 
                 pageNum: 1,
@@ -531,6 +531,7 @@ export default {
         }
     },
     created() {
+        this.queryParams.keyWord = this.$route.query?.keyWord
         this.GetUserInfo()
         // this.getList();
 
@@ -552,7 +553,7 @@ export default {
             const params = {
                 unitId: this.queryParams.unitId,
                 projectId: this.queryParams.proId,
-                keyWord: this.queryParams.keyword,
+                keyWord: this.queryParams.keyWord,
                 startTime: this.queryParams.time && this.queryParams.time[0],
                 endTime: this.queryParams.time && this.queryParams.time[1],
                 types: this.queryParams.types,
@@ -621,6 +622,7 @@ export default {
         resetQuery() {
             this.queryParams.time = []
             this.resetForm('queryForm')
+             this.queryParams.keyWord = ''
             this.GetUnitData()
             this.GetProData()
             this.handleQuery()
@@ -735,17 +737,6 @@ export default {
             })
         },
     },
-    watch: {
-        $route: {
-            handler(to) {
-                if (to.query.keyWord) {
-                    this.queryParams.keyWord = to.query.keyWord
-                }
-            },
-            deep: true,
-            immediate: true,
-        },
-    },
 }
 </script>
 
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index ac6e128b..a5bd8405 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -118,7 +118,12 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="primary" plain size="mini" @click="handleAdd"  v-hasPermi="['return:review']"
+                <el-button
+                    type="primary"
+                    plain
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['return:review']"
                     >退料申请</el-button
                 >
             </el-col>
@@ -563,470 +568,471 @@
 </template>
 
 <script>
-import { listPartTypeApi } from '@/api/repairTest/repair'
-import {
-    ApiGetBackApplyList,
-    getViewByApply,
-    backApplyDelApi,
-    submitBackApplyApi,
-} from '@/api/claimAndRefund/return.js'
-import { getInfo, h } from '@/api/login'
-import {
-    getUnitData,
-    getProData,
-    getAgreementInfoById,
-    // getUseNumByTypeId
-} from '@/api/claimAndRefund/receive.js'
-import dialogForm from './dialogForm.vue'
-import Tree from './tree.vue'
-// 10:42开始日期startTime,结束日期endTime     机具类型typeId
-// http://localhost/claimAndRefund/return/returnApply
-export default {
-    name: '',
-    dicts: ['sys_normal_disable'],
-    components: { dialogForm, Tree },
-    data() {
-        return {
-            fullscreenLoading: false,
-            type: '',
-            isShowOneFlag: false,
-            priKey: '',
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 字典表格数据
-            typeList: [],
-            // 弹出层标题
-            title: '',
-            // 是否显示弹出层
-            open: false,
-            // 日期范围
-            dateRange: [],
-            deptList: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                keyWord: '', //关键字
-                unitId: '', //单位id
-                lotId: '', //工程id
-                taskStatus: '', //状态
-                typeId: '', //工机具类型
-                time: '',
-                agreementCode: '', //协议
-                startTime: '',
-                endTime: '',
-                proId: '',
-            },
-            dialogQueryParams: {
-                pageNum: 1,
-                pageSize: 10,
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-                dictName: [
+    import { listPartTypeApi } from '@/api/repairTest/repair'
+    import {
+        ApiGetBackApplyList,
+        getViewByApply,
+        backApplyDelApi,
+        submitBackApplyApi,
+    } from '@/api/claimAndRefund/return.js'
+    import { getInfo, h } from '@/api/login'
+    import {
+        getUnitData,
+        getProData,
+        getAgreementInfoById,
+        // getUseNumByTypeId
+    } from '@/api/claimAndRefund/receive.js'
+    import dialogForm from './dialogForm.vue'
+    import Tree from './tree.vue'
+    // 10:42开始日期startTime,结束日期endTime     机具类型typeId
+    // http://localhost/claimAndRefund/return/returnApply
+    export default {
+        name: '',
+        dicts: ['sys_normal_disable'],
+        components: { dialogForm, Tree },
+        data() {
+            return {
+                fullscreenLoading: false,
+                type: '',
+                isShowOneFlag: false,
+                priKey: '',
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 字典表格数据
+                typeList: [],
+                // 弹出层标题
+                title: '',
+                // 是否显示弹出层
+                open: false,
+                // 日期范围
+                dateRange: [],
+                deptList: [],
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    keyWord: '', //关键字
+                    unitId: '', //单位id
+                    lotId: '', //工程id
+                    taskStatus: '', //状态
+                    typeId: '', //工机具类型
+                    time: '',
+                    agreementCode: '', //协议
+                    startTime: '',
+                    endTime: '',
+                    proId: '',
+                },
+                dialogQueryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                },
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    dictName: [
+                        {
+                            required: true,
+                            message: '字典名称不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                    dictType: [
+                        {
+                            required: true,
+                            message: '字典类型不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+                openOne: false,
+                openTwo: false,
+                openTextOne: '',
+                openTextTwo: '',
+                openTextThree: '',
+                companyId: '',
+                deptOptions: [],
+                unitList: [],
+                proList: [],
+                taskStatusList: [
                     {
-                        required: true,
-                        message: '字典名称不能为空',
-                        trigger: 'blur',
+                        name: '待退料审核',
+                        id: '37',
+                    },
+                    {
+                        name: '退料审核通过',
+                        id: '38',
+                    },
+                    {
+                        name: '退料核查中',
+                        id: '39',
+                    },
+                    {
+                        name: '退料完成',
+                        id: '40',
+                    },
+                    {
+                        name: '退料审核驳回',
+                        id: '101',
                     },
                 ],
-                dictType: [
-                    {
-                        required: true,
-                        message: '字典类型不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-            },
-            openOne: false,
-            openTwo: false,
-            openTextOne: '',
-            openTextTwo: '',
-            openTextThree: '',
-            companyId: '',
-            deptOptions: [],
-            unitList: [],
-            proList: [],
-            taskStatusList: [
-                {
-                    name: '待退料审核',
-                    id: '37',
-                },
-                {
-                    name: '退料审核通过',
-                    id: '38',
-                },
-                {
-                    name: '退料核查中',
-                    id: '39',
-                },
-                {
-                    name: '退料完成',
-                    id: '40',
-                },
-                {
-                    name: '退料审核驳回',
-                    id: '101',
-                },
-            ],
-            rowObj: {},
-            loadingType: '',
-            loadingTotal: 0,
-            loadingList: [],
-        }
-    },
-    created() {
-        // this.getList();
-        this.initSelectData()
-        this.InitIGetInfo()
-        this.getTree()
-    },
-    methods: {
-        getTree() {
-            listPartTypeApi().then((response) => {
-                // console.log('🚀 ~ listPartTypeApi ~ response:', response);
-                this.deptList = response.data
-            })
-        },
-        selectDrop(value) {
-            this.queryParams.typeId = value
-        },
-
-        /** 查询字典类型列表 startTime,结束日期endTime  */
-        async getList() {
-            this.loading = true
-            if (this.queryParams.time && this.queryParams.time.length > 0) {
-                this.queryParams.startTime = this.queryParams.time[0]
-                this.queryParams.endTime = this.queryParams.time[1]
+                rowObj: {},
+                loadingType: '',
+                loadingTotal: 0,
+                loadingList: [],
             }
-
-            try {
-                let params = {
-                    // companyId: this.companyId,
-                    ...this.queryParams,
-                }
-                const res = await ApiGetBackApplyList(params)
-                this.typeList = res.data.rows
-                this.total = res.data.total
-                this.loading = false
-            } catch (error) {}
         },
-        // 取消按钮
-        cancel() {
-            this.open = false
-            this.reset()
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                dictId: undefined,
-                dictName: undefined,
-                dictType: undefined,
-                status: '0',
-                remark: undefined,
-            }
-            this.resetForm('form')
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.queryParams.time = null
-            // this.resetForm("queryForm");
-            this.$refs.queryForm.resetFields()
-            this.$refs.mychildSon.inputValue = ''
+        created() {
+            // this.getList();
             this.initSelectData()
-            this.handleQuery()
+            this.InitIGetInfo()
+            this.getTree()
         },
-        /** 新增按钮操作 */
-        handleAdd() {
-            // this.reset();
-            // // this.open = true;
-            // // this.title = "计划借调";
-            this.$tab.closeOpenPage('/claimAndRefund/return/returnApplyAdd')
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map((item) => item.dictId)
-            this.single = selection.length != 1
-            this.multiple = !selection.length
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.$tab.closeOpenPage({
-                path: '/claimAndRefund/return/returnApplyAdd',
-                query: {
-                    Id: row.id,
-                    isEdit: true,
-                },
-            })
-        },
-        // 退料单
-        handleUpdateOrder() {
-            this.title = '查看'
-            this.isShowOneFlag = true
-        },
-        // 提交
-        handleSubmit() {
-            this.title = '确认操作'
-            this.openTextOne = '确认提交申请么?'
-            this.openTextTwo = '确认提交申请么?'
-            this.openOne = true
-        },
-        submitOpenOneForm() {
-            this.openTextThree = '提交成功！'
-            this.openTwo = true
-        },
-        /** 提交按钮 */
-        submitForm: function () {
-            this.$refs['queryForm1'].validate((valid) => {
-                if (valid) {
-                    let backApplyInfo = []
-                    for (let i = 0; i < this.loadingList.length; i++) {
-                        this.loadingList[i].companyId = this.companyId
-                    }
-                    backApplyInfo.push({
-                        backPerson: '张三',
-                        phone: '1234578988',
-                        remark: '1425备注',
-                        backTime: '2023-12-14',
-                        // backPerson: this.dialogQueryParams.backPerson,
-                        // phone: this.dialogQueryParams.phone,
-                        // remark: this.dialogQueryParams.remark,
-                        // backTime: this.dialogQueryParams.backTime,
-                        companyId: this.companyId,
-                    })
-                    let params = {
-                        companyId: this.companyId,
-                        agreementId: this.rowObj.agreementId,
-                        backApplyInfo: JSON.stringify(backApplyInfo),
-                        backApplyDetails: JSON.stringify(this.loadingList),
-                    }
-                    console.log('param----', params)
-                    submitBackApplyApi(params).then((res) => {})
-                    // if (this.form.dictId != undefined) {
-                    //   updateType(this.form).then(response => {
-                    //     this.$modal.msgSuccess("修改成功");
-                    //     this.open = false;
-                    //     this.getList();
-                    //   });
-                    // } else {
-                    //   addType(this.form).then(response => {
-                    //     this.$modal.msgSuccess("新增成功");
-                    //     this.open = false;
-                    //     this.getList();
-                    //   });
-                    // }
-                } else {
+        methods: {
+            getTree() {
+                listPartTypeApi().then((response) => {
+                    // console.log('🚀 ~ listPartTypeApi ~ response:', response);
+                    this.deptList = response.data
+                })
+            },
+            selectDrop(value) {
+                this.queryParams.typeId = value
+            },
+
+            /** 查询字典类型列表 startTime,结束日期endTime  */
+            async getList() {
+                this.loading = true
+                if (this.queryParams.time && this.queryParams.time.length > 0) {
+                    this.queryParams.startTime = this.queryParams.time[0]
+                    this.queryParams.endTime = this.queryParams.time[1]
                 }
-            })
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            let param = {
-                id: row.id + '',
-            }
-            this.$modal
-                .confirm('是否确认删除所选择的数据项？')
-                .then(() => {
-                    return backApplyDelApi(param)
-                })
-                .then(() => {
-                    this.getList()
-                    // this.$modal.msgSuccess('删除成功');
-                    this.$message.success('操作成功!')
-                })
-                .catch(() => {
-                    // this.$modal.msgError('删除失败');
-                })
-        },
-        handlePrint(row) {
-            this.isShowOneFlag = true
-            this.rowObj = row
-        },
 
-        handleSee(row, type) {
-            this.dialogQueryParams.unitName = row.unitName
-            this.dialogQueryParams.lotName = row.lotName
-            this.dialogQueryParams.agreementCode = row.agreementCode
-            this.dialogQueryParams.backPerson = row.backPerson
-            this.dialogQueryParams.phone = row.phone
-            this.dialogQueryParams.backTime = row.backTime + ''
-            this.$set(this.dialogQueryParams, 'keyWord', '')
-            this.loadingType = type
-            this.rowObj = row
-            this.open = true
-            this.getDialogList()
-        },
-        handlUpdate(row, type) {
-            this.loadingType = type
-            this.rowObj = row
-            this.open = true
-            this.getDialogList()
-        },
+                try {
+                    let params = {
+                        // companyId: this.companyId,
+                        ...this.queryParams,
+                    }
+                    const res = await ApiGetBackApplyList(params)
+                    this.typeList = res.data.rows
+                    this.total = res.data.total
+                    this.loading = false
+                } catch (error) {}
+            },
+            // 取消按钮
+            cancel() {
+                this.open = false
+                this.reset()
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    dictId: undefined,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: '0',
+                    remark: undefined,
+                }
+                this.resetForm('form')
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1
+                this.getList()
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.queryParams.time = null
+                // this.resetForm("queryForm");
+                this.$refs.queryForm.resetFields()
+                this.$refs.mychildSon.inputValue = ''
+                this.queryParams.keyWord = ''
+                this.initSelectData()
+                this.handleQuery()
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                // this.reset();
+                // // this.open = true;
+                // // this.title = "计划借调";
+                this.$tab.closeOpenPage('/claimAndRefund/return/returnApplyAdd')
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map((item) => item.dictId)
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                this.$tab.closeOpenPage({
+                    path: '/claimAndRefund/return/returnApplyAdd',
+                    query: {
+                        Id: row.id,
+                        isEdit: true,
+                    },
+                })
+            },
+            // 退料单
+            handleUpdateOrder() {
+                this.title = '查看'
+                this.isShowOneFlag = true
+            },
+            // 提交
+            handleSubmit() {
+                this.title = '确认操作'
+                this.openTextOne = '确认提交申请么?'
+                this.openTextTwo = '确认提交申请么?'
+                this.openOne = true
+            },
+            submitOpenOneForm() {
+                this.openTextThree = '提交成功！'
+                this.openTwo = true
+            },
+            /** 提交按钮 */
+            submitForm: function () {
+                this.$refs['queryForm1'].validate((valid) => {
+                    if (valid) {
+                        let backApplyInfo = []
+                        for (let i = 0; i < this.loadingList.length; i++) {
+                            this.loadingList[i].companyId = this.companyId
+                        }
+                        backApplyInfo.push({
+                            backPerson: '张三',
+                            phone: '1234578988',
+                            remark: '1425备注',
+                            backTime: '2023-12-14',
+                            // backPerson: this.dialogQueryParams.backPerson,
+                            // phone: this.dialogQueryParams.phone,
+                            // remark: this.dialogQueryParams.remark,
+                            // backTime: this.dialogQueryParams.backTime,
+                            companyId: this.companyId,
+                        })
+                        let params = {
+                            companyId: this.companyId,
+                            agreementId: this.rowObj.agreementId,
+                            backApplyInfo: JSON.stringify(backApplyInfo),
+                            backApplyDetails: JSON.stringify(this.loadingList),
+                        }
+                        console.log('param----', params)
+                        submitBackApplyApi(params).then((res) => {})
+                        // if (this.form.dictId != undefined) {
+                        //   updateType(this.form).then(response => {
+                        //     this.$modal.msgSuccess("修改成功");
+                        //     this.open = false;
+                        //     this.getList();
+                        //   });
+                        // } else {
+                        //   addType(this.form).then(response => {
+                        //     this.$modal.msgSuccess("新增成功");
+                        //     this.open = false;
+                        //     this.getList();
+                        //   });
+                        // }
+                    } else {
+                    }
+                })
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                let param = {
+                    id: row.id + '',
+                }
+                this.$modal
+                    .confirm('是否确认删除所选择的数据项？')
+                    .then(() => {
+                        return backApplyDelApi(param)
+                    })
+                    .then(() => {
+                        this.getList()
+                        // this.$modal.msgSuccess('删除成功');
+                        this.$message.success('操作成功!')
+                    })
+                    .catch(() => {
+                        // this.$modal.msgError('删除失败');
+                    })
+            },
+            handlePrint(row) {
+                this.isShowOneFlag = true
+                this.rowObj = row
+            },
 
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download(
-                'material/backApply/export',
-                {
-                    ...this.queryParams,
-                },
-                `退料申请单_${new Date().getTime()}.xlsx`,
-            )
-        },
-        getDialogList() {
-            let params = {
-                id: this.rowObj.id,
-                agreementId: this.rowObj.agreementId,
-                keyWord: this.dialogQueryParams.keyWord,
-                pageNum: this.dialogQueryParams.pageNum,
-                pageSize: this.dialogQueryParams.pageSize,
-            }
-            getViewByApply(params).then((res) => {
-                console.log(res)
-                this.loadingList = res.data.rows
-                /*                    this.loadingList.forEach(item=>{
+            handleSee(row, type) {
+                this.dialogQueryParams.unitName = row.unitName
+                this.dialogQueryParams.lotName = row.lotName
+                this.dialogQueryParams.agreementCode = row.agreementCode
+                this.dialogQueryParams.backPerson = row.backPerson
+                this.dialogQueryParams.phone = row.phone
+                this.dialogQueryParams.backTime = row.backTime + ''
+                this.$set(this.dialogQueryParams, 'keyWord', '')
+                this.loadingType = type
+                this.rowObj = row
+                this.open = true
+                this.getDialogList()
+            },
+            handlUpdate(row, type) {
+                this.loadingType = type
+                this.rowObj = row
+                this.open = true
+                this.getDialogList()
+            },
+
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'material/backApply/export',
+                    {
+                        ...this.queryParams,
+                    },
+                    `退料申请单_${new Date().getTime()}.xlsx`,
+                )
+            },
+            getDialogList() {
+                let params = {
+                    id: this.rowObj.id,
+                    agreementId: this.rowObj.agreementId,
+                    keyWord: this.dialogQueryParams.keyWord,
+                    pageNum: this.dialogQueryParams.pageNum,
+                    pageSize: this.dialogQueryParams.pageSize,
+                }
+                getViewByApply(params).then((res) => {
+                    console.log(res)
+                    this.loadingList = res.data.rows
+                    /*                    this.loadingList.forEach(item=>{
                         getUseNumByTypeId({ typeId:item.typeId }).then(res=>{
                             item.useNum = res.data
                         })
 
                     })*/
-                this.loadingTotal = res.data.total
-            })
-        },
-        InitIGetInfo() {
-            getInfo().then((res) => {
-                this.companyId = res.user.companyId
-                this.getList()
-            })
-        },
-        handleNodeClick(ev) {
-            console.log(ev)
-        },
-        initSelectData() {
-            this.GetUnitData()
-            this.GetProData()
-        },
-        // 获取 来往单位 列表数据
-        async GetUnitData() {
-            const params = {}
-            const res = await getUnitData(params)
-            this.unitList = res.data
-        },
-        // 获取 工程名称 列表数据
-        async GetProData() {
-            const params = {
-                id: this.queryParams.unitId,
-            }
-            const res = await getProData(params)
-            this.proList = res.data
-        },
-        // 获取 协议ID 列表数据
-        async InitGetAgreementInfoById() {
-            const { unitId, proId } = this.queryParams
-            if (!unitId || !proId) {
-                return
-            }
-            const params = {
-                unitId: unitId,
-                projectId: proId,
-            }
-            const res = await getAgreementInfoById(params)
-            // this.proList = res.data
-            this.queryParams.agreementCode = res.data.agreementCode
-        },
-        getAgreementByUnitAndProId() {
-            this.InitGetAgreementInfoById()
-        },
-        getAgreementByProId() {
-            this.InitGetAgreementInfoById()
-        },
-        getAgreementByUnit() {
-            this.GetProData()
-        },
-        handleQuery1() {
-            this.getDialogList()
-        },
-        resetQuery1() {
-            this.dialogQueryParams.keyWord = ''
-            this.getDialogList()
-        },
-    },
-    watch: {
-        $route: {
-            handler(to) {
-                if (to.query.keyWord) {
-                    this.queryParams.keyWord = to.query.keyWord
-                }
+                    this.loadingTotal = res.data.total
+                })
+            },
+            InitIGetInfo() {
+                getInfo().then((res) => {
+                    this.companyId = res.user.companyId
+                    this.getList()
+                })
+            },
+            handleNodeClick(ev) {
+                console.log(ev)
+            },
+            initSelectData() {
+                this.GetUnitData()
+                this.GetProData()
+            },
+            // 获取 来往单位 列表数据
+            async GetUnitData() {
+                const params = {}
+                const res = await getUnitData(params)
+                this.unitList = res.data
+            },
+            // 获取 工程名称 列表数据
+            async GetProData() {
+                const params = {
+                    id: this.queryParams.unitId,
+                }
+                const res = await getProData(params)
+                this.proList = res.data
+            },
+            // 获取 协议ID 列表数据
+            async InitGetAgreementInfoById() {
+                const { unitId, proId } = this.queryParams
+                if (!unitId || !proId) {
+                    return
+                }
+                const params = {
+                    unitId: unitId,
+                    projectId: proId,
+                }
+                const res = await getAgreementInfoById(params)
+                // this.proList = res.data
+                this.queryParams.agreementCode = res.data.agreementCode
+            },
+            getAgreementByUnitAndProId() {
+                this.InitGetAgreementInfoById()
+            },
+            getAgreementByProId() {
+                this.InitGetAgreementInfoById()
+            },
+            getAgreementByUnit() {
+                this.GetProData()
+            },
+            handleQuery1() {
+                this.getDialogList()
+            },
+            resetQuery1() {
+                this.dialogQueryParams.keyWord = ''
+                this.getDialogList()
             },
-            deep: true,
-            immediate: true,
         },
-    },
-}
+        watch: {
+            $route: {
+                handler(to) {
+                    if (to.query.keyWord) {
+                        this.queryParams.keyWord = to.query.keyWord
+                    }
+                },
+                deep: true,
+                immediate: true,
+            },
+        },
+    }
 </script>
 <style lang="scss" scoped>
-.submit_box {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-
-    .submit_box_title {
+    .submit_box {
         display: flex;
-        flex-direction: column;
-        margin-left: 15px;
+        justify-content: flex-start;
+        align-items: center;
 
-        :first-child {
-            font-size: 14px;
+        .submit_box_title {
+            display: flex;
+            flex-direction: column;
+            margin-left: 15px;
+
+            :first-child {
+                font-size: 14px;
+                font-weight: 600;
+            }
+
+            :last-child {
+                margin-top: 6px;
+                font-size: 12px;
+            }
+        }
+    }
+
+    .submit_box_two {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-items: center;
+        margin-left: 30%;
+
+        .submit_box_title {
+            display: flex;
+            flex-direction: column;
+            margin-left: 10px;
+            font-size: 18px;
             font-weight: 600;
         }
-
-        :last-child {
-            margin-top: 6px;
-            font-size: 12px;
-        }
     }
-}
 
-.submit_box_two {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    align-items: center;
-    margin-left: 30%;
-
-    .submit_box_title {
+    ::v-deep.el-table .fixed-width .el-button--mini {
+        width: 60px !important;
+        margin-bottom: 10px;
+    }
+    .dialog-footer {
         display: flex;
-        flex-direction: column;
-        margin-left: 10px;
-        font-size: 18px;
-        font-weight: 600;
+        justify-content: flex-end;
+        align-items: center;
     }
-}
-
-::v-deep.el-table .fixed-width .el-button--mini {
-    width: 60px !important;
-    margin-bottom: 10px;
-}
-.dialog-footer {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-}
 </style>
diff --git a/sgzb-ui/src/views/claimAndRefund/returnScrap/config.js b/sgzb-ui/src/views/claimAndRefund/returnScrap/config.js
new file mode 100644
index 00000000..eed82bc4
--- /dev/null
+++ b/sgzb-ui/src/views/claimAndRefund/returnScrap/config.js
@@ -0,0 +1,110 @@
+import {
+    getUnitInfoSelectApi,
+    listPartTypeApi,
+} from '@/api/repairTest/repair'
+import { getProjectList } from '@/api/claimAndRefund/receive'
+
+let unitList = []
+let proList = []
+let typeList = []
+
+export const config = {
+    handleColShow: true, // 是否显示操作列
+    pageShow: true,  // 是否显示分页组件
+    isSelShow: true,// 表格是否需要复选框
+    isFormShow: true, // 是否显示表单查询组件
+    handleWidth: '160px', // 操作列宽度
+    formLabel: [
+        { f_label: '关键字', f_model: 'keyword', f_type: 'ipt' },
+        { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
+        { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
+        { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
+        { f_label: '预报废单号', f_model: 'scrapNum', f_type: 'ipt', },
+        {
+            f_label: '退料状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [
+                { label: '待提交', value: 124 },
+                { label: '审核中', value: 58 },
+                { label: '已驳回', value: 61 },
+                { label: '已通过', value: 59 },
+            ]
+        },
+        { f_label: '创建时间', f_model: 'time', f_type: 'date' },
+    ],
+    columnsList: [
+        { t_width: '55px', t_props: '', t_label: '序号' },
+        { t_props: 'scrapNum', t_label: '预报废单号' },
+        { t_props: 'scrapNum', t_label: '退料单号' },
+        { t_props: 'repairNum', t_label: '单位名称' },
+        { t_props: 'repairNum', t_label: '工程名称' },
+        { t_props: 'itemType', t_label: '机具类型' },
+        { t_props: 'createBy', t_label: '任务创建人' },
+        { t_props: 'createTime', t_label: '任务创建时间' },
+        { t_props: 'createTime', t_label: '审批状态' },
+        { t_props: 'createTime', t_label: '驳回原因' },
+        { t_props: '', t_label: '审核状态', t_slot: 'type' },
+    ],
+    routerParams: ''
+}
+
+export const dialogConfig = {
+    outerWidth: '70%',
+    outerTitle: '',
+    outerVisible: false,
+    innerWidth: '50%',
+    innerTitle: '',
+    innerVisible: false,
+    handleColShow: false, // 是否显示操作列
+    pageShow: false,  // 是否显示分页组件
+    isSelShow: false,// 表格是否需要复选框
+    isFormShow: true, // 是否显示表单查询组件
+    formLabel: [
+        { f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' },
+    ],
+    columnsList: [
+        { t_width: '55px', t_props: '', t_label: '序号' },
+        { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
+        { 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' },
+    ],
+
+}
+
+export const getSelList = () => {
+    new Promise(async (resolve) => {
+        const { data: unitRes } = await getUnitInfoSelectApi()
+        unitList = unitRes.map((e) => {
+            e.value = e.unitId
+            e.label = e.unitName
+            return e
+        })
+        const { data: proRes } = await getProjectList()
+        proList = proRes.map((e) => {
+            e.value = e.projectId
+            e.label = e.projectName
+            return e
+        })
+        const { data: typeRes } = await listPartTypeApi()
+        typeList = typeRes
+        resolve()
+    }).then(() => {
+        config.formLabel.map((item) => {
+            if (item.f_model === 'backUnit') {
+                item.f_selList = unitList
+                return item
+            }
+            if (item.f_model === 'backPro') {
+                item.f_selList = proList
+                return item
+            }
+            if (item.f_model === 'type') {
+                item.f_selList = typeList
+                return item
+            }
+        })
+    }).catch(() => {
+
+    })
+}
diff --git a/sgzb-ui/src/views/claimAndRefund/returnScrap/index.vue b/sgzb-ui/src/views/claimAndRefund/returnScrap/index.vue
new file mode 100644
index 00000000..c8f0dd29
--- /dev/null
+++ b/sgzb-ui/src/views/claimAndRefund/returnScrap/index.vue
@@ -0,0 +1,62 @@
+<template>
+    <!-- 退料报废页面 -->
+    <div class="app-container">
+        <TableModel :config="config">
+            <template slot="export">
+                <el-row :gutter="10" class="mb8">
+                    <el-button
+                        type="success"
+                        plain
+                        icon="el-icon-download"
+                        size="mini"
+                        >导出数据</el-button
+                    >
+                </el-row>
+            </template>
+
+              <!-- 列表操作栏 -->
+            <template slot="handle" slot-scope="{ data }">
+                <el-button size="mini" type="text" @click="handlePreview(data)">
+                    查看
+                </el-button>
+                <el-button
+                    size="mini"
+                    type="text"
+                    @click="handleRepair(data)"
+                >
+                    申请退料
+                </el-button>
+            </template>
+        </TableModel>
+    </div>
+</template>
+
+<script>
+    import TableModel from '@/components/TableModel'
+    import DialogModel from '@/components/DialogModel'
+    import { config, dialogConfig, getSelList } from './config.js'
+    export default {
+        components: {
+            TableModel,
+            DialogModel,
+        },
+        data() {
+            return {
+                config,
+                dialogConfig,
+                getSelList,
+            }
+        },
+        created() {
+            this.getSelList()
+        },
+        methods:{
+            /* 查看 */
+            handlePreview() {},
+            /* 维修 */
+            handleRepair() {}
+        }
+    }
+</script>
+
+<style></style>
diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue
index 72d16ed2..17da6efe 100644
--- a/sgzb-ui/src/views/index.vue
+++ b/sgzb-ui/src/views/index.vue
@@ -315,6 +315,26 @@
                         taskTypeId: 41,
                         routerPath: 'repairTest/repair/repair',
                     },
+                    /* 维修审核 */
+                    {
+                        taskTypeId: 45,
+                        routerPath: 'repairTest/repair/repair',
+                    },
+                    /* 修试入库任务 */
+                    {
+                        taskTypeId: 50,
+                        routerPath: 'store/warehousing/repairWarehousing',
+                    },
+                    /* 修试入库任务 */
+                    {
+                        taskTypeId: 57,
+                        routerPath: 'scrap/manage/scrapAuditing',
+                    },
+                    /* 修试入库任务 */
+                    {
+                        taskTypeId: 67,
+                        routerPath: 'store/newBuy/newAccessoryList',
+                    },
                 ],
 
                 /* 催办弹框 */
@@ -373,6 +393,7 @@
              * 列表查看操作===========================================================
              */
             handlePreview(id, key) {
+                console.log(id, 'key---', key)
                 const [routerInfo] = this.previewRouterList.filter(
                     (e) => e.taskTypeId == id,
                 )
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index 73694adf..47e70068 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -644,7 +644,7 @@ export default {
             repairTitle: '查看',
         }
     },
-    created() {
+    created() {  
         getUnitInfoSelectApi().then((res) => {
             this.unitInfoSelectList = res.data
         })
@@ -656,8 +656,8 @@ export default {
         })
     },
     mounted() {
-        this.getTree()
         this.getList()
+        this.getTree()
     },
     methods: {
         onClose() {
@@ -745,6 +745,7 @@ export default {
             this.dateRange = []
             this.queryParams.backUnit = ''
             this.queryParams.backPro = ''
+            this.queryParams.keyword = ''
             this.resetForm('queryForm')
             this.$refs.mychildSon.inputValue = ''
             this.handleQuery()
@@ -1073,6 +1074,18 @@ export default {
                 .catch(() => {})
         },
     },
+    watch: {
+        $route: {
+            handler(to) {
+                if (to.query.keyWord) {
+                    this.queryParams.keyword = to.query.keyWord
+                    this.getList()
+                }
+            },
+            deep: true,
+            immediate:true
+        },
+    },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/sgzb-ui/src/views/repairTest/repairScrap/config.js b/sgzb-ui/src/views/repairTest/repairScrap/config.js
new file mode 100644
index 00000000..dab8892b
--- /dev/null
+++ b/sgzb-ui/src/views/repairTest/repairScrap/config.js
@@ -0,0 +1,110 @@
+import {
+    getUnitInfoSelectApi,
+    listPartTypeApi,
+} from '@/api/repairTest/repair'
+import { getProjectList } from '@/api/claimAndRefund/receive'
+
+let unitList = []
+let proList = []
+let typeList = []
+
+export const config = {
+    handleColShow: true, // 是否显示操作列
+    pageShow: true,  // 是否显示分页组件
+    isSelShow: true,// 表格是否需要复选框
+    isFormShow: true, // 是否显示表单查询组件
+    handleWidth: '160px', // 操作列宽度
+    formLabel: [
+        { f_label: '关键字', f_model: 'keyword', f_type: 'ipt' },
+        { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
+        { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
+        { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
+        { f_label: '预报废单号', f_model: 'scrapNum', f_type: 'ipt', },
+        {
+            f_label: '维修状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [
+                { label: '待提交', value: 124 },
+                { label: '审核中', value: 58 },
+                { label: '已驳回', value: 61 },
+                { label: '已通过', value: 59 },
+            ]
+        },
+        { f_label: '创建时间', f_model: 'time', f_type: 'date' },
+    ],
+    columnsList: [
+        { t_width: '55px', t_props: '', t_label: '序号' },
+        { t_props: 'scrapNum', t_label: '预报废单号' },
+        { t_props: 'scrapNum', t_label: '维修单号' },
+        { t_props: 'repairNum', t_label: '单位名称' },
+        { t_props: 'repairNum', t_label: '工程名称' },
+        { t_props: 'itemType', t_label: '机具类型' },
+        { t_props: 'createBy', t_label: '任务创建人' },
+        { t_props: 'createTime', t_label: '任务创建时间' },
+        { t_props: 'createTime', t_label: '审批状态' },
+        { t_props: 'createTime', t_label: '驳回原因' },
+        { t_props: '', t_label: '审核状态', t_slot: 'type' },
+    ],
+    routerParams: ''
+}
+
+export const dialogConfig = {
+    outerWidth: '70%',
+    outerTitle: '',
+    outerVisible: false,
+    innerWidth: '50%',
+    innerTitle: '',
+    innerVisible: false,
+    handleColShow: false, // 是否显示操作列
+    pageShow: false,  // 是否显示分页组件
+    isSelShow: false,// 表格是否需要复选框
+    isFormShow: true, // 是否显示表单查询组件
+    formLabel: [
+        { f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' },
+    ],
+    columnsList: [
+        { t_width: '55px', t_props: '', t_label: '序号' },
+        { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
+        { 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' },
+    ],
+
+}
+
+export const getSelList = () => {
+    new Promise(async (resolve) => {
+        const { data: unitRes } = await getUnitInfoSelectApi()
+        unitList = unitRes.map((e) => {
+            e.value = e.unitId
+            e.label = e.unitName
+            return e
+        })
+        const { data: proRes } = await getProjectList()
+        proList = proRes.map((e) => {
+            e.value = e.projectId
+            e.label = e.projectName
+            return e
+        })
+        const { data: typeRes } = await listPartTypeApi()
+        typeList = typeRes
+        resolve()
+    }).then(() => {
+        config.formLabel.map((item) => {
+            if (item.f_model === 'backUnit') {
+                item.f_selList = unitList
+                return item
+            }
+            if (item.f_model === 'backPro') {
+                item.f_selList = proList
+                return item
+            }
+            if (item.f_model === 'type') {
+                item.f_selList = typeList
+                return item
+            }
+        })
+    }).catch(() => {
+
+    })
+}
diff --git a/sgzb-ui/src/views/repairTest/repairScrap/index.vue b/sgzb-ui/src/views/repairTest/repairScrap/index.vue
new file mode 100644
index 00000000..775422df
--- /dev/null
+++ b/sgzb-ui/src/views/repairTest/repairScrap/index.vue
@@ -0,0 +1,62 @@
+<template>
+    <!-- 维修报废页面 -->
+    <div class="app-container">
+        <TableModel :config="config">
+            <template slot="export">
+                <el-row :gutter="10" class="mb8">
+                    <el-button
+                        type="success"
+                        plain
+                        icon="el-icon-download"
+                        size="mini"
+                        >导出数据</el-button
+                    >
+                </el-row>
+            </template>
+
+              <!-- 列表操作栏 -->
+            <template slot="handle" slot-scope="{ data }">
+                <el-button size="mini" type="text" @click="handlePreview(data)">
+                    查看
+                </el-button>
+                <el-button
+                    size="mini"
+                    type="text"
+                    @click="handleRepair(data)"
+                >
+                    维修
+                </el-button>
+            </template>
+        </TableModel>
+    </div>
+</template>
+
+<script>
+    import TableModel from '@/components/TableModel'
+    import DialogModel from '@/components/DialogModel'
+    import { config, dialogConfig, getSelList } from './config.js'
+    export default {
+        components: {
+            TableModel,
+            DialogModel,
+        },
+        data() {
+            return {
+                config,
+                dialogConfig,
+                getSelList,
+            }
+        },
+        created() {
+            this.getSelList()
+        },
+        methods:{
+            /* 查看 */
+            handlePreview() {},
+            /* 维修 */
+            handleRepair() {}
+        }
+    }
+</script>
+
+<style></style>
diff --git a/sgzb-ui/src/views/scrapManage/component/dialogModel.vue b/sgzb-ui/src/views/scrapManage/component/dialogModel.vue
deleted file mode 100644
index beb15e87..00000000
--- a/sgzb-ui/src/views/scrapManage/component/dialogModel.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-    <div>
-        <el-dialog
-            :width="width"
-            :title="title"
-            :visible.sync="dialogVisible"
-            :before-close="handleClose"
-            append-to-body
-        >
-            <slot></slot>
-            <slot name="preview"></slot>
-            <slot name="handleBtn"></slot>
-
-            <!-- 内层对话框 -->
-            <el-dialog
-                :title="innerTitle"
-                :width="innerWidth"
-                :visible.sync="innerDialogVisible"
-                :before-close="handleCloseInner"
-                append-to-body
-            >
-                <slot name="innerContent"></slot>
-                <slot name="innerHandleBtn"></slot>
-            </el-dialog>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-    export default {
-        props: {
-            title: {
-                type: String,
-                default: () => {
-                    return ''
-                },
-            },
-            innerTitle: {
-                type: String,
-                default: () => {
-                    return ''
-                },
-            },
-            dialogVisible: {
-                type: Boolean,
-                default: () => {
-                    return false
-                },
-            },
-            innerDialogVisible: {
-                type: Boolean,
-                default: () => {
-                    return false
-                },
-            },
-            width: {
-                type: String,
-                default: () => {
-                    return '70%'
-                },
-            },
-            innerWidth: {
-                type: String,
-                default: () => {
-                    return '30%'
-                },
-            },
-        },
-        methods: {
-            /* 右上角关闭外层 */
-            handleClose() {
-                /* 通知父组件更改弹框显示值 */
-                this.$emit('closeDialog', false)
-            },
-            /* 右上角关闭内层 */
-            handleCloseInner() {
-                /* 通知父组件更改弹框显示值 */
-                this.$emit('closeDialogInner', false)
-            },
-        },
-    }
-</script>
-
-<style></style>
diff --git a/sgzb-ui/src/views/scrapManage/component/formModel.vue b/sgzb-ui/src/views/scrapManage/component/formModel.vue
deleted file mode 100644
index 5c1eb711..00000000
--- a/sgzb-ui/src/views/scrapManage/component/formModel.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-    <!-- 查询表单 -->
-    <div>
-        <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            label-width="100px"
-        >
-            <el-form-item
-                v-for="(item, v) in formLabel"
-                :key="v"
-                :label="item.f_label"
-                :prop="item.f_model"
-            >
-                <el-input
-                    v-if="item.f_type === 'ipt'"
-                    v-model="queryParams[item.f_model]"
-                    :placeholder="`请输入${item.f_label}`"
-                    clearable
-                    style="width: 240px"
-                />
-                <el-select
-                    v-if="item.f_type === 'sel'"
-                    v-model="queryParams[item.f_model]"
-                    clearable
-                    filterable
-                    style="width: 240px"
-                    :placeholder="`请选择${item.f_label}`"
-                >
-                    <el-option
-                        v-for="(sel, v) in item.f_selList"
-                        :key="v"
-                        :label="sel.label"
-                        :value="sel.value"
-                    />
-                </el-select>
-                <el-cascader
-                    v-if="item.f_type === 'selCas'"
-                    :options="item.f_selList"
-                    :props="item.optionProps"
-                    :show-all-levels="false"
-                    clearable
-                    style="width: 240px"
-                />
-                <el-date-picker
-                    v-if="item.f_type === 'date'"
-                    v-model="queryParams[item.f_model]"
-                    style="width: 240px"
-                    value-format="yyyy-MM-dd"
-                    type="daterange"
-                    range-separator="-"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                />
-            </el-form-item>
-            <el-form-item>
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="handleQuery"
-                    >查询</el-button
-                >
-                <el-button
-                    type="warning"
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                    >重置</el-button
-                >
-            </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8" v-if="exportShow">
-            <slot></slot>
-            <!-- <el-col :span="1.5">
-                <el-button
-                    type="success"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    >导出数据</el-button
-                >
-            </el-col> -->
-        </el-row>
-    </div>
-</template>
-
-<script>
-    export default {
-        props: {
-            formLabel: {
-                type: Array,
-                default: () => {
-                    return []
-                },
-            },
-            /* 导出等按钮展示 */
-            exportShow: {
-                type: Boolean,
-                default: () => {
-                    return false
-                },
-            },
-        },
-        data() {
-            return {
-                queryParams: {},
-            }
-        },
-        created() {
-            this.formLabel.map((e) => {
-                this.$set(this.queryParams, e.f_model, '')
-            })
-        },
-        methods: {
-            /* 查询按钮 */
-            handleQuery() {
-                console.log('查询')
-                this.$emit('queryList', this.queryParams)
-            },
-            /* 重置按钮 */
-            resetQuery() {
-                this.$refs.queryForm.resetFields()
-                this.$emit('queryList', this.queryParams, 'reset')
-            },
-        },
-    }
-</script>
-
-<style></style>
diff --git a/sgzb-ui/src/views/scrapManage/component/scrapSource.vue b/sgzb-ui/src/views/scrapManage/component/scrapSource.vue
new file mode 100644
index 00000000..5cdfd0ce
--- /dev/null
+++ b/sgzb-ui/src/views/scrapManage/component/scrapSource.vue
@@ -0,0 +1,20 @@
+<template>
+    <div>
+        <template v-if="data.scrapSource === 1">退料</template>
+        <template v-if="data.scrapSource === 2">维修</template>
+        <template v-if="data.scrapSource === 3">盘点</template>
+    </div>
+</template>
+
+<script>
+    export default {
+        props:{
+            data:{
+                type:Object,
+                default:()=>{
+                    return {}
+                }
+            }
+        }
+    }
+</script>
diff --git a/sgzb-ui/src/views/scrapManage/component/tableModel.vue b/sgzb-ui/src/views/scrapManage/component/tableModel.vue
deleted file mode 100644
index a07b7471..00000000
--- a/sgzb-ui/src/views/scrapManage/component/tableModel.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<template>
-    <div>
-        <FormModel
-            :formLabel="formLabel"
-            @queryList="queryList"
-            :exportShow="exportShow"
-        >
-            <template>
-                <slot name="submitScrap" />
-            </template>
-        </FormModel>
-        <el-table
-            :data="tableList"
-            border
-            ref="tableRef"
-            select-on-indeterminate
-            @selection-change="handleSelectionChange"
-        >
-            <el-table-column
-                type="selection"
-                width="45"
-                align="center"
-                v-if="isSelShow"
-                :selectable="selectable"
-            />
-            <el-table-column
-                v-for="(item, v) in tableColumCheckProps"
-                :key="v"
-                :label="item.t_label"
-                :prop="item.t_props"
-                :width="item.t_width"
-                align="center"
-                show-overflow-tooltip
-            >
-                <template slot-scope="scope">
-                    <template v-if="item.t_slot">
-                        <slot :data="scope.row" :name="item.t_slot"></slot>
-                    </template>
-                    <template v-else>
-                        {{
-                            v === 0
-                                ? scope.$index + 1
-                                : scope.row[item.t_props] || '-'
-                        }}
-                    </template>
-                </template>
-            </el-table-column>
-            <el-table-column
-                align="center"
-                label="操作"
-                v-if="handleColShow"
-                :width="handleWidth"
-            >
-                <template slot-scope="{ row }">
-                    <slot :data="row"></slot>
-                </template>
-                <template slot="header">
-                    <el-popover
-                        placement="bottom"
-                        title="筛选列"
-                        width="200"
-                        trigger="click"
-                    >
-                        <span slot="reference" class="handel-text">操作</span>
-                        <div>
-                            <el-checkbox
-                                v-for="(check, index) in columCheckList"
-                                v-show="check.t_label != '序号'"
-                                :key="index"
-                                v-model="check.checked"
-                                >{{ check.t_label }}</el-checkbox
-                            >
-                        </div>
-                    </el-popover>
-                </template>
-            </el-table-column>
-        </el-table>
-        <pagination
-            v-if="pageShow"
-            :total="total"
-            :page.sync="pageParams.pageNum"
-            :limit.sync="pageParams.pageSize"
-            @pagination="queryList"
-        />
-    </div>
-</template>
-
-<script>
-    import FormModel from './formModel.vue'
-    export default {
-        components: {
-            FormModel,
-        },
-        props: {
-            tableProps: {
-                type: Array,
-                default: () => {
-                    return []
-                },
-            },
-            formLabel: {
-                type: Array,
-                default: () => {
-                    return []
-                },
-            },
-            sendApi: {
-                type: Function,
-                default: () => {
-                    return function () {}
-                },
-            },
-            handleColShow: {
-                type: Boolean,
-                default: () => {
-                    return true
-                },
-            },
-            exportShow: {
-                type: Boolean,
-                default: () => {
-                    return false
-                },
-            },
-            pageShow: {
-                type: Boolean,
-                default: () => {
-                    return false
-                },
-            },
-            /* 是否需要复选框 */
-            isSelShow: {
-                type: Boolean,
-                default: () => {
-                    return false
-                },
-            },
-            /* 操作栏宽度 */
-            handleWidth: {
-                type: String,
-                default: () => {
-                    return ''
-                },
-            },
-            /* 额外参数 */
-            sendParams: {
-                type: Object,
-                default: () => {
-                    return {}
-                },
-            },
-            /* 表格是否勾选 */
-            selectable: {
-                type: Function,
-                default: () => {
-                    return true
-                },
-            },
-        },
-        data() {
-            return {
-                total: 0,
-                tableList: [
-                    { demo: '123' },
-                    { demo: '123' },
-                    { demo: '123' },
-                    { demo: '123' },
-                    { demo: '123' },
-                ],
-                pageParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                },
-                columCheckList: [],
-            }
-        },
-        created() {
-            this.getList()
-            this.columCheckList = this.tableProps
-            this.columCheckList = this.columCheckList.map((e) => {
-                this.$set(e, 'checked', true)
-                return e
-            })
-        },
-        computed: {
-            tableColumCheckProps() {
-                return this.columCheckList.filter((e) => {
-                    return e.checked != false
-                })
-            },
-        },
-        methods: {
-            async queryList(val, reset) {
-                if (reset) {
-                    this.pageParams.pageNum = 1
-                    this.pageParams.pageSize = 10
-                }
-                this.pageParams = Object.assign(
-                    val,
-                    this.pageParams,
-                    this.sendParams,
-                )
-                this.pageParams.beginTime = val.time ? val.time[0] : ''
-                this.pageParams.endTime = val.time ? val.time[1] : ''
-                this.getList()
-            },
-
-            async getList() {
-                this.pageParams = Object.assign(
-                    this.pageParams,
-                    this.sendParams,
-                )
-                const res = await this.sendApi(this.pageParams)
-
-                if (res.code == 200) {
-                    this.tableList = res.rows
-                    this.total = res.total
-                }
-            },
-
-            /* 表格复选框 */
-            handleSelectionChange(row) {
-                console.log(row, '列表复选框')
-                this.$emit('getTableSelectionChange', row)
-            },
-            /* 清除选中状态 */
-            clearSelType() {
-                this.$refs.tableRef.clearSelection()
-            },
-        },
-    }
-</script>
-
-<style>
-    .check-all {
-        margin-bottom: 5px;
-        cursor: pointer;
-    }
-
-    .handel-text {
-        cursor: pointer;
-    }
-    .handel-text:hover {
-        text-decoration: underline;
-        color: #409eff;
-    }
-</style>
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
index de041702..e63ed903 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
@@ -5,6 +5,8 @@ import {
 } from '@/api/repairTest/repair'
 import { getProjectList } from '@/api/claimAndRefund/receive'
 
+import { getTypeList } from '@/api/store/warehousing'
+
 let unitList = []
 let proList = []
 let typeList = []
@@ -68,7 +70,7 @@ export const dialogConfig = {
     isSelShow: false,// 表格是否需要复选框
     isFormShow: true, // 是否显示表单查询组件
     formLabel: [
-        { f_label: '类型名称', f_model: 'keywords', f_type: 'sel' },
+        { f_label: '类型名称', f_model: 'keywords', f_type: 'sel', f_selList: [], selLabel: 'typeName', selValue: 'typeId' },
     ],
 
     columnsList: [
@@ -121,3 +123,12 @@ export const getSelList = () => {
 
     })
 }
+
+export const getTypeListSel = async () => {
+    const { data: res } = await getTypeList({ level: '3' })
+    dialogConfig.formLabel[0].f_selList = res.map((e) => {
+        e.value = e.typeId
+        e.label = e.typeName
+        return e
+    })
+}
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
index 449e97d9..0a64f8c8 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
@@ -21,9 +21,7 @@
             </template>
             <!-- 报废来源 -->
             <template slot-scope="{ data }" slot="source">
-                <template v-if="data.scrapSource === 1">退料</template>
-                <template v-if="data.scrapSource === 2">维修</template>
-                <template v-if="data.scrapSource === 3">盘点</template>
+                <ScrapSource :data="data" />
             </template>
             <!-- 单号  1、退料单号 2、维修单号 3、盘点单号 -->
             <template slot-scope="{ data }" slot="code">
@@ -163,7 +161,8 @@
 <script>
     import TableModel from '@/components/TableModel'
     import DialogModel from '@/components/DialogModel'
-    import { config, dialogConfig, getSelList } from './config'
+    import ScrapSource from '../../component/scrapSource.vue'
+    import { config, dialogConfig, getSelList, getTypeListSel } from './config'
     import {
         getForecastWasteListApi,
         getDialogListApi,
@@ -174,6 +173,7 @@
         components: {
             TableModel,
             DialogModel,
+            ScrapSource,
         },
         data() {
             return {
@@ -182,6 +182,7 @@
                 getDialogListApi,
                 getForecastWasteListApi,
                 getSelList,
+                getTypeListSel,
                 /* 驳回原因 */
                 rejectReason: '',
                 /* 选中的审核数据 */
@@ -201,6 +202,7 @@
         },
         created() {
             this.getSelList()
+            this.getTypeListSel()
         },
         methods: {
             /* 查看 */
@@ -231,9 +233,10 @@
             },
             getTableSelectionList(list) {
                 this.dataCondition = []
-                if (list.length > 0) list.forEach(ele => {
-                    this.dataCondition.push(ele.taskId)
-                });
+                if (list.length > 0)
+                    list.forEach((ele) => {
+                        this.dataCondition.push(ele.taskId)
+                    })
             },
             /* 审核通过 */
             async auditingPass() {
@@ -309,12 +312,17 @@
             },
             /* 数据导出 */
             handleExport(data) {
-                console.log('🚀 ~ 导出 ~ this.dataCondition:', data, this.dataCondition)
-                if (this.dataCondition.length > 0) data.dataCondition = this.dataCondition
+                console.log(
+                    '🚀 ~ 导出 ~ this.dataCondition:',
+                    data,
+                    this.dataCondition,
+                )
+                if (this.dataCondition.length > 0)
+                    data.dataCondition = this.dataCondition
                 this.download(
                     'material/scrap/exportForecastWaste',
                     {
-                        ...data
+                        ...data,
                     },
                     `预报废审核列表_${new Date().getTime()}.xlsx`,
                 )
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
index 67086772..d4d156b1 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
@@ -4,6 +4,7 @@ import {
     listPartTypeApi,
 } from '@/api/repairTest/repair'
 import { getProjectList } from '@/api/claimAndRefund/receive'
+import { getTypeList } from '@/api/store/warehousing'
 
 let unitList = []
 let proList = []
@@ -121,3 +122,12 @@ export const getSelList = () => {
 
     })
 }
+
+export const getTypeListSel = async () => {
+    const { data: res } = await getTypeList({ level: '3' })
+    dialogConfig.formLabel[0].f_selList = res.map((e) => {
+        e.value = e.typeId
+        e.label = e.typeName
+        return e
+    })
+}
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
index 22a33c41..dc3b8b9a 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
@@ -13,15 +13,24 @@
                     }
                 "
             >
-                <template slot="export">
+                <template slot="export" slot-scope="{ pageParams }">
                     <el-row :gutter="10" class="mb8">
+                        <el-button
+                            type="primary"
+                            plain
+                            icon="el-icon-circle-check"
+                            size="mini"
+                            @click="handelSubmitScrap"
+                            >提交报废</el-button
+                        >
+
                         <el-button
                             type="success"
                             plain
                             icon="el-icon-download"
                             size="mini"
-                            @click="handelSubmitScrap"
-                            >提交报废</el-button
+                            @click="handelExportData(pageParams)"
+                            >导出数据</el-button
                         >
                     </el-row>
                 </template>
@@ -52,9 +61,7 @@
                 </template>
                 <!-- 报废来源 -->
                 <template slot-scope="{ data }" slot="source">
-                    <template v-if="data.scrapSource === 1">退料</template>
-                    <template v-if="data.scrapSource === 2">维修</template>
-                    <template v-if="data.scrapSource === 3">盘点</template>
+                    <ScrapSource :data="data" />
                 </template>
                 <!-- 列表操作栏 -->
                 <template slot="handle" slot-scope="{ data }">
@@ -104,9 +111,9 @@
                         >
                             <template slot="imgPreview">
                                 <ImagePreview
-                                    :src="`https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg`"
-                                    :width="`60px`"
-                                    :height="`60px`"
+                                    :src="``"
+                                    :width="`30px`"
+                                    :height="`30px`"
                                 />
                             </template> </TableModel
                     ></template>
@@ -135,125 +142,141 @@
 </template>
 
 <script>
-import TableModel from '@/components/TableModel'
-import DialogModel from '@/components/DialogModel'
-import SelDepart from '../../component/selDepart.vue'
-import AuditingReturn from '../auditingReturn/index.vue' // 退料驳回页面
-import AuditingDetails from '../../component/auditingDetails.vue'
-import {
-    getPreScrapListApi,
-    getDialogListApi,
-    submitScrapApi,
-} from '@/api/scrap/forecastWaste.js'
-import { config, dialogConfig, getSelList } from './config'
-export default {
-    name: 'scrapListing',
-    components: {
-        TableModel,
-        DialogModel,
-        SelDepart,
-        AuditingReturn,
-        AuditingDetails,
-    },
-    data() {
-        return {
-            config,
-            dialogConfig,
-            getPreScrapListApi,
-            getDialogListApi,
-            tableSelList: [],
-            sendParams: {}, // 列表查看时参数
-            temp: false,
-            getSelList,
-            imgCommonUrl: process.env.VUE_APP_BASE_API + '/system',
+    import TableModel from '@/components/TableModel'
+    import DialogModel from '@/components/DialogModel'
+    import SelDepart from '../../component/selDepart.vue'
+    import ScrapSource from '../../component/scrapSource.vue'
+    import AuditingReturn from '../auditingReturn/index.vue' // 退料驳回页面
+    import AuditingDetails from '../../component/auditingDetails.vue'
+    import {
+        getPreScrapListApi,
+        getDialogListApi,
+        submitScrapApi,
+    } from '@/api/scrap/forecastWaste.js'
+    import { config, dialogConfig, getSelList, getTypeListSel } from './config'
+    export default {
+        name: 'scrapListing',
+        components: {
+            TableModel,
+            DialogModel,
+            SelDepart,
+            ScrapSource,
+            AuditingReturn,
+            AuditingDetails,
+        },
+        data() {
+            return {
+                config,
+                dialogConfig,
+                getPreScrapListApi,
+                getDialogListApi,
+                tableSelList: [],
+                sendParams: {}, // 列表查看时参数
+                temp: false,
+                getSelList,
+                getTypeListSel,
+                imgCommonUrl: process.env.VUE_APP_BASE_API + '/system',
 
-            /* 提交报废申请参数 */
-            submitScrapParams: {
-                taskIdList: [],
-                deptIds: [],
+                /* 提交报废申请参数 */
+                submitScrapParams: {
+                    taskIdList: [],
+                    deptIds: [],
+                },
+                auditingList: [],
+                sendParamsAuditing: {},
+            }
+        },
+        created() {
+            /* 获取表单下拉选数据 */
+            this.getSelList()
+            this.getTypeListSel()
+        },
+        methods: {
+            /* 列表按钮操作 */
+            handlePreview(row) {
+                this.sendParams.taskId = row.taskId
+                this.dialogConfig.outerTitle = '查看'
+                this.dialogConfig.outerWidth = '70%'
+                this.dialogConfig.outerVisible = true
             },
-            auditingList: [],
-            sendParamsAuditing: {},
-        }
-    },
-    created() {
-        /* 获取表单下拉选数据 */
-        this.getSelList()
-    },
-    methods: {
-        /* 列表按钮操作 */
-        handlePreview(row) {
-            this.sendParams.taskId = row.taskId
-            this.dialogConfig.outerTitle = '查看'
-            this.dialogConfig.outerWidth = '70%'
-            this.dialogConfig.outerVisible = true
-        },
-        handleSubmitScrap(row) {
-            this.submitScrapParams.taskIdList = []
-            this.submitScrapParams.taskIdList.push(row.taskId)
-            this.dialogConfig.outerTitle = '选择审批部门'
-            this.dialogConfig.outerWidth = '50%'
-            this.dialogConfig.outerVisible = true
-        },
-        handleAuditing(row) {
-            this.auditingList = row.scrapAuditorSetList
-            this.dialogConfig.outerTitle = '审批详情'
-            this.dialogConfig.outerWidth = '50%'
-            this.dialogConfig.outerVisible = true
-        },
-        handleReject(row) {
-            this.sendParamsAuditing.taskId = row.taskId
-            this.temp = !this.temp
-        },
-
-        /* 关闭选择审批部门弹框 */
-        async closeDepartSel(val, list) {     
-            if (list.length < 1) {
-                this.$message.error('请选择审批部门')
-                return
-            }
-            list.map((e) => {
-                this.submitScrapParams.deptIds.push(e.id)
-            })
-            const res = await submitScrapApi(this.submitScrapParams)
-            if (res.code == 200) {
-                this.$message.success('已提交成功')
-                this.dialogConfig.outerVisible = val
-                this.$refs.listingTbRef.getList()
-            }
-            this.submitScrapParams.deptIds = this.submitScrapParams.taskIdList =
-                []
-        },
-        /* 批量提交报废按钮 */
-        handelSubmitScrap() {
-            if (this.tableSelList.length < 1) {
-                this.$message.error('请勾选列表数据！')
-            } else {
+            handleSubmitScrap(row) {
+                this.submitScrapParams.taskIdList = []
+                this.submitScrapParams.taskIdList.push(row.taskId)
                 this.dialogConfig.outerTitle = '选择审批部门'
                 this.dialogConfig.outerWidth = '50%'
                 this.dialogConfig.outerVisible = true
-            }
+            },
+            handleAuditing(row) {
+                this.auditingList = row.scrapAuditorSetList
+                this.dialogConfig.outerTitle = '审批详情'
+                this.dialogConfig.outerWidth = '50%'
+                this.dialogConfig.outerVisible = true
+            },
+            handleReject(row) {
+                this.sendParamsAuditing.taskId = row.taskId
+                this.temp = !this.temp
+            },
+
+            /* 关闭选择审批部门弹框 */
+            async closeDepartSel(val, list) {
+                if (list.length < 1) {
+                    this.$message.error('请选择审批部门')
+                    return
+                }
+                list.map((e) => {
+                    this.submitScrapParams.deptIds.push(e.id)
+                })
+                const res = await submitScrapApi(this.submitScrapParams)
+                if (res.code == 200) {
+                    this.$message.success('已提交成功')
+                    this.dialogConfig.outerVisible = val
+                    this.$refs.listingTbRef.getList()
+                }
+                this.submitScrapParams.deptIds =
+                    this.submitScrapParams.taskIdList = []
+            },
+            /* 批量提交报废按钮 */
+            handelSubmitScrap() {
+                if (this.tableSelList.length < 1) {
+                    this.$message.error('请勾选列表数据！')
+                } else {
+                    this.dialogConfig.outerTitle = '选择审批部门'
+                    this.dialogConfig.outerWidth = '50%'
+                    this.dialogConfig.outerVisible = true
+                }
+            },
+            /* 表格复选框选中的数据 */
+            getTableSelectionChange(val) {
+                this.tableSelList = this.submitScrapParams.taskIdList = []
+                this.tableSelList = val
+                this.tableSelList.map((e) => {
+                    this.submitScrapParams.taskIdList.push(e.taskId)
+                })
+            },
+            handleBack() {
+                this.temp = !this.temp
+                this.dialogVisible = false
+            },
+            /* 外层弹框关闭 */
+            closeDialogOuter() {
+                this.dialogConfig.outerVisible = false
+            },
+            /* 内层弹框关闭 */
+            closeDialogInner() {
+                this.dialogConfig.innerVisible = false
+            },
+            /* 导出数据 */
+            handelExportData(data) {
+                console.log(this.tableSelList, ' this.tableSelList')
+                this.download(
+                    'material/scrap/export',
+                    {
+                        ...data,
+                    },
+                    `报废列表_${new Date().getTime()}.xlsx`,
+                )
+                console.log('数据导出', data)
+            },
         },
-        /* 表格复选框选中的数据 */
-        getTableSelectionChange(val) {
-            this.tableSelList = this.submitScrapParams.taskIdList = []
-            this.tableSelList = val
-            this.tableSelList.map((e) => {
-                this.submitScrapParams.taskIdList.push(e.taskId)
-            })
-        },
-        handleBack() {
-            this.temp = !this.temp
-            this.dialogVisible = false
-        },
-        /* 外层弹框关闭 */
-        closeDialogOuter() {
-            this.dialogConfig.outerVisible = false
-        },
-        /* 内层弹框关闭 */
-        closeDialogInner() {
-            this.dialogConfig.innerVisible = false
-        },
-    },
-}
+    }
 </script>
diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js b/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
index 75af0f69..7b006239 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
+++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
@@ -1,3 +1,14 @@
+import {
+    getUnitInfoSelectApi,
+    listPartTypeApi,
+} from '@/api/repairTest/repair'
+import { getProjectList } from '@/api/claimAndRefund/receive'
+
+let unitList = []
+let proList = []
+let typeList = []
+
+
 export const config = {
     handleColShow: true, // 是否显示操作列
     pageShow: true,  // 是否显示分页组件
@@ -9,8 +20,13 @@ export const config = {
         { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
         { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
         { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
-        { f_label: '报废单号', f_model: 'laiyuan', f_type: 'ipt', },
-        { f_label: '处置状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [] },
+        { f_label: '报废单号', f_model: 'backCode', f_type: 'ipt', },
+        {
+            f_label: '处置状态', f_model: 'disposition', f_type: 'sel', f_selList: [
+                { label: '未处置', value: 0 },
+                { label: '已处置', value: 1 },
+            ]
+        },
         { f_label: '创建时间', f_model: 'time', f_type: 'date' },
     ],
     columnsList: [
@@ -54,3 +70,40 @@ export const dialogConfig = {
 
 }
 
+export const getSelList = () => {
+    new Promise(async (resolve) => {
+        const { data: unitRes } = await getUnitInfoSelectApi()
+        unitList = unitRes.map((e) => {
+            e.value = e.unitId
+            e.label = e.unitName
+            return e
+        })
+        const { data: proRes } = await getProjectList()
+        proList = proRes.map((e) => {
+            e.value = e.projectId
+            e.label = e.projectName
+            return e
+        })
+        const { data: typeRes } = await listPartTypeApi()
+        typeList = typeRes
+        resolve()
+    }).then(() => {
+        config.formLabel.map((item) => {
+            if (item.f_model === 'backUnit') {
+                item.f_selList = unitList
+                return item
+            }
+            if (item.f_model === 'backPro') {
+                item.f_selList = proList
+                return item
+            }
+            if (item.f_model === 'type') {
+                item.f_selList = typeList
+                return item
+            }
+        })
+    }).catch(() => {
+
+    })
+}
+
diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
index 8e1ffaef..97613be0 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
@@ -12,7 +12,7 @@
             @getTableSelectionChange="getSelectionList"
             ref="tbRef"
         >
-            <template slot="export">
+            <template slot="export" slot-scope="{ pageParams }">
                 <el-row :gutter="10" class="mb8">
                     <el-button
                         plain
@@ -25,6 +25,7 @@
                         plain
                         icon="el-icon-download"
                         size="mini"
+                        @click="handelExportData(pageParams)"
                         >导出数据</el-button
                     >
                 </el-row>
@@ -32,9 +33,7 @@
 
             <!-- 报废来源 -->
             <template slot-scope="{ data }" slot="source">
-                <template v-if="data.scrapSource === 1">退料</template>
-                <template v-if="data.scrapSource === 2">维修</template>
-                <template v-if="data.scrapSource === 3">盘点</template>
+                <ScrapSource :data="data" />
             </template>
 
             <!-- 状态 -->
@@ -92,9 +91,9 @@
                     >
                         <template slot="imgPreview">
                             <ImagePreview
-                                :src="`https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg`"
-                                :width="`60px`"
-                                :height="`60px`"
+                                :src="``"
+                                :width="`30px`"
+                                :height="`30px`"
                             />
                         </template> </TableModel
                 ></template>
@@ -154,11 +153,13 @@
     } from '@/api/scrap/forecastWaste.js'
     import TableModel from '@/components/TableModel'
     import DialogModel from '@/components/DialogModel'
-    import { config, dialogConfig } from './config.js'
+    import ScrapSource from '../../component/scrapSource.vue'
+    import { config, dialogConfig, getSelList } from './config.js'
     export default {
         components: {
             TableModel,
             DialogModel,
+            ScrapSource
         },
         data() {
             return {
@@ -186,9 +187,12 @@
                 // },
                 /* 附件预览地址 */
                 filePreviewUrl: process.env.VUE_APP_BASE_API + '/system',
+                getSelList,
             }
         },
-        created() {},
+        created() {
+            this.getSelList()
+        },
         methods: {
             /* 按钮操作 */
             handlePreview(row) {
@@ -300,6 +304,18 @@
                 console.log(selList, '选择的数据')
                 this.tbSelectList = selList
             },
+            /* 导出数据 */
+            handelExportData(data) {
+                console.log(this.tableSelList, ' this.tableSelList')
+                this.download(
+                    'material/scrap/exportObtainDisposalList',
+                    {
+                        ...data,
+                    },
+                    `报废处置列表_${new Date().getTime()}.xlsx`,
+                )
+                console.log('数据导出', data)
+            },
         },
     }
 </script>
diff --git a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
index 0420fde9..2748e351 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
+++ b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
@@ -1,3 +1,13 @@
+import {
+    getUnitInfoSelectApi,
+    listPartTypeApi,
+} from '@/api/repairTest/repair'
+import { getProjectList } from '@/api/claimAndRefund/receive'
+
+let unitList = []
+let proList = []
+let typeList = []
+
 export const config = {
     handleColShow: true, // 是否显示操作列
     pageShow: true,  // 是否显示分页组件
@@ -9,9 +19,22 @@ export const config = {
         { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
         { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
         { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
-        { f_label: '维修单号', f_model: 'laiyuan', f_type: 'ipt', },
-        { f_label: '审批状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [] },
-        { f_label: '报废类型', f_model: 'taskStatus', f_type: 'sel', f_selList: [] },
+        { f_label: '报废单号', f_model: 'backCode', f_type: 'ipt', },
+        {
+            f_label: '审批状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [
+                { label: '待提交', value: 124 },
+                { label: '审核中', value: 58 },
+                { label: '已驳回', value: 61 },
+                { label: '已通过', value: 59 },
+            ]
+        },
+        {
+            f_label: '报废来源', f_model: 'scrapSource', f_type: 'sel', f_selList: [
+                { label: '退料', value: 1 },
+                { label: '维修', value: 2 },
+                { label: '盘点', value: 3 },
+            ]
+        },
         { f_label: '创建时间', f_model: 'time', f_type: 'date' },
     ],
     columnsList: [
@@ -26,6 +49,7 @@ export const config = {
         { t_props: 'createTime', t_label: '任务创建时间' },
         { t_props: '', t_label: '审核状态', t_slot: 'type' },
     ],
+    routerParams: ''
 }
 
 export const dialogConfig = {
@@ -53,3 +77,40 @@ export const dialogConfig = {
     ],
 
 }
+
+export const getSelList = () => {
+    new Promise(async (resolve) => {
+        const { data: unitRes } = await getUnitInfoSelectApi()
+        unitList = unitRes.map((e) => {
+            e.value = e.unitId
+            e.label = e.unitName
+            return e
+        })
+        const { data: proRes } = await getProjectList()
+        proList = proRes.map((e) => {
+            e.value = e.projectId
+            e.label = e.projectName
+            return e
+        })
+        const { data: typeRes } = await listPartTypeApi()
+        typeList = typeRes
+        resolve()
+    }).then(() => {
+        config.formLabel.map((item) => {
+            if (item.f_model === 'backUnit') {
+                item.f_selList = unitList
+                return item
+            }
+            if (item.f_model === 'backPro') {
+                item.f_selList = proList
+                return item
+            }
+            if (item.f_model === 'type') {
+                item.f_selList = typeList
+                return item
+            }
+        })
+    }).catch(() => {
+
+    })
+}
diff --git a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
index 1fcdbe7f..479e1eb0 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
@@ -2,13 +2,14 @@
     <div class="app-container">
         <!-- 报废审核 -->
         <TableModel :config="config" :sendApi="getScrapListApi" ref="tbRef">
-            <template slot="export">
+            <template slot="export" slot-scope="{ pageParams }">
                 <el-row :gutter="10" class="mb8">
                     <el-button
                         type="success"
                         plain
                         icon="el-icon-download"
                         size="mini"
+                        @click="handelExportData(pageParams)"
                         >导出数据</el-button
                     >
                 </el-row>
@@ -16,9 +17,7 @@
 
             <!-- 报废来源 -->
             <template slot-scope="{ data }" slot="source">
-                <template v-if="data.scrapSource === 1">退料</template>
-                <template v-if="data.scrapSource === 2">维修</template>
-                <template v-if="data.scrapSource === 3">盘点</template>
+                <ScrapSource :data="data" />
             </template>
 
             <!-- 状态 -->
@@ -78,9 +77,9 @@
                     >
                         <template slot="imgPreview" slot-scope="{ data }">
                             <ImagePreview
-                                :src="`https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg`"
-                                :width="`60px`"
-                                :height="`60px`"
+                                :src="``"
+                                :width="`30px`"
+                                :height="`30px`"
                             />
                         </template> </TableModel
                 ></template>
@@ -148,8 +147,9 @@
 <script>
     import TableModel from '@/components/TableModel'
     import DialogModel from '@/components/DialogModel'
+    import ScrapSource from '../../component/scrapSource.vue'
     import AuditingDetails from '../../component/auditingDetails.vue'
-    import { config, dialogConfig } from './config.js'
+    import { config, dialogConfig, getSelList } from './config.js'
     import {
         getScrapListApi,
         getDialogListApi,
@@ -159,6 +159,7 @@
         components: {
             TableModel,
             DialogModel,
+            ScrapSource,
             AuditingDetails,
         },
         data() {
@@ -185,9 +186,12 @@
 
                 /* 审批详情的列表 */
                 auditingList: [],
+                getSelList,
             }
         },
-        created() {},
+        created() {
+            this.getSelList()
+        },
         methods: {
             /* 按钮操作 */
             handlePreview(row) {
@@ -266,11 +270,34 @@
             },
             /* 审核按钮的显示条件 */
             auditingIsShow(row) {
-                let temp = row.scrapAuditorSetList.some((e) => {
+                let temp = row.scrapAuditorSetList?.some((e) => {
                     return e.deptId == this.deptId && e.status == '0'
                 })
                 return temp
             },
+            /* 导出数据 */
+            handelExportData(data) {
+                console.log(this.tableSelList, ' this.tableSelList')
+                this.download(
+                    'material/scrap/exportScrapTaskReviewList',
+                    {
+                        ...data,
+                    },
+                    `报废审核列表_${new Date().getTime()}.xlsx`,
+                )
+                console.log('数据导出', data)
+            },
+        },
+        watch: {
+            $route: {
+                handler(to) {
+                    if (to.query.keyWord) {
+                        this.config.routerParams = to.query.keyWord
+                    }
+                },
+                deep: true,
+                immediate: true,
+            },
         },
     }
 </script>
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
index 75836165..2bcb4c23 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
@@ -1,35 +1,53 @@
 <template>
-  <div class="app-container" id="newAccessoryList">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="80px"
-    >
-      <el-form-item label="关键字" prop="keyWord">
-        <el-input
-          v-model="queryParams.keyWord"
-          placeholder="请输入关键字"
-          clearable
-          maxlength="50"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <div class="app-container" id="newAccessoryList">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <el-form-item label="关键字" prop="keyWord">
+                <el-input
+                    v-model="queryParams.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >搜索</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAccept">新增</el-button>
-      </el-col>
-      <!-- <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAccept"
+                    >新增</el-button
+                >
+            </el-col>
+            <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -38,402 +56,607 @@
           @click="handleAdd" 
         >发布入库</el-button>
       </el-col>-->
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="accessoryList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" />
-      <el-table-column
-        label="采购日期"
-        align="center"
-        prop="purchaseTime"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="到货日期"
-        align="center"
-        prop="arrivalTime"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="采购配件"
-        align="center"
-        prop="purchasingTypeName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="采购员"
-        align="center"
-        prop="purchaserName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="采购状态"
-        align="center"
-        prop="purchasingStatus"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <!--      <el-table-column label="状态" align="center" prop="createTime" width="180">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <el-switch-->
-      <!--              v-model="scope.row.status">-->
-      <!--          </el-switch>-->
-
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
-        <template slot-scope="scope">
-          <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            v-if="scope.row.taskStatus==68"
-            @click="handleUpdate(scope.row)"
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="success"
-            icon="el-icon-edit"
-            v-if="scope.row.taskStatus==68"
-            @click="handleCheck(scope.row)"
-          >验收</el-button>
-          <el-button
-            size="mini"
-            type="info"
-            icon="el-icon-edit"
-            v-if="scope.row.taskStatus!=68"
-            @click="handleBuy(scope.row)"
-          >验收单</el-button>
-          <el-button
-            size="mini"
-            type="danger"
-            icon="el-icon-delete"
-            v-if="scope.row.taskStatus==68"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 验收单弹窗 -->
-    <el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body>
-      <div style="height: 400px;overflow-y: scroll;">
-        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-          <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">到货验收单</div>
-          <div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>工程名称：</span>
-            </div>
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>验收单编号：</span>
-              {{ printData.code }}
-            </div>
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>合同名称：</span>
-            </div>
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>合同编号：</span>
-            </div>
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>验收地点：</span>
-            </div>
-            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
-              <span>供应商：</span>
-              <span v-if="printTableData.length>0">{{ printTableData[0].supplier }}</span>
-            </div>
-          </div>
-          <el-table
-            :data="printTableData"
-            class="table"
-            style="margin-top: 20px;width: 1000px;padding-bottom: 1px;"
-            border
-          >
-            <!--          <el-table-column type="selection" width="55" align="center" />-->
-            <el-table-column label="序号" align="center" width="80" type="index">
+        <el-table
+            v-loading="loading"
+            :data="accessoryList"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
                 <template scope="scope">
-                <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="类型名称" align="center" prop="machineTypeName" />
-            <el-table-column label="规格型号" align="center" prop="specificationType" />
-            <el-table-column label="计量单位" align="center" prop="unitName" />
-            <el-table-column label="采购数量" align="center" prop="purchaseNum" />
+            <el-table-column
+                label="采购单号"
+                align="center"
+                prop="code"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购日期"
+                align="center"
+                prop="purchaseTime"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="到货日期"
+                align="center"
+                prop="arrivalTime"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购配件"
+                align="center"
+                prop="purchasingTypeName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购员"
+                align="center"
+                prop="purchaserName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购状态"
+                align="center"
+                prop="purchasingStatus"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                :show-overflow-tooltip="true"
+            />
+            <!--      <el-table-column label="状态" align="center" prop="createTime" width="180">-->
+            <!--        <template slot-scope="scope">-->
+            <!--          <el-switch-->
+            <!--              v-model="scope.row.status">-->
+            <!--          </el-switch>-->
 
-            <el-table-column label="已验收数量" align="center" prop />
-            <el-table-column label="本次验收数量" align="center" prop="checkNum" />
-            <el-table-column label="累积验收数量" align="center" prop />
-            <el-table-column label="验收日期" align="center" prop />
-            <el-table-column label="合格证及技术资料" align="center" prop />
-            <el-table-column label="包装" align="center" prop />
-          </el-table>
+            <!--        </template>-->
+            <!--      </el-table-column>-->
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+                width="300"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        icon="el-icon-zoom-in"
+                        @click="handleView(scope.row)"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-edit"
+                        v-if="scope.row.taskStatus == 68"
+                        @click="handleUpdate(scope.row)"
+                        >编辑</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="success"
+                        icon="el-icon-edit"
+                        v-if="scope.row.taskStatus == 68"
+                        @click="handleCheck(scope.row)"
+                        >验收</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="info"
+                        icon="el-icon-edit"
+                        v-if="scope.row.taskStatus != 68"
+                        @click="handleBuy(scope.row)"
+                        >验收单</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="danger"
+                        icon="el-icon-delete"
+                        v-if="scope.row.taskStatus == 68"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
 
-          <div
-            class="fillIn"
-            style="margin-top: 20px;display: flex;justify-content: space-between;"
-          >
-            <div class="item" style="width: 50%;">
-              <div>
-                <span>接收单位验收意见：</span>
-              </div>
-              <div>
-                <span>验收人：</span>
-              </div>
-              <div>
-                <span>接收单位（章）：</span>
-              </div>
-              <div>
-                <span>验收负责人： 年 月 日</span>
-              </div>
-            </div>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-            <div class="item" style="width: 50%;">
-              <div>
-                <span>供应商：</span>
-              </div>
-              <div>
-                <span>供应商（章）：</span>
-              </div>
-              <div>
-                <span>验收负责人： 年 月 日</span>
-              </div>
-            </div>
-            <!-- <div class="item" style="width: 25%;">
+        <!-- 验收单弹窗 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openPrint"
+            width="1100px"
+            append-to-body
+        >
+            <div style="height: 400px; overflow-y: scroll">
+                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+                    <div
+                        class="title"
+                        style="
+                            text-align: center;
+                            font-weight: 600;
+                            font-size: 16px;
+                        "
+                        >到货验收单</div
+                    >
+                    <div
+                        class="info"
+                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
+                    >
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>工程名称：</span>
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>验收单编号：</span>
+                            {{ printData.code }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>合同名称：</span>
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>合同编号：</span>
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>验收地点：</span>
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>供应商：</span>
+                            <span v-if="printTableData.length > 0">{{
+                                printTableData[0].supplier
+                            }}</span>
+                        </div>
+                    </div>
+                    <el-table
+                        :data="printTableData"
+                        class="table"
+                        style="
+                            margin-top: 20px;
+                            width: 1000px;
+                            padding-bottom: 1px;
+                        "
+                        border
+                    >
+                        <!--          <el-table-column type="selection" width="55" align="center" />-->
+                        <el-table-column
+                            label="序号"
+                            align="center"
+                            width="80"
+                            type="index"
+                        >
+                            <template scope="scope">
+                                <span>{{
+                                    (queryParams.pageNum - 1) * 10 +
+                                    scope.$index +
+                                    1
+                                }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            label="类型名称"
+                            align="center"
+                            prop="machineTypeName"
+                        />
+                        <el-table-column
+                            label="规格型号"
+                            align="center"
+                            prop="specificationType"
+                        />
+                        <el-table-column
+                            label="计量单位"
+                            align="center"
+                            prop="unitName"
+                        />
+                        <el-table-column
+                            label="采购数量"
+                            align="center"
+                            prop="purchaseNum"
+                        />
+
+                        <el-table-column
+                            label="已验收数量"
+                            align="center"
+                            prop
+                        />
+                        <el-table-column
+                            label="本次验收数量"
+                            align="center"
+                            prop="checkNum"
+                        />
+                        <el-table-column
+                            label="累积验收数量"
+                            align="center"
+                            prop
+                        />
+                        <el-table-column label="验收日期" align="center" prop />
+                        <el-table-column
+                            label="合格证及技术资料"
+                            align="center"
+                            prop
+                        />
+                        <el-table-column label="包装" align="center" prop />
+                    </el-table>
+
+                    <div
+                        class="fillIn"
+                        style="
+                            margin-top: 20px;
+                            display: flex;
+                            justify-content: space-between;
+                        "
+                    >
+                        <div class="item" style="width: 50%">
+                            <div>
+                                <span>接收单位验收意见：</span>
+                            </div>
+                            <div>
+                                <span>验收人：</span>
+                            </div>
+                            <div>
+                                <span>接收单位（章）：</span>
+                            </div>
+                            <div>
+                                <span>验收负责人： 年 月 日</span>
+                            </div>
+                        </div>
+
+                        <div class="item" style="width: 50%">
+                            <div>
+                                <span>供应商：</span>
+                            </div>
+                            <div>
+                                <span>供应商（章）：</span>
+                            </div>
+                            <div>
+                                <span>验收负责人： 年 月 日</span>
+                            </div>
+                        </div>
+                        <!-- <div class="item" style="width: 25%;">
             <span>经办人：</span>
             </div>-->
-          </div>
-        </vue-easy-print>
-      </div>
+                    </div>
+                </vue-easy-print>
+            </div>
 
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="print">打 印</el-button>
-        <el-button @click="openPrint = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="print">打 印</el-button>
+                <el-button @click="openPrint = false">关 闭</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
-import {
-  listPurchaseAccessory,
-  getPurchaseCheckInfo,
-  delPurchaseAccessory,
-  getAccessoryAcceptanceForm,
-} from '@/api/store/newBuy'
-import vueEasyPrint from 'vue-easy-print'
-export default {
-  // name: "NewAccessoryList",
-  dicts: ['sys_normal_disable'],
-  components: { vueEasyPrint },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      accessoryList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined,
-      },
-      // 表单参数
-      form: {},
-      openPrint: false,
-      printData: {},
-      printTableData: [],
-      // 表单校验
-      rules: {
-        dictName: [{ required: true, message: '字典名称不能为空', trigger: 'blur' }],
-        dictType: [{ required: true, message: '字典类型不能为空', trigger: 'blur' }],
-      },
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true
-      listPurchaseAccessory(this.queryParams).then(response => {
-        this.accessoryList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        taskId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: '0',
-        remark: undefined,
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = []
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加字典类型'
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.taskId)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-
-    /** 编辑按钮操作 */
-    handleUpdate(row) {
-      let query = { taskId: row.taskId }
-      this.$tab.closeOpenPage({ path: '/store/newBuy/newAccessoryAccept', query })
-    },
-    /** 查看按钮操作 */
-    handleView(row) {
-      let query = { taskId: row.taskId, isView: true }
-      this.$tab.closeOpenPage({ path: '/store/newBuy/newAccessoryAccept', query })
-    },
-    /** 验收按钮操作 */
-    handleCheck(row) {
-      let query = { taskId: row.taskId, isCheck: true }
-      this.$tab.closeOpenPage({ path: '/store/newBuy/newAccessoryAccept', query })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          // if (this.form.taskId != undefined) {
-          //   updateType(this.form).then(response => {
-          //     this.$modal.msgSuccess("修改成功");
-          //     this.open = false;
-          //     this.getList();
-          //   });
-          // } else {
-          //   addType(this.form).then(response => {
-          //     this.$modal.msgSuccess("新增成功");
-          //     this.open = false;
-          //     this.getList();
-          //   });
-          // }
-        }
-      })
-    },
-    //获取验收单数据
-    getPrintTable(taskId) {
-      getAccessoryAcceptanceForm({ taskId: taskId }).then(response => {
-        this.printData = response.data
-        this.printTableData = response.data.partDetailsList
-      })
-    },
-    //查看验收单
-    handleBuy(row) {
-      // this.query.taskId = row.taskId
-      this.getPrintTable(row.taskId)
-      this.openPrint = true
-      this.title = '新购工机具验收单'
-    },
-    //打印
-    print() {
-      this.$refs.remarksPrintRef.print()
-    },
-    /** 新增 */
-    handleAccept() {
-      let query = { isShow: true }
-      this.$tab.closeOpenPage({ path: '/store/newBuy/newAccessoryAccept', query })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const taskId = row.taskId || this.ids
-      this.$modal
-        .confirm('是否确认删除所选择的数据项？')
-        .then(function() {
-          return delPurchaseAccessory(taskId)
-        })
-        .then(() => {
-          this.getList()
-          this.$modal.msgSuccess('删除成功')
-        })
-        .catch(() => {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        'material/purchaseAccessory/export',
-        {
-          ...this.queryParams,
+    import {
+        listType,
+        getType,
+        delType,
+        addType,
+        updateType,
+        refreshCache,
+    } from '@/api/system/dict/type'
+    import {
+        listPurchaseAccessory,
+        getPurchaseCheckInfo,
+        delPurchaseAccessory,
+        getAccessoryAcceptanceForm,
+    } from '@/api/store/newBuy'
+    import vueEasyPrint from 'vue-easy-print'
+    export default {
+        // name: "NewAccessoryList",
+        dicts: ['sys_normal_disable'],
+        components: { vueEasyPrint },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 字典表格数据
+                accessoryList: [],
+                // 弹出层标题
+                title: '',
+                // 是否显示弹出层
+                open: false,
+                // 日期范围
+                dateRange: [],
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: undefined,
+                    keyWord: null,
+                },
+                // 表单参数
+                form: {},
+                openPrint: false,
+                printData: {},
+                printTableData: [],
+                // 表单校验
+                rules: {
+                    dictName: [
+                        {
+                            required: true,
+                            message: '字典名称不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                    dictType: [
+                        {
+                            required: true,
+                            message: '字典类型不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+            }
         },
-        `新购配件_${new Date().getTime()}.xlsx`
-      )
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess('刷新成功')
-        this.$store.dispatch('dict/cleanDict')
-      })
-    },
-  },
-}
+        created() {
+            this.getList()
+        },
+        methods: {
+            /** 查询列表 */
+            getList() {
+                this.loading = true
+                listPurchaseAccessory(this.queryParams).then((response) => {
+                    this.accessoryList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                })
+            },
+            // 取消按钮
+            cancel() {
+                this.open = false
+                this.reset()
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    taskId: undefined,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: '0',
+                    remark: undefined,
+                }
+                this.resetForm('form')
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1
+                this.getList()
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.dateRange = []
+                this.resetForm('queryForm')
+                this.queryParams.keyWord = ''
+                this.handleQuery()
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                this.reset()
+                this.open = true
+                this.title = '添加字典类型'
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map((item) => item.taskId)
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+
+            /** 编辑按钮操作 */
+            handleUpdate(row) {
+                let query = { taskId: row.taskId }
+                this.$tab.closeOpenPage({
+                    path: '/store/newBuy/newAccessoryAccept',
+                    query,
+                })
+            },
+            /** 查看按钮操作 */
+            handleView(row) {
+                let query = { taskId: row.taskId, isView: true }
+                this.$tab.closeOpenPage({
+                    path: '/store/newBuy/newAccessoryAccept',
+                    query,
+                })
+            },
+            /** 验收按钮操作 */
+            handleCheck(row) {
+                let query = { taskId: row.taskId, isCheck: true }
+                this.$tab.closeOpenPage({
+                    path: '/store/newBuy/newAccessoryAccept',
+                    query,
+                })
+            },
+            /** 提交按钮 */
+            submitForm: function () {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        // if (this.form.taskId != undefined) {
+                        //   updateType(this.form).then(response => {
+                        //     this.$modal.msgSuccess("修改成功");
+                        //     this.open = false;
+                        //     this.getList();
+                        //   });
+                        // } else {
+                        //   addType(this.form).then(response => {
+                        //     this.$modal.msgSuccess("新增成功");
+                        //     this.open = false;
+                        //     this.getList();
+                        //   });
+                        // }
+                    }
+                })
+            },
+            //获取验收单数据
+            getPrintTable(taskId) {
+                getAccessoryAcceptanceForm({ taskId: taskId }).then(
+                    (response) => {
+                        this.printData = response.data
+                        this.printTableData = response.data.partDetailsList
+                    },
+                )
+            },
+            //查看验收单
+            handleBuy(row) {
+                // this.query.taskId = row.taskId
+                this.getPrintTable(row.taskId)
+                this.openPrint = true
+                this.title = '新购工机具验收单'
+            },
+            //打印
+            print() {
+                this.$refs.remarksPrintRef.print()
+            },
+            /** 新增 */
+            handleAccept() {
+                let query = { isShow: true }
+                this.$tab.closeOpenPage({
+                    path: '/store/newBuy/newAccessoryAccept',
+                    query,
+                })
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                const taskId = row.taskId || this.ids
+                this.$modal
+                    .confirm('是否确认删除所选择的数据项？')
+                    .then(function () {
+                        return delPurchaseAccessory(taskId)
+                    })
+                    .then(() => {
+                        this.getList()
+                        this.$modal.msgSuccess('删除成功')
+                    })
+                    .catch(() => {})
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'material/purchaseAccessory/export',
+                    {
+                        ...this.queryParams,
+                    },
+                    `新购配件_${new Date().getTime()}.xlsx`,
+                )
+            },
+            /** 刷新缓存按钮操作 */
+            handleRefreshCache() {
+                refreshCache().then(() => {
+                    this.$modal.msgSuccess('刷新成功')
+                    this.$store.dispatch('dict/cleanDict')
+                })
+            },
+        },
+        watch: {
+            $route: {
+                handler(to) {
+                    if (to.query.keyWord) {
+                        this.queryParams.keyWord = to.query.keyWord
+                    }
+                },
+                immediate:true
+            },
+        },
+    }
 </script>
 <style lang="scss" scoped>
-::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
-}
-</style>
\ No newline at end of file
+    ::v-deep.el-table .fixed-width .el-button--mini {
+        width: 60px !important;
+        margin-bottom: 10px;
+    }
+</style>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index 424e616a..4cf97978 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -590,6 +590,7 @@
             resetQuery() {
                 this.queryParams.time = []
                 this.resetForm('queryForm')
+                 this.queryParams.keyWord = ''
                 this.handleQuery()
             },
             /** 新增按钮操作 */
diff --git a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
index 0d732e32..a6a702c7 100644
--- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
@@ -1,21 +1,50 @@
 <template>
-  <div class="app-container" id="repairWarehousing">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="关键字" prop="keyWord">
-        <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="维修时间">
-        <el-date-picker v-model="queryParams.wxTime" style="width: 240px" value-format="yyyy-MM-dd" type="date"
-          range-separator="-" placeholder="维修时间"></el-date-picker>
-      </el-form-item>
-      <el-form-item label="设备类型" prop="deviceTypeId">
-        <el-select v-model="queryParams.deviceTypeId" placeholder="请选择设备类型" clearable filterable style="width: 240px">
-          <el-option v-for="typeItem in typeList" :key="typeItem.typeId" :label="typeItem.typeName"
-            :value="typeItem.typeId" />
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="规格型号" prop="modelId">
+    <div class="app-container" id="repairWarehousing">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+        >
+            <el-form-item label="关键字" prop="keyWord">
+                <el-input
+                    v-model="queryParams.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="维修时间">
+                <el-date-picker
+                    v-model="queryParams.wxTime"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    range-separator="-"
+                    placeholder="维修时间"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="设备类型" prop="deviceTypeId">
+                <el-select
+                    v-model="queryParams.deviceTypeId"
+                    placeholder="请选择设备类型"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="typeItem in typeList"
+                        :key="typeItem.typeId"
+                        :label="typeItem.typeName"
+                        :value="typeItem.typeId"
+                    />
+                </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="规格型号" prop="modelId">
         <el-select
           v-model="queryParams.modelId"
           placeholder="请选择规格型号"
@@ -31,14 +60,25 @@
         </el-select>
       </el-form-item>-->
 
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >查询</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8">
+            <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -49,550 +89,742 @@
           v-hasPermi="['system:dict:add']"
         >入库审核</el-button>
       </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="success"-->
-      <!--          plain-->
-      <!--          icon="el-icon-edit"-->
-      <!--          size="mini"-->
-      <!--          :disabled="single"-->
-      <!--          @click="handleUpdate"-->
-      <!--          v-hasPermi="['system:dict:edit']"-->
-      <!--        >修改</el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="danger"-->
-      <!--          plain-->
-      <!--          icon="el-icon-delete"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          @click="handleDelete"-->
-      <!--          v-hasPermi="['system:dict:remove']"-->
-      <!--        >删除</el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+            <!--      <el-col :span="1.5">-->
+            <!--        <el-button-->
+            <!--          type="success"-->
+            <!--          plain-->
+            <!--          icon="el-icon-edit"-->
+            <!--          size="mini"-->
+            <!--          :disabled="single"-->
+            <!--          @click="handleUpdate"-->
+            <!--          v-hasPermi="['system:dict:edit']"-->
+            <!--        >修改</el-button>-->
+            <!--      </el-col>-->
+            <!--      <el-col :span="1.5">-->
+            <!--        <el-button-->
+            <!--          type="danger"-->
+            <!--          plain-->
+            <!--          icon="el-icon-delete"-->
+            <!--          size="mini"-->
+            <!--          :disabled="multiple"-->
+            <!--          @click="handleDelete"-->
+            <!--          v-hasPermi="['system:dict:remove']"-->
+            <!--        >删除</el-button>-->
+            <!--      </el-col>-->
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="tableList">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="维修单号" align="center" prop="repairCode" />
-      <el-table-column label="工机具类型" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
-      <el-table-column label="维修人员" align="center" prop="wxName" :show-overflow-tooltip="true" />
-      <el-table-column label="维修时间" align="center" prop="wxTime" :show-overflow-tooltip="true"></el-table-column>
-      <!-- <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table v-loading="loading" :data="tableList">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                label="维修单号"
+                align="center"
+                prop="repairCode"
+            />
+            <el-table-column
+                label="工机具类型"
+                align="center"
+                prop="maTypeName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="维修人员"
+                align="center"
+                prop="wxName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="维修时间"
+                align="center"
+                prop="wxTime"
+                :show-overflow-tooltip="true"
+            ></el-table-column>
+            <!-- <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
 
       <el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" />
       <el-table-column label="提交入库时间" align="center" prop="updateTime" width="180"></el-table-column>
       <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />-->
-      <el-table-column label="状态" align="center" prop="taskStatus">
-        <!-- <template slot-scope="scope">
+            <el-table-column label="状态" align="center" prop="taskStatus">
+                <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>-->
-      </el-table-column>
+            </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
-          <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-if="scope.row.taskStatus == '入库进行中'">审核</el-button>
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-delete"-->
-          <!--            @click="handleDelete(scope.row)"-->
-          <!--            v-hasPermi="['system:dict:remove']"-->
-          <!--          >删除</el-button>-->
-        </template>
-      </el-table-column>
-    </el-table>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        icon="el-icon-zoom-in"
+                        @click="handleView(scope.row)"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        v-if="scope.row.taskStatus == '入库进行中'"
+                        >审核</el-button
+                    >
+                    <!--          <el-button-->
+                    <!--            size="mini"-->
+                    <!--            type="text"-->
+                    <!--            icon="el-icon-delete"-->
+                    <!--            @click="handleDelete(scope.row)"-->
+                    <!--            v-hasPermi="['system:dict:remove']"-->
+                    <!--          >删除</el-button>-->
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="关键字" prop="keyWord">
-          <el-input v-model="query.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <!--        <el-form-item label="状态" prop="status"> -->
-        <!--        <el-select -->
-        <!--        v-model="query.status" -->
-        <!--        placeholder="审核状态" -->
-        <!--        clearable -->
-        <!--        filterable -->
-        <!--        style="width: 240px" -->
-        <!--        > -->
-        <!--        <el-option label="未审核" value="0" /> -->
-        <!--        <el-option label="已入库" value="1" /> -->
-        <!--        <el-option label="驳回" value="2" /> -->
-        <!--        </el-select> -->
-        <!--        </el-form-item> -->
+        <!-- 添加或修改参数配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="1000px"
+            append-to-body
+        >
+            <el-form
+                :model="query"
+                ref="query"
+                size="small"
+                :inline="true"
+                v-show="showSearch"
+                label-width="68px"
+            >
+                <el-form-item label="关键字" prop="keyWord">
+                    <el-input
+                        v-model="query.keyWord"
+                        placeholder="请输入关键字"
+                        clearable
+                        maxlength="50"
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <!--        <el-form-item label="状态" prop="status"> -->
+                <!--        <el-select -->
+                <!--        v-model="query.status" -->
+                <!--        placeholder="审核状态" -->
+                <!--        clearable -->
+                <!--        filterable -->
+                <!--        style="width: 240px" -->
+                <!--        > -->
+                <!--        <el-option label="未审核" value="0" /> -->
+                <!--        <el-option label="已入库" value="1" /> -->
+                <!--        <el-option label="驳回" value="2" /> -->
+                <!--        </el-select> -->
+                <!--        </el-form-item> -->
 
-        <el-form-item label="机具类型" prop="typeId">
-          <treeselect v-model="query.typeId" default-expand-all :options="equipmentTypeList" placeholder="请选择规格型号"
-            :disable-branch-nodes="true" style="width: 240px" noChildrenText="没有数据了" noOptionsText="没有数据"
-            noResultsText="没有搜索结果" />
-        </el-form-item>
+                <el-form-item label="机具类型" prop="typeId">
+                    <treeselect
+                        v-model="query.typeId"
+                        default-expand-all
+                        :options="equipmentTypeList"
+                        placeholder="请选择规格型号"
+                        :disable-branch-nodes="true"
+                        style="width: 240px"
+                        noChildrenText="没有数据了"
+                        noOptionsText="没有数据"
+                        noResultsText="没有搜索结果"
+                    />
+                </el-form-item>
 
-        <!--        <el-form-item label="设备类型" prop="deviceTypeId"> -->
-        <!--        <el-select -->
-        <!--        v-model="query.deviceTypeId" -->
-        <!--        placeholder="请选择设备类型" -->
-        <!--        clearable -->
-        <!--        filterable -->
-        <!--        style="width: 240px" -->
-        <!--        > -->
-        <!--        <el-option -->
-        <!--        v-for="typeItem in typeList" -->
-        <!--        :key="typeItem.typeId" -->
-        <!--        :label="typeItem.typeName" -->
-        <!--        :value="typeItem.typeId" -->
-        <!--        /> -->
-        <!--        </el-select> -->
-        <!--        </el-form-item> -->
-        <!--        <el-form-item label="规格型号" prop="typeId"> -->
-        <!--        <el-select -->
-        <!--        v-model="query.typeId" -->
-        <!--        placeholder="请选择规格型号" -->
-        <!--        clearable -->
-        <!--        filterable -->
-        <!--        style="width: 240px" -->
-        <!--        > -->
-        <!--        <el-option -->
-        <!--        v-for="model in modelList" -->
-        <!--        :key="model.typeId" -->
-        <!--        :label="model.typeName" -->
-        <!--        :value="model.typeId" -->
-        <!--        /> -->
-        <!--        </el-select> -->
-        <!--        </el-form-item> -->
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
-          <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
-        </el-form-item>
-      </el-form>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" plain size="mini" :disabled="multiple" @click="passAll">批量通过</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain size="mini" @click="refusedAll" :disabled="multiple">批量不通过</el-button>
-        </el-col>
-        <!--        <el-col :span="1.5">-->
-        <!--          <el-button-->
-        <!--            type="warning"-->
-        <!--            plain-->
-        <!--            icon="el-icon-download"-->
-        <!--            size="mini"-->
-        <!--            @click="handleExport"-->
-        <!--            v-hasPermi="['system:dict:export']"-->
-        <!--          >导出</el-button>-->
-        <!--        </el-col>-->
-      </el-row>
-      <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="设备类型" align="center" prop="typeName2" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
-        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
-        <el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100" />
-        <el-table-column label="提交入库时间" align="center" prop="updateTime" width="100"></el-table-column>
+                <!--        <el-form-item label="设备类型" prop="deviceTypeId"> -->
+                <!--        <el-select -->
+                <!--        v-model="query.deviceTypeId" -->
+                <!--        placeholder="请选择设备类型" -->
+                <!--        clearable -->
+                <!--        filterable -->
+                <!--        style="width: 240px" -->
+                <!--        > -->
+                <!--        <el-option -->
+                <!--        v-for="typeItem in typeList" -->
+                <!--        :key="typeItem.typeId" -->
+                <!--        :label="typeItem.typeName" -->
+                <!--        :value="typeItem.typeId" -->
+                <!--        /> -->
+                <!--        </el-select> -->
+                <!--        </el-form-item> -->
+                <!--        <el-form-item label="规格型号" prop="typeId"> -->
+                <!--        <el-select -->
+                <!--        v-model="query.typeId" -->
+                <!--        placeholder="请选择规格型号" -->
+                <!--        clearable -->
+                <!--        filterable -->
+                <!--        style="width: 240px" -->
+                <!--        > -->
+                <!--        <el-option -->
+                <!--        v-for="model in modelList" -->
+                <!--        :key="model.typeId" -->
+                <!--        :label="model.typeName" -->
+                <!--        :value="model.typeId" -->
+                <!--        /> -->
+                <!--        </el-select> -->
+                <!--        </el-form-item> -->
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="el-icon-search"
+                        size="mini"
+                        @click="handleDialogQuery"
+                        >查询</el-button
+                    >
+                    <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
+                </el-form-item>
+            </el-form>
+            <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5">
+                    <el-button
+                        type="primary"
+                        plain
+                        size="mini"
+                        :disabled="multiple"
+                        @click="passAll"
+                        >批量通过</el-button
+                    >
+                </el-col>
+                <el-col :span="1.5">
+                    <el-button
+                        type="danger"
+                        plain
+                        size="mini"
+                        @click="refusedAll"
+                        :disabled="multiple"
+                        >批量不通过</el-button
+                    >
+                </el-col>
+                <!--        <el-col :span="1.5">-->
+                <!--          <el-button-->
+                <!--            type="warning"-->
+                <!--            plain-->
+                <!--            icon="el-icon-download"-->
+                <!--            size="mini"-->
+                <!--            @click="handleExport"-->
+                <!--            v-hasPermi="['system:dict:export']"-->
+                <!--          >导出</el-button>-->
+                <!--        </el-col>-->
+            </el-row>
+            <el-table
+                v-loading="loading"
+                :data="detailTableList"
+                @selection-change="handleSelectionChange"
+                height="400"
+            >
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column
+                    label="序号"
+                    align="center"
+                    width="80"
+                    type="index"
+                >
+                    <template scope="scope">
+                        <span>{{
+                            (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                        }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="设备类型"
+                    align="center"
+                    prop="typeName2"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="数量"
+                    align="center"
+                    prop="repairNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="编号"
+                    align="center"
+                    prop="maCode"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="提交入库人员"
+                    align="center"
+                    prop="updateBy"
+                    :show-overflow-tooltip="true"
+                    width="100"
+                />
+                <el-table-column
+                    label="提交入库时间"
+                    align="center"
+                    prop="updateTime"
+                    width="100"
+                ></el-table-column>
 
-        <el-table-column label="状态" align="center" prop="status">
-          <!-- <template slot-scope="scope">
+                <el-table-column label="状态" align="center" prop="status">
+                    <!-- <template slot-scope="scope">
             <span v-if="scope.row.status=='0'">未审核</span>
             <span v-if="scope.row.status=='1'">已入库</span>
             <span v-if="scope.row.status=='2'">驳回 </span>
           </template>-->
-        </el-table-column>
+                </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" @click="pass(scope.row)" v-if="scope.row.status == '进行中'">通过</el-button>
-            <el-button size="mini" type="text" v-if="scope.row.status == '进行中'"
-              @click="refused(scope.row)">不通过</el-button>
-            <!--          <el-button-->
-            <!--            size="mini"-->
-            <!--            type="text"-->
-            <!--            icon="el-icon-delete"-->
-            <!--            @click="handleDelete(scope.row)"-->
-            <!--            v-hasPermi="['system:dict:remove']"-->
-            <!--          >删除</el-button>-->
-          </template>
-        </el-table-column>
-      </el-table>
+                <el-table-column
+                    label="操作"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    v-if="showHandle"
+                >
+                    <template slot-scope="scope">
+                        <el-button
+                            size="mini"
+                            type="text"
+                            @click="pass(scope.row)"
+                            v-if="scope.row.status == '进行中'"
+                            >通过</el-button
+                        >
+                        <el-button
+                            size="mini"
+                            type="text"
+                            v-if="scope.row.status == '进行中'"
+                            @click="refused(scope.row)"
+                            >不通过</el-button
+                        >
+                        <!--          <el-button-->
+                        <!--            size="mini"-->
+                        <!--            type="text"-->
+                        <!--            icon="el-icon-delete"-->
+                        <!--            @click="handleDelete(scope.row)"-->
+                        <!--            v-hasPermi="['system:dict:remove']"-->
+                        <!--          >删除</el-button>-->
+                    </template>
+                </el-table-column>
+            </el-table>
 
-      <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="query.pageNum" :limit.sync="query.pageSize"
-        @pagination="getDialogTable" />
-    </el-dialog>
-  </div>
+            <pagination
+                v-show="dialogTotal > 0"
+                :total="dialogTotal"
+                :page.sync="query.pageNum"
+                :limit.sync="query.pageSize"
+                @pagination="getDialogTable"
+            />
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
-import { getRepairedList, getRepairedDetailList, inputByType, getTypeList } from '@/api/store/warehousing'
-import { equipmentTypeTree } from '@/api/store/tools'
+    import {
+        listType,
+        getType,
+        delType,
+        addType,
+        updateType,
+        refreshCache,
+    } from '@/api/system/dict/type'
+    import {
+        getRepairedList,
+        getRepairedDetailList,
+        inputByType,
+        getTypeList,
+    } from '@/api/store/warehousing'
+    import { equipmentTypeTree } from '@/api/store/tools'
 
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+    import Treeselect from '@riophae/vue-treeselect'
+    import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
-export default {
-  name: 'RepairWarehousing',
-  dicts: ['sys_normal_disable'],
-  components: {
-    Treeselect,
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 总条数
-      dialogTotal: 0,
-      //搜索下拉数据
-      typeList: [],
-      modelList: [],
-      // 表格数据
-      tableList: [],
-      detailTableList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      showHandle: true,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined,
-        keyWord: '',
-        wxTime: '',
-        deviceTypeId: '',
-      },
-      query: {
-        pageNum: 1,
-        pageSize: 10,
-        keyWord: '',
-        typeId: ''
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          {
-            required: true,
-            message: '字典名称不能为空',
-            trigger: 'blur',
-          },
-        ],
-        dictType: [
-          {
-            required: true,
-            message: '字典类型不能为空',
-            trigger: 'blur',
-          },
-        ],
-      },
-      equipmentTypeList: [],
-    }
-  },
-  created() {
-    this.getList()
-    this.getTypeList()
-    this.equipmentType()
-  },
-  methods: {
-    getTypeList() {
-      getTypeList({ level: '3' }).then(response => {
-        this.typeList = response.data
-      })
-      getTypeList({ level: '4' }).then(response => {
-        this.modelList = response.data
-      })
-    },
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true
-      getRepairedList(this.queryParams).then(response => {
-        this.tableList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
-
-    getDialogTable() {
-      this.loading = true
-      getRepairedDetailList(this.query).then(response => {
-        this.detailTableList = response.rows
-        this.dialogTotal = response.total
-        this.loading = false
-      })
-    },
-
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: '0',
-        remark: undefined,
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 搜索按钮操作 */
-    handleDialogQuery() {
-      this.query.pageNum = 1
-      this.getDialogTable()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // this.reset();
-      this.open = true
-      this.title = '添加字典类型'
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // this.reset();
-      this.query.keyWord = ''
-      this.query.taskId = row.id
-      this.getDialogTable()
-      this.open = true
-      this.showHandle = true
-      this.title = '审核'
-    },
-    //查看
-    handleView(row) {
-      this.query.keyWord = ''
-      this.query.taskId = row.id
-      this.getDialogTable()
-      this.open = true
-      this.showHandle = false
-      this.title = '查看'
-    },
-    pass(row) {
-      console.log(row)
-      console.log(this.query.taskId)
-      row.taskId = this.query.taskId
-      let obj = {
-        taskId: this.query.taskId,
-        id: row.id,
-        checkType: '1', //1 审核通过 2 驳回 -必填
-        type: row.manageType, //0.编号 1.计数
-        maId: row.maId,
-        typeId: row.typeId,
-        remark: row.remark,
-        repairNum: row.repairNum,
-      }
-
-      let param = {
-        params: JSON.stringify([obj]),
-      }
-      console.log(param)
-      inputByType(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-    passAll() {
-      console.log(this.query.taskId)
-      console.log(this.ids)
-      this.ids.forEach(item => {
-        item.taskId = this.query.taskId
-        item.checkType = '1'
-        item.type = item.manageType //0.编号 1.计数
-      })
-      let param = {
-        params: JSON.stringify(this.ids),
-      }
-      inputByType(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-
-    refused(row) {
-      console.log(row)
-      console.log(this.query.taskId)
-      row.taskId = this.query.taskId
-      let obj = {
-        taskId: this.query.taskId,
-        id: row.id,
-        checkType: '2', //1 审核通过 2 驳回 -必填
-        type: row.manageType, //0.编号 1.计数
-        maId: row.maId,
-        typeId: row.typeId,
-        remark: row.remark,
-        repairNum: row.repairNum,
-      }
-      let param = {
-        params: JSON.stringify([obj]),
-      }
-      inputByType(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-    refusedAll() {
-      console.log(this.query.taskId)
-      console.log(this.ids)
-      this.ids.forEach(item => {
-        item.taskId = this.query.taskId
-        item.checkType = '2'
-        item.type = item.manageType
-      })
-      let param = {
-        params: JSON.stringify(this.ids),
-      }
-      inputByType(param).then(response => {
-        if (response.code == 200) {
-          this.$modal.msgSuccess('审批成功')
-          this.getDialogTable()
-          this.getList()
-        } else {
-          this.$modal.msgSuccess('审批失败')
-        }
-      })
-    },
-
-    /** 提交按钮 */
-    submitForm: function () {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      // const dictIds = row.dictId || this.ids;
-      // this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
-      //   return delType(dictIds);
-      // }).then(() => {
-      //   this.getList();
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        'material/RepairTestInput/export',
-        {
-          ...this.queryParams,
+    export default {
+        name: 'RepairWarehousing',
+        dicts: ['sys_normal_disable'],
+        components: {
+            Treeselect,
         },
-        `修试入库_${new Date().getTime()}.xlsx`
-      )
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess('刷新成功')
-        this.$store.dispatch('dict/cleanDict')
-      })
-    },
-    //规格型号
-    equipmentType() {
-      equipmentTypeTree().then(response => {
-        this.equipmentTypeList = response.data
-        this.equipmentTypeList.forEach((item, index) => {
-          if (item.children && item.children.length > 0) {
-            item.children.forEach((item2, index2) => {
-              if (item2.children && item2.children.length > 0) {
-                item2.children.forEach(item3 => {
-                  if (item3.children && item3.children.length > 0) {
-                    item3.children.forEach(item4 => {
-                      item4.machineTypeName = item3.typeName
-                      item4.specificationType = item4.typeName
-                      // this.$set(item4, 'purchasePrice', 0);
-                      // this.$set(item4, 'purchaseNum', 1);
-                    })
-                  }
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 总条数
+                dialogTotal: 0,
+                //搜索下拉数据
+                typeList: [],
+                modelList: [],
+                // 表格数据
+                tableList: [],
+                detailTableList: [],
+                // 弹出层标题
+                title: '',
+                // 是否显示弹出层
+                open: false,
+                showHandle: true,
+                // 日期范围
+                dateRange: [],
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: undefined,
+                    keyWord: '',
+                    wxTime: '',
+                    deviceTypeId: '',
+                },
+                query: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    keyWord: '',
+                    typeId: '',
+                },
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    dictName: [
+                        {
+                            required: true,
+                            message: '字典名称不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                    dictType: [
+                        {
+                            required: true,
+                            message: '字典类型不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+                equipmentTypeList: [],
+            }
+        },
+        created() {
+            this.getList()
+            this.getTypeList()
+            this.equipmentType()
+        },
+        methods: {
+            getTypeList() {
+                getTypeList({ level: '3' }).then((response) => {
+                    this.typeList = response.data
                 })
-              }
-            })
-          }
-        })
-      })
-    },
-  },
-}
+                getTypeList({ level: '4' }).then((response) => {
+                    this.modelList = response.data
+                })
+            },
+            /** 查询字典类型列表 */
+            getList() {
+                this.loading = true
+                getRepairedList(this.queryParams).then((response) => {
+                    this.tableList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                })
+            },
+
+            getDialogTable() {
+                this.loading = true
+                getRepairedDetailList(this.query).then((response) => {
+                    this.detailTableList = response.rows
+                    this.dialogTotal = response.total
+                    this.loading = false
+                })
+            },
+
+            // 取消按钮
+            cancel() {
+                this.open = false
+                this.reset()
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    dictId: undefined,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: '0',
+                    remark: undefined,
+                }
+                this.resetForm('form')
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1
+                this.getList()
+            },
+            /** 搜索按钮操作 */
+            handleDialogQuery() {
+                this.query.pageNum = 1
+                this.getDialogTable()
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.resetForm('queryForm')
+                this.queryParams.keyWord = ''
+                this.handleQuery()
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                // this.reset();
+                this.open = true
+                this.title = '添加字典类型'
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map((item) => item)
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                // this.reset();
+                this.query.keyWord = ''
+                this.query.taskId = row.id
+                this.getDialogTable()
+                this.open = true
+                this.showHandle = true
+                this.title = '审核'
+            },
+            //查看
+            handleView(row) {
+                this.query.keyWord = ''
+                this.query.taskId = row.id
+                this.getDialogTable()
+                this.open = true
+                this.showHandle = false
+                this.title = '查看'
+            },
+            pass(row) {
+                console.log(row)
+                console.log(this.query.taskId)
+                row.taskId = this.query.taskId
+                let obj = {
+                    taskId: this.query.taskId,
+                    id: row.id,
+                    checkType: '1', //1 审核通过 2 驳回 -必填
+                    type: row.manageType, //0.编号 1.计数
+                    maId: row.maId,
+                    typeId: row.typeId,
+                    remark: row.remark,
+                    repairNum: row.repairNum,
+                }
+
+                let param = {
+                    params: JSON.stringify([obj]),
+                }
+                console.log(param)
+                inputByType(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+            passAll() {
+                console.log(this.query.taskId)
+                console.log(this.ids)
+                this.ids.forEach((item) => {
+                    item.taskId = this.query.taskId
+                    item.checkType = '1'
+                    item.type = item.manageType //0.编号 1.计数
+                })
+                let param = {
+                    params: JSON.stringify(this.ids),
+                }
+                inputByType(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+
+            refused(row) {
+                console.log(row)
+                console.log(this.query.taskId)
+                row.taskId = this.query.taskId
+                let obj = {
+                    taskId: this.query.taskId,
+                    id: row.id,
+                    checkType: '2', //1 审核通过 2 驳回 -必填
+                    type: row.manageType, //0.编号 1.计数
+                    maId: row.maId,
+                    typeId: row.typeId,
+                    remark: row.remark,
+                    repairNum: row.repairNum,
+                }
+                let param = {
+                    params: JSON.stringify([obj]),
+                }
+                inputByType(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+            refusedAll() {
+                console.log(this.query.taskId)
+                console.log(this.ids)
+                this.ids.forEach((item) => {
+                    item.taskId = this.query.taskId
+                    item.checkType = '2'
+                    item.type = item.manageType
+                })
+                let param = {
+                    params: JSON.stringify(this.ids),
+                }
+                inputByType(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+
+            /** 提交按钮 */
+            submitForm: function () {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        if (this.form.dictId != undefined) {
+                            updateType(this.form).then((response) => {
+                                this.$modal.msgSuccess('修改成功')
+                                this.open = false
+                                this.getList()
+                            })
+                        } else {
+                            addType(this.form).then((response) => {
+                                this.$modal.msgSuccess('新增成功')
+                                this.open = false
+                                this.getList()
+                            })
+                        }
+                    }
+                })
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                // const dictIds = row.dictId || this.ids;
+                // this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
+                //   return delType(dictIds);
+                // }).then(() => {
+                //   this.getList();
+                //   this.$modal.msgSuccess("删除成功");
+                // }).catch(() => {});
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'material/RepairTestInput/export',
+                    {
+                        ...this.queryParams,
+                    },
+                    `修试入库_${new Date().getTime()}.xlsx`,
+                )
+            },
+            /** 刷新缓存按钮操作 */
+            handleRefreshCache() {
+                refreshCache().then(() => {
+                    this.$modal.msgSuccess('刷新成功')
+                    this.$store.dispatch('dict/cleanDict')
+                })
+            },
+            //规格型号
+            equipmentType() {
+                equipmentTypeTree().then((response) => {
+                    this.equipmentTypeList = response.data
+                    this.equipmentTypeList.forEach((item, index) => {
+                        if (item.children && item.children.length > 0) {
+                            item.children.forEach((item2, index2) => {
+                                if (
+                                    item2.children &&
+                                    item2.children.length > 0
+                                ) {
+                                    item2.children.forEach((item3) => {
+                                        if (
+                                            item3.children &&
+                                            item3.children.length > 0
+                                        ) {
+                                            item3.children.forEach((item4) => {
+                                                item4.machineTypeName =
+                                                    item3.typeName
+                                                item4.specificationType =
+                                                    item4.typeName
+                                                // this.$set(item4, 'purchasePrice', 0);
+                                                // this.$set(item4, 'purchaseNum', 1);
+                                            })
+                                        }
+                                    })
+                                }
+                            })
+                        }
+                    })
+                })
+            },
+        },
+        watch: {
+            $route: {
+                handler(to) {
+                    if (to.query.keyWord) {
+                        this.queryParams.keyWord = to.query.keyWord
+                        this.getList()
+                    }
+                },
+                deep: true,
+                immediate: true,
+            },
+        },
+    }
 </script>
 <style lang="scss" scoped>
-::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
-}
+    ::v-deep.el-table .fixed-width .el-button--mini {
+        width: 60px !important;
+        margin-bottom: 10px;
+    }
 </style>
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index cfd4a588..0f6ccd83 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,11 +42,11 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.13:38080`, //超
+        target: `http://10.40.92.8:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        target: `http://10.40.92.138:28080`, //帅
-        // target: `http://10.40.92.14:28080`, //福
+        // target: `http://10.40.92.138:28080`, //帅
+        // target: `http://10.40.92.253:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;