搜索框返回复现

2025-04-22 09:45:45 +08:00 · 2025-04-22 09:45:45 +08:00 · 2f658edcf8
parent c2c2bf735b
commit 2f658edcf8
22 changed files with 41 additions and 35 deletions
--- 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">
--- 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"
--- 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"
--- 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">
--- 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"
--- 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"
--- 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"
--- 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
                        }
                    })
+                    console.log("kkkkkkkkkkkkkkk",this.queryParams.leaseApplyDetails)
                    const isNum = this.queryParams.leaseApplyDetails.some(      
-                        (item) => item.backNum == '' || item.backNum == undefined,
+                        (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('退料数量不能为空！')
--- 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)
--- 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() {
--- 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,
--- 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,
--- 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() {
--- 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,
--- 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() {
--- 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">
--- 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() {
--- 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() {
--- 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 {
--- 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() {
--- 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() {
--- 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 {