From 2f658edcf8dd4cabae1c3be879a5980358353b59 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 22 Apr 2025 09:45:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/assetAttributeAllocation/index.vue        | 2 +-
 src/views/base/assetAttributeManagement/index.vue        | 2 +-
 src/views/base/comeAndGo/index.vue                       | 2 +-
 src/views/base/comeAndGo/people.vue                      | 2 +-
 src/views/base/project/index.vue                         | 2 +-
 src/views/base/section/index.vue                         | 2 +-
 src/views/base/unit/index.vue                            | 2 +-
 .../return/receive/component/addReturn1.vue              | 9 +++++++--
 src/views/cost/csotSettlement/costApplyList.vue          | 8 ++++----
 src/views/repairTest/brokenExamine/index.vue             | 4 ++--
 src/views/repairTest/inventoryScrap/index.vue            | 1 +
 src/views/repairTest/repair/index.vue                    | 4 ++--
 src/views/repairTest/testExamine/index.vue               | 4 ++--
 src/views/store/poleConfig/poleConfig.vue                | 2 +-
 src/views/warehouseManage/machinery/coding-nw/index.vue  | 4 ++--
 src/views/warehouseManage/machinery/keeper/index.vue     | 2 +-
 src/views/warehouseManage/machinery/parts/index.vue      | 4 ++--
 src/views/warehouseManage/machinery/personnel/index.vue  | 4 ++--
 src/views/warehouseManage/machinery/supplier/index.vue   | 4 ++--
 src/views/warehouseManage/machinery/type/index.vue       | 4 ++--
 src/views/warehouseManage/tagBind/bind/index.vue         | 4 ++--
 src/views/warehouseManage/tagBind/history/index.vue      | 4 ++--
 22 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/views/base/assetAttributeAllocation/index.vue b/src/views/base/assetAttributeAllocation/index.vue
index 48fd648..42d49c2 100644
--- a/src/views/base/assetAttributeAllocation/index.vue
+++ b/src/views/base/assetAttributeAllocation/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="assetAttributeAllocation">
+    <div class="app-container" >
         <el-row :gutter="20">
             <!--部门数据-->
             <el-col :span="4" :xs="24">
diff --git a/src/views/base/assetAttributeManagement/index.vue b/src/views/base/assetAttributeManagement/index.vue
index 2608b7d..ff26d13 100644
--- a/src/views/base/assetAttributeManagement/index.vue
+++ b/src/views/base/assetAttributeManagement/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="assetAttributeManagement">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
diff --git a/src/views/base/comeAndGo/index.vue b/src/views/base/comeAndGo/index.vue
index ff17b79..ba946c0 100644
--- a/src/views/base/comeAndGo/index.vue
+++ b/src/views/base/comeAndGo/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="comeAndGo">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
diff --git a/src/views/base/comeAndGo/people.vue b/src/views/base/comeAndGo/people.vue
index 922a3e1..fbfb062 100644
--- a/src/views/base/comeAndGo/people.vue
+++ b/src/views/base/comeAndGo/people.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="comeAndGoPeople">
+  <div class="app-container" >
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index fbaccea..6db0476 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="project">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
diff --git a/src/views/base/section/index.vue b/src/views/base/section/index.vue
index 9b7ca30..d9ad22a 100644
--- a/src/views/base/section/index.vue
+++ b/src/views/base/section/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="section">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
diff --git a/src/views/base/unit/index.vue b/src/views/base/unit/index.vue
index eab92ea..60f3276 100644
--- a/src/views/base/unit/index.vue
+++ b/src/views/base/unit/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="unit">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
diff --git a/src/views/claimAndreturn/return/receive/component/addReturn1.vue b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
index 7599f7d..008acab 100644
--- a/src/views/claimAndreturn/return/receive/component/addReturn1.vue
+++ b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
@@ -964,8 +964,13 @@ export default {
                             item.maintenanceNum = (item.repairMaCodeDtoList && item.repairMaCodeDtoList.length) || 0
                         }
                     })
