05141716lhj查询条件

src/components/Finance/ExpenseReview.vue

@@ -122,7 +122,7 @@
 export default {
     beforeRouteLeave(to, from, next) {
         if(to.name!='FeesPage'){
-            from.meta.keepAlive = false;
+            localStorage.removeItem('fyshval');
         }
         next()
     },
@@ -196,6 +196,12 @@ export default {
         },
         //查看费用申请
         handleView(index, row) {
+            var fyshval={
+                currentPage:this.currentPage,
+                value:this.value,
+                input:this.input,
+            }
+            localStorage.setItem('fyshval', JSON.stringify(fyshval));
             this.$router.push({path: '/home/FeesPage?id=' + row.id +''});
         },
         //模糊查询
@@ -214,6 +220,14 @@ export default {
             this.PostGroupPageList();
         },
     },
+    created(){
+        console.log(JSON.parse(localStorage.getItem('fyshval')));
+        if(JSON.parse(localStorage.getItem('fyshval'))){
+            this.currentPage=JSON.parse(localStorage.getItem('fyshval')).currentPage;
+            this.value=JSON.parse(localStorage.getItem('fyshval')).value;
+            this.input=JSON.parse(localStorage.getItem('fyshval')).input;
+        }
+    },
     mounted(){
         this.token=JSON.parse(localStorage.getItem('userinif')).token;
         this.pageId=Number(localStorage.getItem('indexs').split('-')[1]);//页面id

src/components/Resource/HotelData.vue

@@ -109,7 +109,7 @@ export default {
                 that.loading = false
             }).catch(function (error) {
                 that.loading = false
-                that.$message.error("网络错误，请稍后重试");
+                that.$message.error("上传oa,请稍等");
             });
         },
         //搜索框处理

src/components/Resource/HotelDataOperation.vue

@@ -75,8 +75,8 @@
                 </div>
                 <div style="display: flex;">
                     <div style="width: 98%;">
-                        <el-form-item label="备注" prop="Remark">
-                            <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="addData.Remark"></el-input>
+                        <el-form-item label="酒店其他信息">
+                            <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="addData.OtherInformation"></el-input>
                         </el-form-item>
                     </div>
                 </div>
@@ -129,7 +129,7 @@ export default {
             token: '',
             userId: 0,
             addData: {
-                Statu: '',
+                Status: '',
                 Id: 0,
                 City: '',
                 Name: '',
@@ -150,7 +150,7 @@ export default {
     methods: {
         HotelData() {
             this.loading = true
-            var url = "/api/Resource/QueryHotelData"
+            var url = "/api/Resource/QueryHotelDataInfo"
             var that = this
             this.$axios({
                 method: 'post',
@@ -160,26 +160,16 @@ export default {
                 },
                 data: {
                     portType: 1,
-                    PageIndex: 0,
-                    PageSize: 0,
-                    City: '',
-                    Name: '',
-                    Contact: '',
-                    ContactPhone: '',
+                    id: that.$route.query.id,
+                   
                 }
             }).then(function (res) {
                 console.log(res)
-
                 if (res.data.code == 200) {
-                    that.tableData = res.data.data;
-                    that.addData.Id = that.$route.query.id;
-                    if (that.addData.Id == undefined || that.addData.Id == null) {
-                        //添加
-                        that.addData.Status = 1
-                    } else {
-                        //编辑
-                        that.upData();
-                    }
+                    that.HotelDataData=res.data.data
+                    that.upData();
+                }else{
+                    that.$message.error(res.data.mag);
                 }
                 that.loading = false
             }).catch(function (error) {
@@ -190,12 +180,14 @@ export default {
 
         addBtn() {
             const that = this;
-
+            if(this.$route.query.id){
+                this.addData.Status = 2;
+            }else{
+                this.addData.Status = 1;
+            }
             that.addData.CreateUserId = that.userId
             that.$refs.addData.validate((valid) => {
                 if (valid) {
-
-                    console.log(that.addData)
                     var url = "/api/Resource/OperationHotelData"
                     that.$axios({
                         method: 'post',
@@ -215,7 +207,7 @@ export default {
                             that.loading = true;
                             setTimeout(() => {
                                 that.$router.push('/home/HotelData')
-                            }, 3000);
+                            }, 1000);
                         } else {
                             that.$message.error(res.data.msg);
                         }
@@ -227,15 +219,6 @@ export default {
             })
         },
         upData() {
-
-            for (var i = 0; i < this.tableData.length; i++) {
-                if (this.tableData[i].id == parseInt(this.addData.Id)) {
-
-                    this.HotelDataData = this.tableData[i];
-                    break;
-                }
-            }
-            this.addData.Status = 2;
             this.addData.Id = this.HotelDataData.id;
             this.addData.City = this.HotelDataData.city;
             this.addData.Name = this.HotelDataData.name;
@@ -252,11 +235,11 @@ export default {
     },
 
     mounted() {
-
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
-        this.HotelData();
-
+        if(this.$route.query.id){
+            this.HotelData();
+        }
     }
 }
 </script>

src/components/Resource/OfficialActivities.vue

@@ -14,6 +14,9 @@
                         </el-select>
                     </div>
                     <div style="width: 82%;text-align: right;">
+                        <el-button @click="Getqswj(1)" type="primary">省外办请示文件</el-button>
+                        <el-button @click="Getqswj(2)" type="primary">市外办请示文件</el-button>
+                        &nbsp;
                         <router-link :to="{ path: '/home/OpOfficialActivities', query: { DiId } }">
                             <el-button type="primary">新增</el-button>
                         </router-link>
@@ -129,6 +132,30 @@ export default {
                 that.$message.error("网络错误，请稍后重试");
             });
         },
+        //下载请示文件
+        Getqswj(val) {
+            var url = "/api/Resource/OfficialActivitiesFileDownload"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    fileType: val,
+                    diId: that.DiId
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    window.open(res.data.data)
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error(error);
+            });
+        },
         delegationSelectChange() {
             for (let index = 0; index < this.delegationInfoList.length; index++) {
                 if (this.delegationInfoList[index].id == this.DiId) {

src/components/statistics/Groupreports.vue

@@ -127,7 +127,14 @@
     </div>
 </template>
 <script>
+
 export default {
+    beforeRouteLeave(to, from, next) {
+        if(to.name!='Reportstbale'){
+            localStorage.removeItem('tzbbval');
+        }
+        next()
+    },
     data() {
         return {
             pageId:0,
@@ -198,6 +205,12 @@ export default {
         },
         //查看费用申请
         handleView(index, row) {
+            var tzbbval={
+                currentPage:this.currentPage,
+                value:this.value,
+                input:this.input,
+            }
+            localStorage.setItem('tzbbval', JSON.stringify(tzbbval));
             this.$router.push({path: '/home/Reportstbale?id=' + row.id +''});
         },
         //模糊查询
@@ -225,6 +238,13 @@ export default {
             this.PostGroupPageList();
         },
     },
+    created(){
+        if(JSON.parse(localStorage.getItem('tzbbval'))){
+            this.currentPage=JSON.parse(localStorage.getItem('tzbbval')).currentPage;
+            this.value=JSON.parse(localStorage.getItem('tzbbval')).value;
+            this.input=JSON.parse(localStorage.getItem('tzbbval')).input;
+        }
+    },
     mounted(){
         this.token=JSON.parse(localStorage.getItem('userinif')).token;
         this.pageId=Number(localStorage.getItem('indexs').split('-')[1]);//页面id