添加搜索

src/permission.js

@@ -11,6 +11,7 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login', '/register']
 
 router.beforeEach((to, from, next) => {
+  
   NProgress.start()
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)

src/views/auditPages/taskManagement/index.vue

@@ -268,10 +268,21 @@ export default {
     }
   },
   mounted() {
+
+    if (localStorage.getItem('ismypagination')) {
+      if (JSON.parse(localStorage.getItem('ismypagination')).isfanhui) {
+        this.formInline = JSON.parse(localStorage.getItem('ismypagination'))
+        this.handleQuery()
+      } else {
+        localStorage.removeItem("ismypagination")
+      }
+    }
+    localStorage.removeItem("ismypaginationTow")
     localStorage.removeItem("activeName")
     this.getInfo();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
+
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
@@ -386,6 +397,7 @@ export default {
         current: 1,
         size: 10,
       }
+      localStorage.removeItem("ismypagination")
       this.getInfo();
     },
     //打开列表
@@ -433,6 +445,9 @@ export default {
         this.formInline.endTime = this.formInline.time[1]
       }
       this.pagination = { ...this.pagination, ...this.formInline };
+
+      this.formInline.isfanhui = false
+      localStorage.setItem("ismypagination", JSON.stringify(this.formInline))
       this.getInfo();
     },
     // 页码获取

src/views/auditPages/taskManagement/info.vue

@@ -3,6 +3,7 @@
     <div class="info-left" id="L-size-main">
       <div class="content-info" id="L-header">
         <div class="info-title">任务详情</div>
+        <el-button type="primary" @click="sendBack" class="fanhuipiaofu" size='mini'>返回</el-button>
         <div class="teshu-top-info">
           <div class="top-info">
             <el-row class="top-row">