-                    const isNum = this.queryParams.leaseApplyDetails.some(
-                        (item) => item.backNum == '' || item.backNum == undefined,
+                    console.log("kkkkkkkkkkkkkkk",this.queryParams.leaseApplyDetails)
+                    const isNum = this.queryParams.leaseApplyDetails.some(      
+                        (item) => {
+                            if(item.manageType == 1) {return  Number(item.maintenanceNum || 0) + Number(item.passNum || 0)==0}
+                            else {return (!item.numList) || (Number(item.numList.length || 0)==0) }
+                                 }
+                        // (item) => item.backNum == '' || item.backNum == undefined || item.backNum == 0,
                     )
                     if (isNum) {
                         this.$message.error('退料数量不能为空！')
diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue
index 2f17138..8009f51 100644
--- a/src/views/cost/csotSettlement/costApplyList.vue
+++ b/src/views/cost/csotSettlement/costApplyList.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 费用结算页面 -->
-    <div class="app-container" id="costApplyList">
+    <div class="app-container" >
         <template v-if="isHome">
             <el-form
                 :model="queryParams"
@@ -155,7 +155,7 @@ import MonthRecord from './component/monthRecord.vue'
 import FinishAndDetails from './component/finishAndDetails.vue'
 
 export default {
-    name: 'CostApplyList',
+    name: 'Cost/costApplyList',
     components: {
         ExportDialog,
         MonthRecord,
@@ -313,8 +313,8 @@ export default {
                 pageSize: this.queryParams.pageSize,
             }
             getSltAgreementInfo(params).then((response) => {
-                this.agreementList = response.rows
-                this.total = response.total
+                this.agreementList = response.data.rows
+                this.total = response.data.total
                 this.loading = false
             }).catch((error) => {
                 console.log('🚀 ~ getList ~ error:', error)
diff --git a/src/views/repairTest/brokenExamine/index.vue b/src/views/repairTest/brokenExamine/index.vue
index 9c6c046..831d570 100644
--- a/src/views/repairTest/brokenExamine/index.vue
+++ b/src/views/repairTest/brokenExamine/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="brokenExamine">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -690,7 +690,7 @@ import {
 import selectTree from '../repair/selectTree.vue'
 import Tree from '@/views/repairTest/repair/tree.vue'
 export default {
-    name: 'BrokenExamine',
+    name: 'RepairTest/brokenExamine',
     components: { Tree, selectTree },
     dicts: ['sys_normal_disable'],
     data() {
diff --git a/src/views/repairTest/inventoryScrap/index.vue b/src/views/repairTest/inventoryScrap/index.vue
index 0f00968..7cc215a 100644
--- a/src/views/repairTest/inventoryScrap/index.vue
+++ b/src/views/repairTest/inventoryScrap/index.vue
@@ -29,6 +29,7 @@ import Home from "./component/homeApply.vue"; // 主列表
 import AddTools from "./component/addToolsApply.vue"; // 新增机具 和 修改机具
 import QueryTools from "./component/queryToolsApply.vue"; // 查询机具 和 验收机具
 export default {
+  name: "InventoryScrap",
   components: {
     Home,
     PageHeader,
diff --git a/src/views/repairTest/repair/index.vue b/src/views/repairTest/repair/index.vue
index 173c570..568fd91 100644
--- a/src/views/repairTest/repair/index.vue
+++ b/src/views/repairTest/repair/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="repair">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -587,7 +587,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import selectTree from './selectTree.vue'
 import Tree from './tree.vue'
 export default {
-    name: 'Repair',
+    name: 'RepairTest/repair',
     dicts: ['sys_normal_disable'],
     components: {
         dialogOneForm,
diff --git a/src/views/repairTest/testExamine/index.vue b/src/views/repairTest/testExamine/index.vue
index 5aa0702..665fce2 100644
--- a/src/views/repairTest/testExamine/index.vue
+++ b/src/views/repairTest/testExamine/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="testExamine">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -652,7 +652,7 @@ import selectTree from '../repair/selectTree.vue'
 import Tree from '@/views/repairTest/repair/tree.vue'
 import vueEasyPrint from 'vue-easy-print'
 export default {
-    name: 'TestExamine',
+    name: 'RepairTest/testExamine',
     components: { Tree, selectTree, vueEasyPrint },
     dicts: ['sys_normal_disable'],
     data() {
diff --git a/src/views/store/poleConfig/poleConfig.vue b/src/views/store/poleConfig/poleConfig.vue
index 29de57c..68eb7ab 100644
--- a/src/views/store/poleConfig/poleConfig.vue
+++ b/src/views/store/poleConfig/poleConfig.vue
@@ -181,7 +181,7 @@ import {
     delCompleteSetToolsApi,
 } from '@/api/store/completeTools.js'
 export default {
-    name: 'poleConfig',
+    name: 'PoleConfig',
     data() {
         return {
             isLoading: false,
diff --git a/src/views/warehouseManage/machinery/coding-nw/index.vue b/src/views/warehouseManage/machinery/coding-nw/index.vue
index 3616233..3b1a188 100644
--- a/src/views/warehouseManage/machinery/coding-nw/index.vue
+++ b/src/views/warehouseManage/machinery/coding-nw/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 编码设备管理 -->
-    <div class="app-container" id="devices" v-if="!props.isShow">
+    <div class="app-container"  v-if="!props.isShow">
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -600,7 +600,7 @@ import BindIOT from './component/BindIOT'
 import MapDialog from './component/MapDIalog'
 
 export default {
-    name: 'Devices',
+    name: 'Coding',
     dicts: ['sys_normal_disable'],
     components: { Treeselect, BindIOT, MapDialog },
     data() {
diff --git a/src/views/warehouseManage/machinery/keeper/index.vue b/src/views/warehouseManage/machinery/keeper/index.vue
index 68b3b94..9852a3e 100644
--- a/src/views/warehouseManage/machinery/keeper/index.vue
+++ b/src/views/warehouseManage/machinery/keeper/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 库管员配置 -->
-    <div class="app-container" id="keeper">
+    <div class="app-container" >
         <el-row :gutter="20">
             <!--部门数据-->
             <el-col :span="4" :xs="24">
diff --git a/src/views/warehouseManage/machinery/parts/index.vue b/src/views/warehouseManage/machinery/parts/index.vue
index 137ddcc..0c2b64a 100644
--- a/src/views/warehouseManage/machinery/parts/index.vue
+++ b/src/views/warehouseManage/machinery/parts/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 配件管理 -->
-    <div class="app-container" id="accessory">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -322,7 +322,7 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 // level 层级 +1
 export default {
-    name: 'Accessory',
+    name: 'Parts',
     dicts: ['sys_normal_disable'],
     components: { Treeselect },
     data() {
diff --git a/src/views/warehouseManage/machinery/personnel/index.vue b/src/views/warehouseManage/machinery/personnel/index.vue
index 900cf2a..aaeec27 100644
--- a/src/views/warehouseManage/machinery/personnel/index.vue
+++ b/src/views/warehouseManage/machinery/personnel/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 维修员配置 -->
-    <div class="app-container" id="repair">
+    <div class="app-container" >
         <el-row :gutter="20">
             <!--部门数据-->
             <el-col :span="4" :xs="24">
@@ -266,7 +266,7 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-    name: 'Repair',
+    name: 'Personnel',
     dicts: ['sys_normal_disable', 'sys_user_sex'],
     components: { Treeselect },
     data() {
diff --git a/src/views/warehouseManage/machinery/supplier/index.vue b/src/views/warehouseManage/machinery/supplier/index.vue
index 4afdc84..7530eec 100644
--- a/src/views/warehouseManage/machinery/supplier/index.vue
+++ b/src/views/warehouseManage/machinery/supplier/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 供应商管理 -->
-    <div class="app-container" id="toolsSupplier">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -310,7 +310,7 @@ import {
 } from '@/api/store/tools'
 import { imgUpLoad, fileUpLoad } from '@/api/system/upload'
 export default {
-    name: 'ToolsSupplier',
+    name: 'Supplier',
     dicts: ['sys_normal_disable'],
     data() {
         return {
diff --git a/src/views/warehouseManage/machinery/type/index.vue b/src/views/warehouseManage/machinery/type/index.vue
index 5ff778b..cc75116 100644
--- a/src/views/warehouseManage/machinery/type/index.vue
+++ b/src/views/warehouseManage/machinery/type/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 类型管理 -->
-    <div class="app-container" id="toolsType">
+    <div class="app-container" >
         <el-row :gutter="20">
             <!--树数据-->
             <el-col :span="5" :xs="24">
@@ -579,7 +579,7 @@ import { getProLists } from '@/api/base/base'
 import { imgUpLoad, fileUpLoad } from '@/api/system/upload'
 import { getInfo } from '@/api/login'
 export default {
-    name: 'ToolsType',
+    name: 'Type',
     // dicts: ['sys_normal_disable', 'sys_user_sex'],
     components: { Treeselect },
     data() {
diff --git a/src/views/warehouseManage/tagBind/bind/index.vue b/src/views/warehouseManage/tagBind/bind/index.vue
index 21ea935..2182099 100644
--- a/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/src/views/warehouseManage/tagBind/bind/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 标签绑定管理 -->
-    <div class="app-container" id="labelBinding">
+    <div class="app-container" >
         <div style="z-index: 10000">
             <div style="z-index: 10000">
                 <el-form
@@ -524,7 +524,7 @@ import { getDeviceTypeTree } from '@/api/claimAndRefund/receive'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-    name: 'LabelBinding',
+    name: 'Bind',
     dicts: ['sys_normal_disable'],
     components: { Treeselect },
     data() {
diff --git a/src/views/warehouseManage/tagBind/history/index.vue b/src/views/warehouseManage/tagBind/history/index.vue
index ae15fbf..4c2d7ff 100644
--- a/src/views/warehouseManage/tagBind/history/index.vue
+++ b/src/views/warehouseManage/tagBind/history/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 标签绑定历史 -->
-    <div class="app-container" id="labelBindingHistory">
+    <div class="app-container" >
         <el-form
             :model="queryParams"
             ref="queryForm"
@@ -195,7 +195,7 @@ import { listLabelHistoryList } from '@/api/store/label'
 import { getTypeList } from '@/api/store/warehousing'
 import QRCode from 'qrcodejs2'
 export default {
-    name: 'LabelBindingHistory',
+    name: 'History',
     dicts: ['sys_normal_disable'],
     data() {
         return {