From a71a21d07072569e2f18176e325fbada9b529a84 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 17 May 2024 14:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BB=A5=E5=8F=8A=E9=A1=B5=E9=9D=A2=E7=AD=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/.env.production                       |    2 +
 sgzb-ui/.env.production-nw                    |   10 -
 sgzb-ui/{.env.staging => .env.testing}        |    6 +-
 sgzb-ui/bin/build-prod.bat                    |   12 +
 sgzb-ui/bin/build-text.bat                    |   12 +
 sgzb-ui/package.json                          |    3 +-
 sgzb-ui/src/utils/globalUrl.js                |    2 +-
 .../claimAndRefund/receive/receiveOut.vue     |    1 +
 sgzb-ui/src/views/repairTest/repair/index.vue |    1 +
 .../views/repairTest/testExamine/index.vue    | 1050 +++++++++--------
 .../forecastWaste/auditing/index.vue          |    1 +
 .../forecastWaste/listing/index.vue           |    5 +-
 .../scrapManage/scrap/disposition/index.vue   |    2 +
 .../newBuy/newDevices/newDevicesList.vue      |    1 +
 .../newDevices/newDevicesWarehousing.vue      |  663 +++++------
 .../store/warehousing/repairWarehousing.vue   |    1 +
 16 files changed, 901 insertions(+), 871 deletions(-)
 delete mode 100644 sgzb-ui/.env.production-nw
 rename sgzb-ui/{.env.staging => .env.testing} (60%)
 create mode 100644 sgzb-ui/bin/build-prod.bat
 create mode 100644 sgzb-ui/bin/build-text.bat

diff --git a/sgzb-ui/.env.production b/sgzb-ui/.env.production
index 512859c3..92d0837e 100644
--- a/sgzb-ui/.env.production
+++ b/sgzb-ui/.env.production
@@ -1,6 +1,8 @@
 # 页面标题
 VUE_APP_TITLE = 施工装备管理系统
 
+NODE_ENV = production
+
 # 生产环境配置
 ENV = 'production'
 
diff --git a/sgzb-ui/.env.production-nw b/sgzb-ui/.env.production-nw
deleted file mode 100644
index b43eed8f..00000000
--- a/sgzb-ui/.env.production-nw
+++ /dev/null
@@ -1,10 +0,0 @@
-# 南网系统配置
-
-# 页面标题
-VUE_APP_TITLE = 施工装备管理系统
-
-# 生产环境配置
-ENV = 'production-nw'
-
-# 若依管理系统/生产环境
-VUE_APP_BASE_API = '/gl/dev-api'
diff --git a/sgzb-ui/.env.staging b/sgzb-ui/.env.testing
similarity index 60%
rename from sgzb-ui/.env.staging
rename to sgzb-ui/.env.testing
index 361859f6..4056f094 100644
--- a/sgzb-ui/.env.staging
+++ b/sgzb-ui/.env.testing
@@ -1,10 +1,10 @@
 # 页面标题
 VUE_APP_TITLE = 若依管理系统
 
-NODE_ENV = production
+NODE_ENV = testing
 
 # 测试环境配置
-ENV = 'staging'
+ENV = 'testing'
 
 # 若依管理系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = '/dev-api'
diff --git a/sgzb-ui/bin/build-prod.bat b/sgzb-ui/bin/build-prod.bat
new file mode 100644
index 00000000..e74798fc
--- /dev/null
+++ b/sgzb-ui/bin/build-prod.bat
@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [��Ϣ] ���Web���̣�����dist�ļ���
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run build:prod
+
+pause
\ No newline at end of file
diff --git a/sgzb-ui/bin/build-text.bat b/sgzb-ui/bin/build-text.bat
new file mode 100644
index 00000000..db46eaf2
--- /dev/null
+++ b/sgzb-ui/bin/build-text.bat
@@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [��Ϣ] ���Web���̣�����dist�ļ���
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run build:test
+
+pause
\ No newline at end of file
diff --git a/sgzb-ui/package.json b/sgzb-ui/package.json
index 0f2820f8..5cb36ff3 100644
--- a/sgzb-ui/package.json
+++ b/sgzb-ui/package.json
@@ -7,7 +7,8 @@
     "scripts": {
         "dev": "vue-cli-service serve",
         "build": "vue-cli-service build",
-        "build:stage": "vue-cli-service build --mode staging",
+        "build:test": "vue-cli-service build --mode testing", 
+        "build:prod": "vue-cli-service build --mode production",
         "preview": "node build/index.js --preview",
         "lint": "eslint --ext .js,.vue src"
     },
diff --git a/sgzb-ui/src/utils/globalUrl.js b/sgzb-ui/src/utils/globalUrl.js
index 00c4f207..114be562 100644
--- a/sgzb-ui/src/utils/globalUrl.js
+++ b/sgzb-ui/src/utils/globalUrl.js
@@ -4,7 +4,7 @@
 // const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
 // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
 