@@ -273,7 +274,6 @@ export default {
     return {
       index: 1,
       formInline: {
-        xtlx: "",
       },
       formInlineTwo: {
         dwmc: "",
@@ -337,6 +337,7 @@ export default {
     }
   },
   mounted() {
+  
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
     // 获取详情
@@ -346,12 +347,32 @@ export default {
     //获取饼状图数据
     this.getEchartsdata()
 
+    if (localStorage.getItem('ismypaginationTow')) {
+      if (JSON.parse(localStorage.getItem('ismypaginationTow')).isfanhuiTow) {
+        this.formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        this.titleInfo()
+
+      } else {
+
+        localStorage.removeItem("ismypaginationTow")
+      }
+    }
+
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
   },
 
   methods: {
+    sendBack() {
+      if (localStorage.getItem('ismypagination')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypagination'))
+        formInline.isfanhui = true
+        localStorage.setItem("ismypagination", JSON.stringify(formInline))
+      }
+
+      this.$router.go(-1);
+    },
     shouqiisis() {
       console.log(123);
       this.isshow = !this.isshow
@@ -366,9 +387,7 @@ export default {
     },
     //切换资产核查tab
     handleClick(tab, event) {
-      this.formInline = {
-        xtlx: "",
-      }
+    
       this.activeName = tab.name
       this.xtmcName = tab.$attrs.xtmcName,
         localStorage.setItem("activeName", this.activeName)
@@ -518,10 +537,10 @@ export default {
         }
       if (this.index == 1) {
         this.formInline = {
-          xtlx: "",
           type: this.activeName,
 
         }
+        localStorage.removeItem("ismypaginationTow")
         this.getList();
       } else if (this.index == 2) {
         this.formInlineTwo = {
@@ -538,8 +557,12 @@ export default {
         size: 10,
         type: this.activeName,
       }
+
       if (this.index == 1) {
         this.pagination = { ...this.pagination, ...this.formInline };
+
+        this.formInline.isfanhuiTow = false
+        localStorage.setItem("ismypaginationTow", JSON.stringify(this.formInline))
         this.getList();
       } else if (this.index == 2) {
         this.pagination = { ...this.pagination, ...this.formInlineTwo };
@@ -738,4 +761,14 @@ export default {
   z-index: 999;
 
 }
+
+.content-info {
+  position: relative;
+}
+
+.fanhuipiaofu {
+  position: absolute;
+  right: 20px;
+  top: 10px;
+}
 </style>

src/views/components/renwuType/index_v1.vue

@@ -227,13 +227,20 @@
             <el-button type="danger" @click="newAssets(0)">关停</el-button>
             <el-button @click="newAssets(1)">取消</el-button>
             <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-            <el-button type="primary" @click="newAssets(3)" :loading="loading">提交</el-button>
+            <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+
           </el-row>
         </el-form>
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
           <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
           <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+        </el-row>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-else>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
       </div>
     </div>
@@ -357,6 +364,14 @@ export default {
     }
   },
   methods: {
+    sendBack() {
+      if (localStorage.getItem('ismypaginationTow')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        formInline.isfanhuiTow = true
+        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
+      }
+      this.$router.go(-1);
+    },
     getInfo(id) {
       let obj = {
         taskId: this.$route.query.taskId,
@@ -465,9 +480,7 @@ export default {
       }
 
     },
-    sendBack() {
-      this.$router.go(-1);
-    },
+   
   },
 }
 </script>

src/views/components/renwuType/index_v2.vue

@@ -316,7 +316,9 @@
             <el-button type="danger" @click="newAssets(0)">关停</el-button>
             <el-button @click="newAssets(1)">取消</el-button>
             <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-            <el-button type="primary" @click="newAssets(3)" :loading="loading">提交</el-button>
+            <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+            <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+
           </el-row>
 
         </el-form>
@@ -324,7 +326,13 @@
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
           <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
-          <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
+          <el-button type="success" @click="JGnewAssets(1)">通过</el-button>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+
+        </el-row>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-else>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
       </div>
     </div>
@@ -447,7 +455,14 @@ export default {
     }
   },
   methods: {
-
+    sendBack() {
+      if (localStorage.getItem('ismypaginationTow')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        formInline.isfanhuiTow = true
+        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
+      }
+      this.$router.go(-1);
+    },
     getInfo(id) {
       let obj = {
         taskId: this.$route.query.taskId,
@@ -455,7 +470,7 @@ export default {
       }
       assetTaskofficetaskSh(obj).then(res => {
         this.ruleForm = res.data;
-        if(!this.ruleForm.ptlx) {
+        if (!this.ruleForm.ptlx) {
           this.ruleForm.ptlx = '1'
         }
         setTimeout(() => {
@@ -557,9 +572,7 @@ export default {
       }
 
     },
-    sendBack() {
-      this.$router.go(-1);
-    },
+  
   },
 }
 </script>

src/views/components/renwuType/index_v3.vue

@@ -170,7 +170,9 @@
             <el-button type="danger" @click="newAssets(0)">关停</el-button>
             <el-button @click="newAssets(1)">取消</el-button>
             <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-            <el-button type="primary" @click="newAssets(3)" :loading="loading">提交</el-button>
+            <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+
           </el-row>
 
 
@@ -178,7 +180,12 @@
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
           <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
-          <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
+          <el-button type="success" @click="JGnewAssets(1)">通过</el-button>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+        </el-row>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-else>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
       </div>
     </div>
@@ -281,6 +288,14 @@ export default {
     }
   },
   methods: {
+    sendBack() {
+      if (localStorage.getItem('ismypaginationTow')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        formInline.isfanhuiTow = true
+        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
+      }
+      this.$router.go(-1);
+    },
     getInfo(id) {
       let obj = {
         taskId: this.$route.query.taskId,
@@ -387,9 +402,7 @@ export default {
       }
 
     },
-    sendBack() {
-      this.$router.go(-1);
-    },
+    
   },
 }
 </script>

src/views/components/renwuType/index_v4.vue

@@ -157,7 +157,9 @@
             <el-button type="danger" @click="newAssets(0)">关停</el-button>
             <el-button @click="newAssets(1)">取消</el-button>
             <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-            <el-button type="primary" @click="newAssets(3)" :loading="loading">提交</el-button>
+            <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+
           </el-row>
 
 
@@ -165,7 +167,13 @@
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="pageType !== 'look' && $route.name == 'taskAuditInfo'">
           <el-button type="danger" @click="JGnewAssets(0)">不通过</el-button>
-          <el-button type="primary" @click="JGnewAssets(1)">通过</el-button>
+          <el-button type="success" @click="JGnewAssets(1)">通过</el-button>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+
+        </el-row>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-else>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
         </el-row>
       </div>
     </div>
@@ -270,6 +278,14 @@ export default {
     }
   },
   methods: {
+    sendBack() {
+      if (localStorage.getItem('ismypaginationTow')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        formInline.isfanhuiTow = true
+        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
+      }
+      this.$router.go(-1);
+    },
     getInfo(id) {
       let obj = {
         taskId: this.$route.query.taskId,
@@ -376,9 +392,7 @@ export default {
       }
 
     },
-    sendBack() {
-      this.$router.go(-1);
-    },
+   
   },
 }
 </script>

src/views/components/renwuType/webType1.vue

@@ -2484,8 +2484,15 @@
         <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
           v-if="$route.query.pageType == 'change'">
           <el-button type="danger" @click="newAssets(0)">不通过</el-button>
-          <el-button type="primary" @click="newAssets(1)">通过</el-button>
+          <el-button type="success" @click="newAssets(1)">通过</el-button>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu" size='mini'>返回</el-button>
         </el-row>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+          v-else>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu" >返回</el-button>
+        </el-row>
+        
+
       </div>
       <my-dialog title="提示" ref="liebiaoDialog" @close="importClose" class="taskDialogBox" width="40%">
         <el-row>
@@ -2739,6 +2746,14 @@ export default {
     }
   },
   methods: {
+    sendBack() {
+      if (localStorage.getItem('ismypaginationTow')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        formInline.isfanhuiTow = true
+        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
+      }
+      this.$router.go(-1);
+    },
     importClose() { },
     // 关闭新增弹窗
     resetForm() {

src/views/components/renwuType/webType2DW.vue

@@ -2543,12 +2543,8 @@
                 }">
                   <!-- <el-input v-model="ruleForm.sjzcSjklx" placeholder="请输入数据库类型"></el-input> -->
                   <el-select v-model="ruleForm.sjzcSjklx" placeholder="请选择数据库类型">
-                    <el-option
-                      v-for="dict in dict.type.database_type"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
+                    <el-option v-for="dict in dict.type.database_type" :key="dict.value" :label="dict.label"
+                      :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -2739,15 +2735,20 @@
                 <div>{{ ruleForm.bfyy }}</div>
               </el-form-item>
             </el-row>
-            <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
+           
+          </div>
+        </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
               v-if="$route.query.pageType == 'change'">
               <el-button type="danger" @click="newAssets(0)">关停</el-button>
               <el-button @click="newAssets(1)">取消</el-button>
               <el-button type="warning" @click="newAssets(2)">暂存</el-button>
-              <el-button type="primary" @click="newAssets(3)" :loading="loading">提交</el-button>
+              <el-button type="success" @click="newAssets(3)" :loading="loading">提交</el-button>
+              <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
             </el-row>
-          </div>
-        </el-form>
+        <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-else>
+          <el-button type="primary" @click="sendBack" class="fanhuipiaofu">返回</el-button>
+        </el-row>
       </div>
       <my-dialog title="提示" ref="liebiaoDialog" @close="importClose" class="taskDialogBox" width="40%">
         <el-row>
@@ -3035,6 +3036,14 @@ export default {
     }
   },
   methods: {
+    sendBack() {
+      if (localStorage.getItem('ismypaginationTow')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        formInline.isfanhuiTow = true
+        localStorage.setItem("ismypaginationTow", JSON.stringify(formInline))
+      }
+      this.$router.go(-1);
+    },
     importClose() { },
     // 关闭新增弹窗
     resetForm() {

src/views/unitPages/myTask/index.vue

@@ -81,14 +81,13 @@
               <div style="display: flex;align-items: center;justify-content: center;">
                 <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row)">
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info"
-                    style="color: #1485EF;cursor: pointer;">查看</span>
+                  <span class="look-info" style="color: #1485EF;cursor: pointer;">查看</span>
                 </div>
                 <!-- v-if="scope.row.taskStatus == 1" -->
-                <div  style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1&& scope.row.taskStatus != 0">
+                <div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
+                  @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1 && scope.row.taskStatus != 0">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="del-info"
-                    style="color: #1485EF;cursor: pointer;">开始核查</span>
+                  <span class="del-info" style="color: #1485EF;cursor: pointer;">开始核查</span>
                 </div>
               </div>
             </template>
@@ -185,9 +184,16 @@ export default {
   },
   mounted() {
     localStorage.removeItem("activeName")
-    console.log(this.$store.state.user);
-    console.log(this.$store.state.user.roles[0]);
+    if (localStorage.getItem('ismypagination')) {
 
+      if (JSON.parse(localStorage.getItem('ismypagination')).isfanhui) {
+        this.formInline = JSON.parse(localStorage.getItem('ismypagination'))
+        this.handleQuery()
+      } else {
+        localStorage.removeItem("ismypagination")
+      }
+    }
+    localStorage.removeItem("ismypaginationTow")
     this.getInfo();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
@@ -239,9 +245,9 @@ export default {
     // 获取列表
     getInfo() {
       this.loading = true;
-      if(this.$store.state.user.roles.includes("unit")){
-      this.pagination.dwmc=this.$store.state.user.useer.nickName
-    }
+      if (this.$store.state.user.roles.includes("unit")) {
+        this.pagination.dwmc = this.$store.state.user.useer.nickName
+      }
       getassetTask(this.pagination).then(res => {
         this.loading = false;
         this.total = res.data.total;
@@ -261,6 +267,8 @@ export default {
         current: 1,
         size: 10,
       }
+      localStorage.removeItem("ismypagination")
+
       this.getInfo();
     },
     //打开列表
@@ -288,6 +296,9 @@ export default {
         this.formInline.endTime = this.formInline.time[1]
       }
       this.pagination = { ...this.pagination, ...this.formInline };
+
+      this.formInline.isfanhui = false
+      localStorage.setItem("ismypagination", JSON.stringify(this.formInline))
       this.getInfo();
     },
     // 页码获取
@@ -314,8 +325,8 @@ export default {
       this.$router.push({
         name: 'mytaskInfo', query: {
           pageType: "look",
-          id:row.id,
-          dwmc:row.dwmc
+          id: row.id,
+          dwmc: row.dwmc
         }
       })
     },
@@ -326,8 +337,8 @@ export default {
       this.$router.push({
         name: 'mytaskInfo', query: {
           pageType: "info",
-          id:row.id,
-          dwmc:row.dwmc
+          id: row.id,
+          dwmc: row.dwmc
         }
       })
     },

src/views/unitPages/myTask/info.vue

@@ -5,6 +5,8 @@
     <div class="info-left info-left-two" id="L-size-main">
       <div class="content-info content-info-two" id="L-header">
         <div class="info-title">任务详情</div>
+        <el-button type="primary" @click="sendBack" class="fanhuipiaofu" size='mini'>返回</el-button>
+
         <div class="teshu-top-info">
           <div class="top-info">
             <el-row class="top-row">
@@ -267,6 +269,20 @@ export default {
     this.titleInfo()
     this.assetLcpageList()
 
+    if (localStorage.getItem('ismypaginationTow')) {
+      console.log(JSON.parse(localStorage.getItem('ismypaginationTow')));
+      
+      if (JSON.parse(localStorage.getItem('ismypaginationTow')).isfanhuiTow) {
+
+        this.formInline = JSON.parse(localStorage.getItem('ismypaginationTow'))
+        console.log(99999, this.formInline);
+        this.titleInfo()
+      } else {
+        console.log(99999, this.formInline);
+        localStorage.removeItem("ismypaginationTow")
+      }
+    }
+
 
   },
   destroyed() {
@@ -274,18 +290,24 @@ export default {
   },
 
   methods: {
-    
+    sendBack() {
+      if (localStorage.getItem('ismypagination')) {
+        let formInline = JSON.parse(localStorage.getItem('ismypagination'))
+        formInline.isfanhui = true
+        localStorage.setItem("ismypagination", JSON.stringify(formInline))
+      }
+      this.$router.go(-1);
+    },
     handleClick(tab, event) {
       console.log(tab.name);
-      this.formInline = {
-        xtlx: "",
-      }
+      // this.formInline = {
+      // }
 
       this.activeName = tab.name
 
       this.xtmcName = tab.$attrs.xtmcName
 
-      localStorage.setItem("activeName",this.activeName)
+      localStorage.setItem("activeName", this.activeName)
       this.handleQuery()
 
     },
@@ -372,7 +394,7 @@ export default {
     taskstatus(id) {
       if (id) {
         let obj = {
-          0:"已关闭",
+          0: "已关闭",
           1: "进行中",
           2: "正常完成", 3: "超期完成", 4: "正常完成", 5: "审核驳回"
         }
@@ -399,14 +421,14 @@ export default {
       })
       //tab的下标
       this.activeName = this.chanckListTow[0].lable
-      if(localStorage.getItem("activeName")){
+      if (localStorage.getItem("activeName")) {
         this.activeName = localStorage.getItem("activeName")
-        localStorage.setItem("activeName",this.activeName)
+        localStorage.setItem("activeName", this.activeName)
       }
       //动态列表
-      let listname = this.chanckListTow.filter(item=> item.lable == this.activeName)
-      if(listname){
-      this.xtmcName = listname[0].xtmcName
+      let listname = this.chanckListTow.filter(item => item.lable == this.activeName)
+      if (listname) {
+        this.xtmcName = listname[0].xtmcName
 
       }
       this.handleQuery();
@@ -437,6 +459,8 @@ export default {
           type: this.activeName,
 
         }
+        localStorage.removeItem("ismypaginationTow")
+
         this.getList();
       } else if (this.index == 2) {
         this.formInlineTwo = {
@@ -453,7 +477,15 @@ export default {
         type: this.activeName,
       }
       if (this.index == 1) {
+
         this.pagination = { ...this.pagination, ...this.formInline };
+
+        this.formInline.isfanhuiTow = false
+        console.log(77777, this.formInline);
+        console.log(88888, this.pagination);
+
+        localStorage.setItem("ismypaginationTow", JSON.stringify(this.formInline))
+
         this.getList();
       } else if (this.index == 2) {
         this.getListTwo();
@@ -550,4 +582,14 @@ export default {
 ::v-deep .el-dialog {
   margin-top: 20vh !important;
 }
+
+.content-info {
+  position: relative;
+}
+
+.fanhuipiaofu {
+  position: absolute;
+  right: 20px;
+  top: 10px;
+}
 </style>