From 9e113d0ee0f3b59e13834d00c79e312d66aff353 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 14:20:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=B7=B3=E8=BD=AC=EF=BC=8C=E9=A2=86=E6=96=99=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E7=AD=89bug=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/AddPicking.vue    |  20 +-
 .../picking/apply/component/home.vue          |  13 +-
 .../claimAndreturn/picking/apply/index.vue    |   5 +-
 .../picking/auditing/component/home1.vue      |   6 +-
 .../cost/csotSettlement/costApplyList.vue     | 407 +++++++++---------
 sgzb-ui/src/views/index.vue                   |  16 +-
 .../partsAcceptance/component/home.vue        |   2 +-
 .../newPurchase/serviceCenter/index.vue       |   2 +-
 .../warehousing/newParts/index.vue            |   2 +-
 9 files changed, 248 insertions(+), 225 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index 26e182a4..75ad6077 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -254,6 +254,12 @@ export default {
         viewTaskId: {
             type: [String, Number],
         },
+        rejectTaskStatus: {
+            type: [String, Number],
+            default: () => {
+                return null
+            },
+        },
     },
     data() {
         const validatePhone = (rule, value, callback) => {
@@ -694,17 +700,16 @@ export default {
                                 this.queryParams.leaseApplyDetails,
                             )
                         })
+                        // 当领料任务被驳回后重新提交时，判断当前状态，如为100 则表示为内部驳回 需要增加参数 souceByRefuse为1
+                        if (this.rejectTaskStatus == 100) {
+                            this.queryParams.souceByRefuse = 1
+                        }
 
                         const params = {
                             ...this.queryParams,
                             taskId: this.taskId,
                             leaseApplyInfoList: this.leaseApplyInfoList,
                         }