-const qrUrl = process.env.NODE_ENV === 'production' ? 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
+const qrUrl = process.env.NODE_ENV === 'production' ? 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
 
 export default {
   qrUrl,
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index 824c667c..664e0244 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -168,6 +168,7 @@
                         type="primary"
                         v-if="scope.row.taskStatus != 35"
                         @click="handleOut(scope.row)"
+                        v-hasPermi="['picking:outbound']"
                     >
                         出库
                     </el-button>
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index 47e70068..270fd7e3 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -238,6 +238,7 @@
                         icon="el-icon-setting"
                         v-if="scope.row.repairStatusCode == '43'"
                         @click="handleUpdate(scope.row, 'update')"
+                         v-hasPermi="['service:button']"
                     >
                         维修
                     </el-button>
diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue
index 0318131b..29838d5d 100644
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@@ -136,6 +136,7 @@
                     size="mini"
                     :disabled="multiple"
                     @click="checkClick"
+                    v-hasPermi="['service:batch:auditing']"
                     >批量审核</el-button
                 >
             </el-col>
@@ -244,6 +245,7 @@
                         icon="el-icon-circle-check"
                         v-if="scope.row.taskStatus == 46"
                         @click="handleUpdate(scope.row, 'update')"
+                        v-hasPermi="['service:auditing']"
                         >审核</el-button
                     >
                 </template>
@@ -754,554 +756,554 @@
 </template>
 
 <script>
-import {
-    getQuestListApi,
-    getRepairAuditListApi,
-    addDetailsAuditApi,
-    getRepairRecord,
-    getPartRecord,
-} from '@/api/repairTest/testExamine'
-import { getProjectList } from '@/api/claimAndRefund/receive'
-import {
-    getUnitInfoSelectApi,
-    getProjectSelectApi,
-    getDicSelectApi,
-    listPartTypeApi,
-    getMaTypeSelectApi,
-} from '@/api/repairTest/repair'
-import selectTree from '../repair/selectTree.vue'
-import Tree from '@/views/repairTest/repair/tree.vue'
-export default {
-    name: 'TestExamine',
-    components: { Tree, selectTree },
-    dicts: ['sys_normal_disable'],
-    data() {
-        return {
-            checkResultOne: false,
-            defaultData: null,
-            selectionList: [],
-            unitInfoSelectList: [],
-            projectSelectList: [],
-            dicSelectList: [],
-            dialogList: [],
-            deptList: [],
-            deptTypeList: [],
-            rowObj: {},
-            fullscreenLoading: false,
-            openOne: false,
-            openTwo: false,
-            openThree: false,
-            openFour: false,
-            openTextOne: '',
-            openTextTwo: '',
-            openTextThree: '',
-            type: '',
-            // 遮罩层
-            loading: false,
-            // 选中数组
-            ids: [],
-            dialogIds: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 非单个禁用
-            dialogSingle: true,
-            // 非多个禁用
-            dialogMultiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            dialogTotal: 0,
-            // 字典表格数据
-            typeList: [],
-            // 弹出层标题
-            title: '',
-            dialogTitle: '',
-            // 是否显示弹出层
-            open: false,
-            // 日期范围
-            dateRange: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                keyword: '',
-                backUnit: '',
-                backPro: '',
+    import {
+        getQuestListApi,
+        getRepairAuditListApi,
+        addDetailsAuditApi,
+        getRepairRecord,
+        getPartRecord,
+    } from '@/api/repairTest/testExamine'
+    import { getProjectList } from '@/api/claimAndRefund/receive'
+    import {
+        getUnitInfoSelectApi,
+        getProjectSelectApi,
+        getDicSelectApi,
+        listPartTypeApi,
+        getMaTypeSelectApi,
+    } from '@/api/repairTest/repair'
+    import selectTree from '../repair/selectTree.vue'
+    import Tree from '@/views/repairTest/repair/tree.vue'
+    export default {
+        name: 'TestExamine',
+        components: { Tree, selectTree },
+        dicts: ['sys_normal_disable'],
+        data() {
+            return {
+                checkResultOne: false,
+                defaultData: null,
+                selectionList: [],
+                unitInfoSelectList: [],
+                projectSelectList: [],
+                dicSelectList: [],
+                dialogList: [],
+                deptList: [],
+                deptTypeList: [],
+                rowObj: {},
+                fullscreenLoading: false,
+                openOne: false,
+                openTwo: false,
+                openThree: false,
+                openFour: false,
+                openTextOne: '',
+                openTextTwo: '',
+                openTextThree: '',
                 type: '',
-                backCode: '',
-                taskStatus: '',
-            },
-            dialogQueryParams: {
-                pageNum: 1,
-                pageSize: 10,
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-                remark: [
-                    {
-                        required: true,
-                        message: '原因不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-            },
-            repairId: '',
-            openRepairRecord: false,
-            repairRecordList: [],
-            repairRecordParams: {
-                pageNum: 1,
-                pageSize: 10,
-            },
-            repairRecordTotal: 0,
-            openPartRecord: false,
-            partRecordList: [],
-            partRecordParams: {
-                pageNum: 1,
-                pageSize: 10,
-            },
-            partRecordTotal: 0,
-        }
-    },
-    created() {
-        this.getList()
-        getUnitInfoSelectApi().then((res) => {
-            this.unitInfoSelectList = res.data
-        })
-        getProjectList().then((res) => {
-            this.projectSelectList = res.data
-        })
-        getDicSelectApi({ value: 'ws_shenhe' }).then((res) => {
-            this.dicSelectList = res.data
-        })
-        this.getTree()
-    },
-
-    methods: {
-        /** 查询字典类型列表 */
-        getList() {
-            this.loading = true
-            getQuestListApi(
-                this.addDateRange(this.queryParams, this.dateRange),
-            ).then((response) => {
-                this.typeList = response.data.rows
-                this.total = response.data.total
-                this.loading = false
-            })
-        },
-        // 封装弹框页面查询
-        getdialogList() {
-            let params = {
-                taskId: this.rowObj.taskId,
-                pageNum: this.dialogQueryParams.pageNum,
-                keyword: this.dialogQueryParams.keyword,
-                typeName: this.dialogQueryParams.typeName,
-                type: this.dialogQueryParams.type,
-                pageSize: this.dialogQueryParams.pageSize,
+                // 遮罩层
+                loading: false,
+                // 选中数组
+                ids: [],
+                dialogIds: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 非单个禁用
+                dialogSingle: true,
+                // 非多个禁用
+                dialogMultiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                dialogTotal: 0,
+                // 字典表格数据
+                typeList: [],
+                // 弹出层标题
+                title: '',
+                dialogTitle: '',
+                // 是否显示弹出层
+                open: false,
+                // 日期范围
+                dateRange: [],
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    keyword: '',
+                    backUnit: '',
+                    backPro: '',
+                    type: '',
+                    backCode: '',
+                    taskStatus: '',
+                },
+                dialogQueryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                },
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    remark: [
+                        {
+                            required: true,
+                            message: '原因不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
+                repairId: '',
+                openRepairRecord: false,
+                repairRecordList: [],
+                repairRecordParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                },
+                repairRecordTotal: 0,
+                openPartRecord: false,
+                partRecordList: [],
+                partRecordParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                },
+                partRecordTotal: 0,
             }
-            // this.loading = true;
-            getRepairAuditListApi(params)
-                .then((response) => {
-                    if (response.code == 200) {
-                        // this.loading = false;
-                        this.open = true
-                        this.dialogList = response.rows
-                        this.dialogTotal = response.total
-                    }
-                })
-                .catch(() => {})
         },
-        checkClick() {
-            this.title = '审批'
-            this.openFour = true
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false
-            this.reset()
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                dictId: undefined,
-                dictName: undefined,
-                dictType: undefined,
-                status: '0',
-                remark: undefined,
-            }
-            this.resetForm('form')
-        },
-        onClose() {
-            this.open = false
-            this.queryParams.type = ''
-            // this.resetQueryDialog()
+        created() {
             this.getList()
-        },
-        resetQueryDialog() {
-            this.dialogQueryParams = {}
-            this.resetForm('dialogQueryParams')
-            this.$refs.mychildDialog.clearSelect()
-            this.$refs.mychildDialogTwo.clearSelect()
-            this.dialogQueryParams.pageNum = 1
-            this.dialogQueryParams.pageSize = 10
-            this.getdialogList()
-        },
-        selectDrop(value) {
-            this.queryParams.type = value
-        },
-        selectDropDialog(value) {
-            this.dialogQueryParams.typeName = value
-        },
-        selectDropDialogTwo(value) {
-            this.dialogQueryParams.type = value
-        },
-        getTree() {
-            listPartTypeApi().then((response) => {
-                this.deptList = response.data
-                // this.deptList = this.handleTree(response.data, "id");
+            getUnitInfoSelectApi().then((res) => {
+                this.unitInfoSelectList = res.data
             })
-            getMaTypeSelectApi().then((response) => {
-                this.deptTypeList = response.data
+            getProjectList().then((res) => {
+                this.projectSelectList = res.data
             })
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.dateRange = []
-            this.queryParams.backUnit = ''
-            this.queryParams.backPro = ''
-            this.resetForm('queryForm')
-            this.$refs.mychildSon.inputValue = ''
-            this.queryParams.type = ''
-            this.handleQuery()
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.reset()
-            this.open = true
-            this.title = '新建'
-        },
-        selectable(row) {
-            if (row.taskStatus == 46) {
-                return true
-            } else {
-                return false
-            }
-        },
-        selectableDialog(row) {
-            if (row.status == '0') {
-                return true
-            } else {
-                return false
-            }
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.selectionList = selection
-            this.checkResultOne = selection.every(
-                (item) => item.taskStatus == 46,
-            )
-            this.ids = selection.map((item) => item.dictId)
-            this.single = selection.length != 1
-            this.multiple = !selection.length
-            // console.log(this.checkResultOne)
-            console.log(this.checkResultOne)
-        },
-        handleDialogSelectionChange(selection) {
-            this.dialogIds = selection.map((item) => item)
-            this.dialogSingle = selection.length != 1
-            this.dialogMultiple = !selection.length
-            console.log(this.checkResultOne)
-        },
-        handleSee(row, type) {
-            this.dialogTitle = '查看'
-            this.rowObj = row
-            this.reset()
-            this.type = type
-            this.getdialogList()
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row, type) {
-            this.dialogTitle = '审核'
-            this.rowObj = row
-            this.reset()
-            this.type = type
-            this.getdialogList()
-        },
-        /** 提交按钮 */
-        submitForm(val) {
-            // val 1代表对话框中审核   2代表批量审核
-            this.checkResult = val
-            if (this.checkResult == 1) {
-                let taskIdList = []
-                taskIdList.push(this.rowObj.taskId)
-                let params = {
-                    checkResult: '通过',
-                    taskIdList: taskIdList,
-                    auditDetailList: this.dialogIds,
-                }
-                // console.log(params)
-                addDetailsAuditApi(params)
-                    .then((res) => {
-                        this.$modal.msgSuccess('审核通过')
-                        this.open = false
-                        this.getList()
-                    })
-                    .catch(() => {})
-            }
-            if (this.checkResult == 2) {
-                let taskIdList = []
-                this.selectionList.map((item) => {
-                    taskIdList.push(item.taskId)
-                })
-                let params = {
-                    checkResult: '通过',
-                    taskIdList: taskIdList,
-                }
-                addDetailsAuditApi(params)
-                    .then((res) => {
-                        this.$modal.msgSuccess('审核通过')
-                        this.open = false
-                        this.getList()
-                    })
-                    .catch(() => {})
-            }
-            // this.openOne = true
-            // this.openFour = false
-            // this.openTextOne = '确定审批通过么?'
-            // this.openTextTwo = '确定审批通过么?'
-        },
-        submitOpenOneForm() {
-            this.openOne = false
-            this.open = false
-            // val 1代表对话框中审核   2代表批量审核
-            if (this.checkResult == 1) {
-                let taskIdList = []
-                taskIdList.push(this.rowObj.taskId)
-                let params = {
-                    checkResult: '通过',
-                    taskIdList: taskIdList,
-                    auditDetailList: this.dialogIds,
-                }
-                // console.log(params)
-                addDetailsAuditApi(params)
-                    .then((res) => {
-                        this.openTwo = true
-                        this.open = false
-                        this.openTextThree = '审批通过！'
-                        // this.getdialogList()
-                        this.getList()
-                    })
-                    .catch(() => {})
-            }
-            if (this.checkResult == 2) {
-                let taskIdList = []
-                this.selectionList.map((item) => {
-                    taskIdList.push(item.taskId)
-                })
-                let params = {
-                    checkResult: '通过',
-                    taskIdList: taskIdList,
-                }
-                addDetailsAuditApi(params)
-                    .then((res) => {
-                        this.openTwo = true
-                        this.openTextThree = '审批通过！'
-                        this.getList()
-                    })
-                    .catch(() => {})
-            }
-        },
-        openTextThreeClose() {
-            this.open = false
-            this.openOne = false
-            this.openTwo = false
-            this.openThree = false
-            this.openFour = false
-            this.getList()
+            getDicSelectApi({ value: 'ws_shenhe' }).then((res) => {
+                this.dicSelectList = res.data
+            })
+            this.getTree()
         },
 
-        submitOpenOneFeturn() {
-            this.openOne = false
-        },
-        //维修记录
-        repairRecord(row) {
-            this.repairRecordParams.pageNum = 1
-            this.repairRecordParams.pageSize = 10
-            this.repairId = row.repairId
-            this.getRepairRecordList()
-        },
-        getRepairRecordList() {
-            let params = {
-                repairId: this.repairId,
-                pageNum: this.repairRecordParams.pageNum,
-                pageSize: this.repairRecordParams.pageSize,
-            }
-            getRepairRecord(params)
-                .then((res) => {
-                    this.repairRecordList = res.rows
-                    this.repairRecordTotal = res.total
-                    this.openRepairRecord = true
-                    this.title = '维修记录'
+        methods: {
+            /** 查询字典类型列表 */
+            getList() {
+                this.loading = true
+                getQuestListApi(
+                    this.addDateRange(this.queryParams, this.dateRange),
+                ).then((response) => {
+                    this.typeList = response.data.rows
+                    this.total = response.data.total
+                    this.loading = false
                 })
-                .catch(() => {})
-        },
-        //配件详情
-        partRecord(row) {
-            this.partRecordParams.pageNum = 1
-            this.partRecordParams.pageSize = 10
-            this.repairId = row.repairId
-            this.getPartRecordList()
-        },
-        getPartRecordList() {
-            let params = {
-                repairId: this.repairId,
-                pageNum: this.partRecordParams.pageNum,
-                pageSize: this.partRecordParams.pageSize,
-            }
-            getPartRecord(params)
-                .then((res) => {
-                    this.partRecordList = res.rows
-                    this.partRecordTotal = res.total
-                    this.openPartRecord = true
-                    this.title = '配件详情'
-                })
-                .catch(() => {})
-        },
-
-        returnSubmit(val) {
-            this.checkResult = val
-            this.title = '驳回原因'
-            this.openThree = true
-        },
-        formCancel() {
-            this.$refs.form.resetFields()
-            this.openThree = false
-        },
-        formSubmit() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    if (this.checkResult == 1) {
-                        let taskIdList = []
-                        taskIdList.push(this.rowObj.taskId)
-                        let params = {
-                            checkResult: '不通过',
-                            taskIdList: taskIdList,
-                            auditDetailList: this.dialogIds,
-                            remark: this.form.remark,
+            },
+            // 封装弹框页面查询
+            getdialogList() {
+                let params = {
+                    taskId: this.rowObj.taskId,
+                    pageNum: this.dialogQueryParams.pageNum,
+                    keyword: this.dialogQueryParams.keyword,
+                    typeName: this.dialogQueryParams.typeName,
+                    type: this.dialogQueryParams.type,
+                    pageSize: this.dialogQueryParams.pageSize,
+                }
+                // this.loading = true;
+                getRepairAuditListApi(params)
+                    .then((response) => {
+                        if (response.code == 200) {
+                            // this.loading = false;
+                            this.open = true
+                            this.dialogList = response.rows
+                            this.dialogTotal = response.total
                         }
-                        addDetailsAuditApi(params)
-                            .then((res) => {
-                                this.$refs.form.resetFields()
-                                this.formCancel()
-                                this.open = false
-                                this.openThree = false
-                                // this.getdialogList()
-                                this.getList()
-                            })
-                            .catch(() => {})
-                    }
-                    if (this.checkResult == 2) {
-                        let taskIdList = []
-                        this.selectionList.map((item) => {
-                            taskIdList.push(item.taskId)
-                        })
-                        let params = {
-                            checkResult: '不通过',
-                            taskIdList: taskIdList,
-                            remark: this.form.remark,
-                        }
-                        addDetailsAuditApi(params)
-                            .then((res) => {
-                                // if (res.code == 200) {
-                                this.$refs.form.resetFields()
-                                this.openThree = false
-                                this.openFour = false
-                                this.getList()
-                                // }
-                            })
-                            .catch(() => {})
-                    }
+                    })
+                    .catch(() => {})
+            },
+            checkClick() {
+                this.title = '审批'
+                this.openFour = true
+            },
+            // 取消按钮
+            cancel() {
+                this.open = false
+                this.reset()
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    dictId: undefined,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: '0',
+                    remark: undefined,
+                }
+                this.resetForm('form')
+            },
+            onClose() {
+                this.open = false
+                this.queryParams.type = ''
+                // this.resetQueryDialog()
+                this.getList()
+            },
+            resetQueryDialog() {
+                this.dialogQueryParams = {}
+                this.resetForm('dialogQueryParams')
+                this.$refs.mychildDialog.clearSelect()
+                this.$refs.mychildDialogTwo.clearSelect()
+                this.dialogQueryParams.pageNum = 1
+                this.dialogQueryParams.pageSize = 10
+                this.getdialogList()
+            },
+            selectDrop(value) {
+                this.queryParams.type = value
+            },
+            selectDropDialog(value) {
+                this.dialogQueryParams.typeName = value
+            },
+            selectDropDialogTwo(value) {
+                this.dialogQueryParams.type = value
+            },
+            getTree() {
+                listPartTypeApi().then((response) => {
+                    this.deptList = response.data
+                    // this.deptList = this.handleTree(response.data, "id");
+                })
+                getMaTypeSelectApi().then((response) => {
+                    this.deptTypeList = response.data
+                })
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1
+                this.getList()
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.dateRange = []
+                this.queryParams.backUnit = ''
+                this.queryParams.backPro = ''
+                this.resetForm('queryForm')
+                this.$refs.mychildSon.inputValue = ''
+                this.queryParams.type = ''
+                this.handleQuery()
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                this.reset()
+                this.open = true
+                this.title = '新建'
+            },
+            selectable(row) {
+                if (row.taskStatus == 46) {
+                    return true
                 } else {
                     return false
                 }
-            })
+            },
+            selectableDialog(row) {
+                if (row.status == '0') {
+                    return true
+                } else {
+                    return false
+                }
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.selectionList = selection
+                this.checkResultOne = selection.every(
+                    (item) => item.taskStatus == 46,
+                )
+                this.ids = selection.map((item) => item.dictId)
+                this.single = selection.length != 1
+                this.multiple = !selection.length
+                // console.log(this.checkResultOne)
+                console.log(this.checkResultOne)
+            },
+            handleDialogSelectionChange(selection) {
+                this.dialogIds = selection.map((item) => item)
+                this.dialogSingle = selection.length != 1
+                this.dialogMultiple = !selection.length
+                console.log(this.checkResultOne)
+            },
+            handleSee(row, type) {
+                this.dialogTitle = '查看'
+                this.rowObj = row
+                this.reset()
+                this.type = type
+                this.getdialogList()
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row, type) {
+                this.dialogTitle = '审核'
+                this.rowObj = row
+                this.reset()
+                this.type = type
+                this.getdialogList()
+            },
+            /** 提交按钮 */
+            submitForm(val) {
+                // val 1代表对话框中审核   2代表批量审核
+                this.checkResult = val
+                if (this.checkResult == 1) {
+                    let taskIdList = []
+                    taskIdList.push(this.rowObj.taskId)
+                    let params = {
+                        checkResult: '通过',
+                        taskIdList: taskIdList,
+                        auditDetailList: this.dialogIds,
+                    }
+                    // console.log(params)
+                    addDetailsAuditApi(params)
+                        .then((res) => {
+                            this.$modal.msgSuccess('审核通过')
+                            this.open = false
+                            this.getList()
+                        })
+                        .catch(() => {})
+                }
+                if (this.checkResult == 2) {
+                    let taskIdList = []
+                    this.selectionList.map((item) => {
+                        taskIdList.push(item.taskId)
+                    })
+                    let params = {
+                        checkResult: '通过',
+                        taskIdList: taskIdList,
+                    }
+                    addDetailsAuditApi(params)
+                        .then((res) => {
+                            this.$modal.msgSuccess('审核通过')
+                            this.open = false
+                            this.getList()
+                        })
+                        .catch(() => {})
+                }
+                // this.openOne = true
+                // this.openFour = false
+                // this.openTextOne = '确定审批通过么?'
+                // this.openTextTwo = '确定审批通过么?'
+            },
+            submitOpenOneForm() {
+                this.openOne = false
+                this.open = false
+                // val 1代表对话框中审核   2代表批量审核
+                if (this.checkResult == 1) {
+                    let taskIdList = []
+                    taskIdList.push(this.rowObj.taskId)
+                    let params = {
+                        checkResult: '通过',
+                        taskIdList: taskIdList,
+                        auditDetailList: this.dialogIds,
+                    }
+                    // console.log(params)
+                    addDetailsAuditApi(params)
+                        .then((res) => {
+                            this.openTwo = true
+                            this.open = false
+                            this.openTextThree = '审批通过！'
+                            // this.getdialogList()
+                            this.getList()
+                        })
+                        .catch(() => {})
+                }
+                if (this.checkResult == 2) {
+                    let taskIdList = []
+                    this.selectionList.map((item) => {
+                        taskIdList.push(item.taskId)
+                    })
+                    let params = {
+                        checkResult: '通过',
+                        taskIdList: taskIdList,
+                    }
+                    addDetailsAuditApi(params)
+                        .then((res) => {
+                            this.openTwo = true
+                            this.openTextThree = '审批通过！'
+                            this.getList()
+                        })
+                        .catch(() => {})
+                }
+            },
+            openTextThreeClose() {
+                this.open = false
+                this.openOne = false
+                this.openTwo = false
+                this.openThree = false
+                this.openFour = false
+                this.getList()
+            },
+
+            submitOpenOneFeturn() {
+                this.openOne = false
+            },
+            //维修记录
+            repairRecord(row) {
+                this.repairRecordParams.pageNum = 1
+                this.repairRecordParams.pageSize = 10
+                this.repairId = row.repairId
+                this.getRepairRecordList()
+            },
+            getRepairRecordList() {
+                let params = {
+                    repairId: this.repairId,
+                    pageNum: this.repairRecordParams.pageNum,
+                    pageSize: this.repairRecordParams.pageSize,
+                }
+                getRepairRecord(params)
+                    .then((res) => {
+                        this.repairRecordList = res.rows
+                        this.repairRecordTotal = res.total
+                        this.openRepairRecord = true
+                        this.title = '维修记录'
+                    })
+                    .catch(() => {})
+            },
+            //配件详情
+            partRecord(row) {
+                this.partRecordParams.pageNum = 1
+                this.partRecordParams.pageSize = 10
+                this.repairId = row.repairId
+                this.getPartRecordList()
+            },
+            getPartRecordList() {
+                let params = {
+                    repairId: this.repairId,
+                    pageNum: this.partRecordParams.pageNum,
+                    pageSize: this.partRecordParams.pageSize,
+                }
+                getPartRecord(params)
+                    .then((res) => {
+                        this.partRecordList = res.rows
+                        this.partRecordTotal = res.total
+                        this.openPartRecord = true
+                        this.title = '配件详情'
+                    })
+                    .catch(() => {})
+            },
+
+            returnSubmit(val) {
+                this.checkResult = val
+                this.title = '驳回原因'
+                this.openThree = true
+            },
+            formCancel() {
+                this.$refs.form.resetFields()
+                this.openThree = false
+            },
+            formSubmit() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        if (this.checkResult == 1) {
+                            let taskIdList = []
+                            taskIdList.push(this.rowObj.taskId)
+                            let params = {
+                                checkResult: '不通过',
+                                taskIdList: taskIdList,
+                                auditDetailList: this.dialogIds,
+                                remark: this.form.remark,
+                            }
+                            addDetailsAuditApi(params)
+                                .then((res) => {
+                                    this.$refs.form.resetFields()
+                                    this.formCancel()
+                                    this.open = false
+                                    this.openThree = false
+                                    // this.getdialogList()
+                                    this.getList()
+                                })
+                                .catch(() => {})
+                        }
+                        if (this.checkResult == 2) {
+                            let taskIdList = []
+                            this.selectionList.map((item) => {
+                                taskIdList.push(item.taskId)
+                            })
+                            let params = {
+                                checkResult: '不通过',
+                                taskIdList: taskIdList,
+                                remark: this.form.remark,
+                            }
+                            addDetailsAuditApi(params)
+                                .then((res) => {
+                                    // if (res.code == 200) {
+                                    this.$refs.form.resetFields()
+                                    this.openThree = false
+                                    this.openFour = false
+                                    this.getList()
+                                    // }
+                                })
+                                .catch(() => {})
+                        }
+                    } else {
+                        return false
+                    }
+                })
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'material/details/export',
+                    {
+                        ...this.queryParams,
+                    },
+                    `试验检验单_${new Date().getTime()}.xlsx`,
+                )
+            },
         },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download(
-                'material/details/export',
-                {
-                    ...this.queryParams,
-                },
-                `试验检验单_${new Date().getTime()}.xlsx`,
-            )
-        },
-    },
-}
+    }
 </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: 40%;
+
+        .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: 40%;
+    ::v-deep.el-table .fixed-width .el-button--mini {
+        width: 70px !important;
+        margin-bottom: 6px;
+    }
 
-    .submit_box_title {
+    .dialog-footer-btn {
         display: flex;
-        flex-direction: column;
-        margin-left: 10px;
-        font-size: 18px;
-        font-weight: 600;
+        align-items: center;
+        justify-content: flex-end;
     }
-}
 
-::v-deep.el-table .fixed-width .el-button--mini {
-    width: 70px !important;
-    margin-bottom: 6px;
-}
-
-.dialog-footer-btn {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-
-.submit_box_openFour {
-    display: flex;
-    justify-content: center;
-    align-content: center;
-    font-size: 18px;
-}
+    .submit_box_openFour {
+        display: flex;
+        justify-content: center;
+        align-content: center;
+        font-size: 18px;
+    }
 </style>
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
index 0a64f8c8..20dd42ca 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
@@ -63,6 +63,7 @@
                     size="mini"
                     v-if="data.taskStatus === 121 || data.taskStatus === 120"
                     @click="handleAuditing(data)"
+                    v-hasPermi="['forecast:waste:auditing']"
                     >审核</el-button
                 >
             </template>
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
index dc3b8b9a..a8a42488 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
@@ -21,9 +21,12 @@
                             icon="el-icon-circle-check"
                             size="mini"
                             @click="handelSubmitScrap"
+                            v-hasPermi="['submit:batch:scrap']"
                             >提交报废</el-button
                         >
 
+                        <!-- 批量提交报废 -->
+
                         <el-button
                             type="success"
                             plain
@@ -75,7 +78,7 @@
                         type="text"
                         size="mini"
                         v-if="data.taskStatus == 124"
-                        v-hasPermi="['scrap:auditing']"
+                        v-hasPermi="['submit:scrap']"
                         @click="handleSubmitScrap(data)"
                         >提交报废</el-button
                     >
diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
index 97613be0..e50df522 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
+++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
@@ -18,6 +18,7 @@
                         plain
                         size="mini"
                         @click="handleBatchDisposition()"
+                        v-hasPermi="['scrap:batch:disposition']"
                         >批量处置</el-button
                     >
                     <el-button
@@ -69,6 +70,7 @@
                     type="text"
                     @click="handleDisposition(data)"
                     v-if="data.disposition == 0"
+                    v-hasPermi="['scrap:disposition']"
                 >
                     处置
                 </el-button>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index 4cf97978..f6fcb452 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -243,6 +243,7 @@
                             scope.row.manageType != '1'
                         "
                         @click="handleCode(scope.row)"
+                        v-hasPermi="['coding:manage']"
                         >编码管理</el-button
                     >
                     <el-button
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 78944857..db9a140e 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -184,6 +184,7 @@
                             scope.row.taskStatus == '105'
                         "
                         @click="handleUpdate(scope.row)"
+                        v-hasPermi="['warehousing:auditing']"
                         >审核</el-button
                     >
                     <el-button
@@ -526,359 +527,359 @@
 </template>
 
 <script>
-import { getTypeList } from '@/api/store/warehousing'
-import {
-    getPutInList,
-    getPutinDetailsList,
-    changePutinStatus,
-    warehousingEntry,
-} from '@/api/store/newBuy'
-import vueEasyPrint from 'vue-easy-print'
-export default {
-    // name: "NewDevicesWarehousing",
-    // dicts: ['sys_normal_disable'],
-    components: { vueEasyPrint },
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 总条数
-            dialogTotal: 0,
-            //搜索下拉数据
-            typesList: [],
-            modelList: [],
-            // 表格数据
-            tableList: [],
-            detailTableList: [],
-            // 弹出层标题
-            title: '',
-            // 是否显示弹出层
-            open: false,
-            openPrint: false,
-            printData: {},
-            printTableData: [],
-            showHandle: true,
-            // 日期范围
-            dateRange: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                dictName: undefined,
-                dictType: undefined,
-                status: undefined,
-                keyWord: '',
-                typeId: '',
-            },
-            query: {
-                pageNum: 1,
-                pageSize: 10,
-                dictName: undefined,
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-                dictName: [
-                    {
-                        required: true,
-                        message: '字典名称不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-                dictType: [
-                    {
-                        required: true,
-                        message: '字典类型不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-            },
-        }
-    },
-    created() {
-        this.getTypeList()
-        this.getList()
-    },
-    methods: {
-        getTypeList() {
-            getTypeList({ level: '3' }).then((response) => {
-                this.typesList = response.data
-            })
-        },
-        /** 查询字典类型列表 */
-        getList() {
-            this.loading = true
-            getPutInList(this.queryParams).then((response) => {
-                this.tableList = response.rows
-                this.total = response.total
-                this.loading = false
-            })
-        },
-
-        getDialogTable() {
-            this.loading = true
-            getPutinDetailsList(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,
+    import { getTypeList } from '@/api/store/warehousing'
+    import {
+        getPutInList,
+        getPutinDetailsList,
+        changePutinStatus,
+        warehousingEntry,
+    } from '@/api/store/newBuy'
+    import vueEasyPrint from 'vue-easy-print'
+    export default {
+        // name: "NewDevicesWarehousing",
+        // dicts: ['sys_normal_disable'],
+        components: { vueEasyPrint },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 总条数
+                dialogTotal: 0,
+                //搜索下拉数据
+                typesList: [],
+                modelList: [],
+                // 表格数据
+                tableList: [],
+                detailTableList: [],
+                // 弹出层标题
+                title: '',
+                // 是否显示弹出层
+                open: false,
+                openPrint: false,
+                printData: {},
+                printTableData: [],
+                showHandle: true,
+                // 日期范围
+                dateRange: [],
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    dictName: undefined,
+                    dictType: undefined,
+                    status: undefined,
+                    keyWord: '',
+                    typeId: '',
+                },
+                query: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    dictName: undefined,
+                },
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    dictName: [
+                        {
+                            required: true,
+                            message: '字典名称不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                    dictType: [
+                        {
+                            required: true,
+                            message: '字典类型不能为空',
+                            trigger: 'blur',
+                        },
+                    ],
+                },
             }
-            this.resetForm('form')
         },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1
+        created() {
+            this.getTypeList()
             this.getList()
         },
-        /** 搜索按钮操作 */
-        handleDialogQuery() {
-            this.query.pageNum = 1
-            this.getDialogTable()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.handleQuery()
-        },
-        //是否可用勾选框
-        selectable(row) {
-            console.log(row)
-            if (row.status == '0') {
-                if (
-                    (row.manageType == '0' && row.maCode) ||
-                    row.manageType == '1'
-                ) {
-                    return true
+        methods: {
+            getTypeList() {
+                getTypeList({ level: '3' }).then((response) => {
+                    this.typesList = response.data
+                })
+            },
+            /** 查询字典类型列表 */
+            getList() {
+                this.loading = true
+                getPutInList(this.queryParams).then((response) => {
+                    this.tableList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                })
+            },
+
+            getDialogTable() {
+                this.loading = true
+                getPutinDetailsList(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()
+            },
+            //是否可用勾选框
+            selectable(row) {
+                console.log(row)
+                if (row.status == '0') {
+                    if (
+                        (row.manageType == '0' && row.maCode) ||
+                        row.manageType == '1'
+                    ) {
+                        return true
+                    } else {
+                        return false
+                    }
                 } else {
                     return false
                 }
-            } else {
-                return false
-            }
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map((item) => item)
-            this.single = selection.length != 1
-            this.multiple = !selection.length
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            // this.reset();
-            this.query.taskId = row.taskId
-            this.query.dictName = undefined
-            this.getDialogTable()
-            this.open = true
-            this.showHandle = 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.taskId = row.taskId
+                this.query.dictName = undefined
+                this.getDialogTable()
+                this.open = true
+                this.showHandle = true
+                this.title = '审核'
+            },
 
-        //通过
-        pass(row) {
-            console.log(row)
-            console.log(this.query.taskId)
-            row.taskId = this.query.taskId
-            let obj = {
-                taskId: this.query.taskId,
-                maId: row.maId,
-                inputNum: row.checkNum,
-                maCode: row.maCode,
-                typeId: row.typeId,
-            }
+            //通过
+            pass(row) {
+                console.log(row)
+                console.log(this.query.taskId)
+                row.taskId = this.query.taskId
+                let obj = {
+                    taskId: this.query.taskId,
+                    maId: row.maId,
+                    inputNum: row.checkNum,
+                    maCode: row.maCode,
+                    typeId: row.typeId,
+                }
 
-            let param = {
-                taskId: this.query.taskId,
-                checkResult: '1',
-                inputRecordList: [obj],
-            }
-            changePutinStatus(param).then((response) => {
-                if (response.code == 200) {
-                    this.$modal.msgSuccess('审批成功')
-                    this.getDialogTable()
-                    this.getList()
-                } else {
-                    this.$modal.msgSuccess('审批失败')
+                let param = {
+                    taskId: this.query.taskId,
+                    checkResult: '1',
+                    inputRecordList: [obj],
                 }
-            })
-        },
-        passAll() {
-            console.log(this.query.taskId)
-            console.log(this.ids)
-            this.ids.forEach((item) => {
-                item.taskId = this.query.taskId
-                item.typeId = item.typeId
-                item.maId = item.maId
-                item.inputNum = item.checkNum
-                item.maCode = item.maCode
-            })
-            let param = {
-                taskId: this.query.taskId,
-                checkResult: '1',
-                inputRecordList: this.ids,
-            }
-            changePutinStatus(param).then((response) => {
-                if (response.code == 200) {
-                    this.$modal.msgSuccess('审批成功')
-                    this.getDialogTable()
-                    this.getList()
-                } else {
-                    this.$modal.msgSuccess('审批失败')
+                changePutinStatus(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.typeId = item.typeId
+                    item.maId = item.maId
+                    item.inputNum = item.checkNum
+                    item.maCode = item.maCode
+                })
+                let param = {
+                    taskId: this.query.taskId,
+                    checkResult: '1',
+                    inputRecordList: this.ids,
+                }
+                changePutinStatus(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,
+                    maId: row.maId,
+                    maCode: row.maCode,
+                    inputNum: row.checkNum,
+                    typeId: row.typeId,
                 }
-            })
-        },
-        //拒绝
-        refused(row) {
-            console.log(row)
-            console.log(this.query.taskId)
-            row.taskId = this.query.taskId
-            let obj = {
-                taskId: this.query.taskId,
-                maId: row.maId,
-                maCode: row.maCode,
-                inputNum: row.checkNum,
-                typeId: row.typeId,
-            }
 
-            let param = {
-                taskId: this.query.taskId,
-                checkResult: '2',
-                inputRecordList: [obj],
-            }
-            changePutinStatus(param).then((response) => {
-                if (response.code == 200) {
-                    this.$modal.msgSuccess('审批成功')
-                    this.getDialogTable()
-                    this.getList()
-                } else {
-                    this.$modal.msgSuccess('审批失败')
+                let param = {
+                    taskId: this.query.taskId,
+                    checkResult: '2',
+                    inputRecordList: [obj],
+                }
+                changePutinStatus(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.typeId = item.typeId
+                    item.maId = item.maId
+                    item.inputNum = item.checkNum
+                    item.maCode = item.maCode
+                })
+                let param = {
+                    taskId: this.query.taskId,
+                    checkResult: '2',
+                    inputRecordList: this.ids,
                 }
-            })
-        },
-        refusedAll() {
-            console.log(this.query.taskId)
-            console.log(this.ids)
-            this.ids.forEach((item) => {
-                item.taskId = this.query.taskId
-                item.typeId = item.typeId
-                item.maId = item.maId
-                item.inputNum = item.checkNum
-                item.maCode = item.maCode
-            })
-            let param = {
-                taskId: this.query.taskId,
-                checkResult: '2',
-                inputRecordList: this.ids,
-            }
 
-            changePutinStatus(param).then((response) => {
-                if (response.code == 200) {
-                    this.$modal.msgSuccess('审批成功')
-                    this.getDialogTable()
-                    this.getList()
-                } else {
-                    this.$modal.msgSuccess('审批失败')
-                }
-            })
+                changePutinStatus(param).then((response) => {
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess('审批成功')
+                        this.getDialogTable()
+                        this.getList()
+                    } else {
+                        this.$modal.msgSuccess('审批失败')
+                    }
+                })
+            },
+            //查看操作
+            handleView(row) {
+                this.query.taskId = row.taskId
+                this.getDialogTable()
+                this.open = true
+                this.showHandle = false
+                this.title = '查看'
+            },
+            //获取入库单数据
+            getPrintTable(taskId) {
+                warehousingEntry({ taskId: taskId }).then((response) => {
+                    this.printTableData = response.data
+                    // this.dialogTotal = response.total;
+                })
+            },
+            //查看入库单
+            handlePrint(row) {
+                this.query.taskId = row.taskId
+                this.getPrintTable(row.taskId)
+                this.openPrint = true
+                this.title = '入库单'
+            },
+            //打印
+            print() {
+                this.$refs.remarksPrintRef.print()
+            },
+            /** 导出按钮操作 */
+            handleExport() {
+                this.download(
+                    'material/purchaseCheckInfo/putInExport',
+                    {
+                        ...this.queryParams,
+                    },
+                    `新购工机具入库_${new Date().getTime()}.xlsx`,
+                )
+            },
         },
-        //查看操作
-        handleView(row) {
-            this.query.taskId = row.taskId
-            this.getDialogTable()
-            this.open = true
-            this.showHandle = false
-            this.title = '查看'
-        },
-        //获取入库单数据
-        getPrintTable(taskId) {
-            warehousingEntry({ taskId: taskId }).then((response) => {
-                this.printTableData = response.data
-                // this.dialogTotal = response.total;
-            })
-        },
-        //查看入库单
-        handlePrint(row) {
-            this.query.taskId = row.taskId
-            this.getPrintTable(row.taskId)
-            this.openPrint = true
-            this.title = '入库单'
-        },
-        //打印
-        print() {
-            this.$refs.remarksPrintRef.print()
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download(
-                'material/purchaseCheckInfo/putInExport',
-                {
-                    ...this.queryParams,
-                },
-                `新购工机具入库_${new Date().getTime()}.xlsx`,
-            )
-        },
-    },
-}
+    }
 </script>
 <style lang="scss" scoped>
-.print {
-    width: 90%;
-    padding-left: 5%;
-    padding-right: 1%;
+    .print {
+        width: 90%;
+        padding-left: 5%;
+        padding-right: 1%;
 
-    .title {
-        text-align: center;
-        font-weight: 600;
-        font-size: 16px;
-    }
+        .title {
+            text-align: center;
+            font-weight: 600;
+            font-size: 16px;
+        }
 
-    .info {
-        margin-top: 10px;
-        display: flex;
-        flex-wrap: wrap;
+        .info {
+            margin-top: 10px;
+            display: flex;
+            flex-wrap: wrap;
 
-        .item {
-            width: 50%;
-            flex-shrink: 0;
-            margin-bottom: 5px;
-            font-size: 14px;
+            .item {
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+            }
+        }
+
+        .fillIn {
+            margin-top: 15px;
+            display: flex;
+            justify-content: space-between;
         }
     }
 
-    .fillIn {
-        margin-top: 15px;
-        display: flex;
-        justify-content: space-between;
+    ::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/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
index a6a702c7..288d6d7c 100644
--- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
@@ -181,6 +181,7 @@
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-if="scope.row.taskStatus == '入库进行中'"
+                        v-hasPermi="['repairTest:auditing']"
                         >审核</el-button
                     >
                     <!--          <el-button-->