-                        console.log(
-                            '驳回提交--------------保存',
-                            params,
-                            '参数----------',
-                        )
                         res = await editLeaseApply(params)
                     } else {
                         // console.log(this.queryParams)
@@ -717,11 +722,6 @@ export default {
                             return
                         }
                         res = await submitLeaseApply(this.queryParams)
-                        console.log(
-                            '正常申请提交--------------保存',
-                            this.queryParams,
-                            '参数--------------',
-                        )
                     }
                     if (res.code == 200) {
                         this.$message({
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
index 9e297ea7..fef698c2 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -496,7 +496,7 @@ export default {
             //         isBack: true,
             //     },
             // })
-            this.$emit('editPicking', row.taskId)
+            this.$emit('editPicking', row.taskId, row.taskStatus)
         },
         /** 删除按钮操作 */
         async handleDelete(row) {
@@ -534,6 +534,17 @@ export default {
             })
         },
     },
+    watch: {
+        $route: {
+            handler(to) {
+                if (to.query.keyWord) {
+                    this.queryParams.keyWord = to.query.keyWord
+                }
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
index e87f8898..8f569190 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
@@ -11,6 +11,7 @@
             :viewTaskId="viewTaskId"
             :isView="isView"
             :isEdit="isEdit"
+            :rejectTaskStatus="rejectTaskStatus"
             @addPicking="addPicking"
             @viewPicking="viewPicking"
             @editPicking="editPicking"
@@ -34,6 +35,7 @@ export default {
             isShowComponent: 'Home',
             pageContent: '新增领料任务',
             viewTaskId: '',
+            rejectTaskStatus: '',
             isView: false,
             isEdit: false,
         }
@@ -55,8 +57,9 @@ export default {
             this.isShowComponent = 'AddPicking'
         },
         /* 编辑和驳回提交 */
-        editPicking(taskId) {
+        editPicking(taskId, taskStatus) {
             this.viewTaskId = taskId
+            this.rejectTaskStatus = taskStatus || null
             this.isView = true
             this.isEdit = true
             this.pageContent = '领料任务编辑'
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
index ceee89bb..d49af2e8 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -259,7 +259,8 @@
                             (scope.row.leaseApplyInfoList[0].status == '5' ||
                                 scope.row.leaseApplyInfoList[0].status == '7' ||
                                 scope.row.leaseApplyInfoList[0].status == '4' ||
-                                scope.row.leaseApplyInfoList[0].status == '2')
+                                scope.row.leaseApplyInfoList[0].status == '2' ||
+                                scope.row.leaseApplyInfoList[0].status == '0')
                         "
                         >审批</el-button
                     >
@@ -274,7 +275,8 @@
                                 scope.row.leaseApplyInfoList[0].status == '7' ||
                                 scope.row.leaseApplyInfoList[0].status == '4' ||
                                 scope.row.leaseApplyInfoList[0].status == '2' ||
-                                scope.row.leaseApplyInfoList[0].status == '9')
+                                scope.row.leaseApplyInfoList[0].status == '9' ||
+                                scope.row.leaseApplyInfoList[0].status == '0')
                         "
                         >审批</el-button
                     >
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
index d56d5700..180138a0 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
@@ -83,9 +83,16 @@
             @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>
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
                 </template>
             </el-table-column>
             <el-table-column
@@ -166,214 +173,214 @@
 </template>
 
 <script>
-    import {
-        getAgreementList,
-        getUnitList,
-        getProjectList,
-    } from '@/api/claimAndRefund/receive'
-    import { getSltAgreementInfo } from '@/api/cost/cost'
+import {
+    getAgreementList,
+    getUnitList,
+    getProjectList,
+} from '@/api/claimAndRefund/receive'
+import { getSltAgreementInfo } from '@/api/cost/cost'
 
-    export default {
-        name: 'CostApplyList',
-        dicts: ['sys_normal_disable'],
-        data() {
-            return {
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 往来单位数据
-                unitList: [],
-                // 工程数据
-                projectList: [],
-                statusList: [
-                    { id: '0', name: '请选择' },
-                    { id: '1', name: '未结算' },
-                    { id: '2', name: '已结算' },
-                    { id: '3', name: '待审核' },
-                ], //集合
-                // 表格数据
-                agreementList: [],
-                // 弹出层标题
-                title: '',
-                // 是否显示弹出层
-                open: false,
-                // 日期范围
-                dateRange: [],
-                // 查询参数
-                queryParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    keyWord: undefined,
-                    sltStatus: '0',
-                    unitId: '',
-                    projectId: '',
-                },
-                // 表单参数
-                form: {},
-                //图片上传
-                uploadHeader: process.env.VUE_APP_BASE_API,
-                imageUrl: '',
-                imageName: '',
-                fileList: [],
-                field101fileList: [],
-                dialogImageUrl: '',
-                dialogVisible: false,
-                //上传地址
-                // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-                // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
-                uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
-                // 表单校验
-                rules: {
-                    contractCode: [
-                        {
-                            required: true,
-                            message: '合同编号不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                    signTime: [
-                        {
-                            required: true,
-                            message: '签订日期不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                    unitName: [
-                        {
-                            required: true,
-                            message: '往来单位不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                    projectName: [
-                        {
-                            required: true,
-                            message: '工程名称不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                },
-                peopleOpen: false,
-                noticeOpen: false,
-                nform: {
-                    notice: '',
-                },
-                nrules: {
-                    notice: [
-                        {
-                            required: true,
-                            message: '通知内容不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                },
-                deptName: undefined,
-            }
+export default {
+    name: 'CostApplyList',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 往来单位数据
+            unitList: [],
+            // 工程数据
+            projectList: [],
+            statusList: [
+                { id: '0', name: '请选择' },
+                { id: '1', name: '未结算' },
+                { id: '2', name: '已结算' },
+                { id: '3', name: '待审核' },
+            ], //集合
+            // 表格数据
+            agreementList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: undefined,
+                sltStatus: '0',
+                unitId: '',
+                projectId: '',
+            },
+            // 表单参数
+            form: {},
+            //图片上传
+            uploadHeader: process.env.VUE_APP_BASE_API,
+            imageUrl: '',
+            imageName: '',
+            fileList: [],
+            field101fileList: [],
+            dialogImageUrl: '',
+            dialogVisible: false,
+            //上传地址
+            // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
+            // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+            uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
+            // 表单校验
+            rules: {
+                contractCode: [
+                    {
+                        required: true,
+                        message: '合同编号不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                signTime: [
+                    {
+                        required: true,
+                        message: '签订日期不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                unitName: [
+                    {
+                        required: true,
+                        message: '往来单位不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                projectName: [
+                    {
+                        required: true,
+                        message: '工程名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+            peopleOpen: false,
+            noticeOpen: false,
+            nform: {
+                notice: '',
+            },
+            nrules: {
+                notice: [
+                    {
+                        required: true,
+                        message: '通知内容不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+            deptName: undefined,
+        }
+    },
+    created() {
+        this.getList()
+        this.getUnitList()
+        this.getProjectList()
+    },
+    methods: {
+        //获取单位类型 ,getUnitList, getProjectList
+        getUnitList() {
+            getUnitList().then((response) => {
+                this.unitList = response.data
+            })
         },
-        created() {
+        getProjectList() {
+            getProjectList().then((response) => {
+                this.projectList = response.data
+            })
+        },
+
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            getSltAgreementInfo(this.queryParams).then((response) => {
+                this.agreementList = response.rows
+                this.total = response.total
+                this.loading = false
+            })
+        },
+
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
             this.getList()
-            this.getUnitList()
-            this.getProjectList()
         },
-        methods: {
-            //获取单位类型 ,getUnitList, getProjectList
-            getUnitList() {
-                getUnitList().then((response) => {
-                    this.unitList = response.data
-                })
-            },
-            getProjectList() {
-                getProjectList().then((response) => {
-                    this.projectList = response.data
-                })
-            },
-
-            /** 查询字典类型列表 */
-            getList() {
-                this.loading = true
-                getSltAgreementInfo(this.queryParams).then((response) => {
-                    this.agreementList = response.rows
-                    this.total = response.total
-                    this.loading = false
-                })
-            },
-
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1
-                this.getList()
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.dateRange = []
-                this.resetForm('queryForm')
-                this.handleQuery()
-            },
-            //结算申请
-            handleApply(row) {
-                let arr = [row]
-                console.log(arr)
-                console.log(this.ids)
-                console.log(JSON.stringify(arr))
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        //结算申请
+        handleApply(row) {
+            let arr = [row]
+            console.log(arr)
+            console.log(this.ids)
+            console.log(JSON.stringify(arr))
+            this.$tab.closeOpenPage({
+                path: '/cost/cost/costApplyAdd',
+                query: {
+                    rowData: JSON.stringify(arr),
+                },
+            })
+        },
+        handleApplyList() {
+            if (this.ids.length > 0) {
+                let arr = this.ids
                 this.$tab.closeOpenPage({
                     path: '/cost/cost/costApplyAdd',
                     query: {
                         rowData: JSON.stringify(arr),
                     },
                 })
-            },
-            handleApplyList() {
-                if (this.ids.length > 0) {
-                    let arr = this.ids
-                    this.$tab.closeOpenPage({
-                        path: '/cost/cost/costApplyAdd',
-                        query: {
-                            rowData: JSON.stringify(arr),
-                        },
-                    })
-                }
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map((item) => item)
-                this.single = selection.length != 1
-                this.multiple = !selection.length
-            },
-
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                // const agreementId = row.agreementId;
-                // let param = {
-                //   agreementId:row.agreementId+''
-                // }
-                // this.$modal.confirm('是否确认删除该数据项？').then(function() {
-                //   return removeAgreement(param);
-                // }).then(() => {
-                //   this.getList();
-                //   this.$modal.msgSuccess("删除成功");
-                // }).catch(() => {});
-            },
-            /** 导出按钮操作 */
-            handleExport() {
-                // this.download('material/agreementInfo/export', {
-                //   ...this.queryParams
-                // }, `协议_${new Date().getTime()}.xlsx`)
-            },
+            }
         },
-    }
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            // const agreementId = row.agreementId;
+            // let param = {
+            //   agreementId:row.agreementId+''
+            // }
+            // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+            //   return removeAgreement(param);
+            // }).then(() => {
+            //   this.getList();
+            //   this.$modal.msgSuccess("删除成功");
+            // }).catch(() => {});
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            // this.download('material/agreementInfo/export', {
+            //   ...this.queryParams
+            // }, `协议_${new Date().getTime()}.xlsx`)
+        },
+    },
+}
 </script>
 <style lang="scss" scoped>
-    ::v-deep.el-table .fixed-width .el-button--mini {
-        width: 80px !important;
-        margin-bottom: 10px;
-    }
+::v-deep.el-table .fixed-width .el-button--mini {
+    width: 80px !important;
+    margin-bottom: 10px;
+}
 </style>
diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue
index be52fcbd..8b3c0097 100644
--- a/sgzb-ui/src/views/index.vue
+++ b/sgzb-ui/src/views/index.vue
@@ -306,17 +306,17 @@ export default {
                 /* 新购任务 */
                 {
                     taskTypeId: 23,
-                    routerPath: 'store/newBuy/newDevicesList',
+                    routerPath: 'store/newPurchase/tools',
                 },
                 /* 领料任务 */
                 {
                     taskTypeId: 29,
-                    routerPath: 'claimAndRefund/receive/receiveManage',
+                    routerPath: 'claimAndRefund/picking/apply',
                 },
                 /* 退料任务 */
                 {
                     taskTypeId: 36,
-                    routerPath: 'claimAndRefund/return/returnApply',
+                    routerPath: 'claimAndRefund/return/apply',
                 },
                 /* 维修任务 */
                 {
@@ -326,22 +326,22 @@ export default {
                 /* 维修审核 */
                 {
                     taskTypeId: 45,
-                    routerPath: 'repairTest/repair/repair',
+                    routerPath: 'repairTest/testExamine/testExamine',
                 },
                 /* 修试入库任务 */
                 {
                     taskTypeId: 50,
-                    routerPath: 'store/warehousing/repairWarehousing',
+                    routerPath: 'store/warehousing/repair',
                 },
-                /* 修试入库任务 */
+                /* 报废任务 */
                 {
                     taskTypeId: 57,
                     routerPath: 'scrap/manage/scrapAuditing',
                 },
-                /* 修试入库任务 */
+                /* 新购配件任务 */
                 {
                     taskTypeId: 67,
-                    routerPath: 'store/newBuy/newAccessoryList',
+                    routerPath: 'store/warehousing/newParts',
                 },
             ],
 
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
index dc9e712e..5410f9e8 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
@@ -296,7 +296,7 @@
                             width="80"
                             type="index"
                         >
-                            <template scope="scope">
+                            <template slot-scope="scope">
                                 <span>{{
                                     (queryParams.pageNum - 1) * 10 +
                                     scope.$index +
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
index 3308cf74..2d5c6190 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
@@ -283,7 +283,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
index d1a979f1..1913526a 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
@@ -380,7 +380,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>