Merge remote-tracking branch 'origin/dev5.3.4+' into test

# Conflicts:
#	src/components/icss/ChemicalAndCommonMapping.vue

src/components/diagBase/DiagBase.vue

@@ -138,6 +138,7 @@ export default {
   beforeRouteEnter(to, from, next) {
     next(vm => {
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -169,6 +170,10 @@ export default {
                 loading.close()
                 this.list = res.data.data.records
                 this.total = res.data.data.total;
+              if(this.inCurrentPage!==undefined){
+                this.currentPage=this.inCurrentPage;
+                this.inCurrentPage = undefined;
+              }
             })
         },
         filterDatas() {
@@ -254,7 +259,7 @@ export default {
               this.clearFilter();
             };
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 disName: this.filter.disName.trim(),
                 modifier: this.filter.modifier, //操作人

src/components/diagBase/QuestionWords.vue

@@ -126,6 +126,7 @@ export default {
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -178,6 +179,10 @@ export default {
                 }
                 this.list = list;
                 this.total = res.data.data.total;
+              if(this.inCurrentPage!==undefined){
+                this.currentPage=this.inCurrentPage;
+                this.inCurrentPage = undefined;
+              }
             })
         },
         filterDatas() {
@@ -200,7 +205,7 @@ export default {
         },
         getFilterItems() {
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 disName: this.filter.disName.trim(),
                 questionCode: this.filter.questionName.trim(),

src/components/icss/AssaySon.vue

@@ -121,6 +121,7 @@
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -143,6 +144,10 @@
                 if(res.data.code == '0') {
                     this.list = res.data.data.records;
                     this.total = res.data.data.total;
+                  if(this.inCurrentPage!==undefined){
+                    this.currentPage=this.inCurrentPage;
+                    this.inCurrentPage = undefined;
+                  }
                 }
             })
         },
@@ -190,7 +195,7 @@
             this.filter.conceptName='';
           };
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 name:this.filter.conceptName.trim()
             };

src/components/icss/ChemicalAndCommonMapping.vue

@@ -128,6 +128,7 @@ export default {
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -137,7 +138,7 @@ export default {
         this.getDataList();
       },
         getDataList(isTurnPage) {
-          const param = this.getFilterItems(isTurnPage);
+            const param = this.getFilterItems(isTurnPage);
           this.searched = true;
           const loading = this.$loading({
             lock: true,
@@ -151,6 +152,10 @@ export default {
                 this.list = res.data.data.records
             }
             this.total = res.data.data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           })
         },
         filterDatas() {
@@ -201,7 +206,7 @@ export default {
             this.clearFilter();
           };
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 mealName:this.filter.mealName.trim(),
                 itemName:this.filter.itemName.trim(),

src/components/icss/ChronicAndIndexRelation.vue

@@ -115,6 +115,7 @@
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -137,6 +138,10 @@
                 if(res.data.code == '0') {
                     this.list = res.data.data.records;
                     this.total = res.data.data.total;
+                  if(this.inCurrentPage!==undefined){
+                    this.currentPage=this.inCurrentPage;
+                    this.inCurrentPage = undefined;
+                  }
                 }
             })
         },
@@ -185,7 +190,7 @@
             this.filter.diseaseName='';
           };
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 diseaseName:this.filter.diseaseName.trim(),
             };

src/components/icss/ConceptRelation.vue

@@ -133,6 +133,7 @@ export default {
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -162,6 +163,10 @@ export default {
               if(res.data.code == '0') {
                 this.list = res.data.data.records
                 this.total = res.data.data.total;
+                if(this.inCurrentPage!==undefined){
+                  this.currentPage=this.inCurrentPage;
+                  this.inCurrentPage = undefined;
+                }
               }
             })
         },
@@ -216,7 +221,7 @@ export default {
             this.filter.conceptName='';
           };
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 name:this.filter.conceptName.trim(),
                 relationId:17,

src/components/icss/DisclaimerInformation.vue

@@ -114,6 +114,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm, to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -154,6 +155,10 @@
             this.list = data.records;
             this.cacheData[param.current] = data.records;
             this.total = data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -169,7 +174,7 @@
         };
         const param = {
           title: this.filter.title.trim(),
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize
         };
         return param;

src/components/icss/IndeptLabel.vue

@@ -84,13 +84,14 @@
                     </template>
                 </el-table-column>
             </el-table>
-          <el-pagination @current-change="currentChange"
-                        background
-                        :page-size="pageSize"
-                        :page-sizes="pageSizeArr"
-                         @size-change="handleSizeChange"
-                        :layout="pageLayout"
-                        :total="total">
+          <el-pagination  :current-page.sync="currentPage"
+                          @current-change="currentChange"
+                          background
+                          :page-size.sync="pageSize"
+                          :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                          :layout="pageLayout"
+                          :total="total">
             </el-pagination>
         </div>
     </div>
@@ -139,6 +140,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm, to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -188,6 +190,10 @@
           }
           this.list = list;
           this.total = res.data.data.total;
+          if(this.inCurrentPage!==undefined){
+            this.currentPage=this.inCurrentPage;
+            this.inCurrentPage = undefined;
+          }
         })
       },
       filterDatas() {
@@ -254,7 +260,7 @@
         };
         const param = {
           tagTypeList: [1],
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           tagName: this.filter.tagSysName.trim(),

src/components/icss/LabelGroup.vue

@@ -142,6 +142,7 @@ export default {
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -196,6 +197,10 @@ export default {
                 }
                 this.list = list;
                 this.total = res.data.data.total;
+                if(this.inCurrentPage!==undefined){
+                  this.currentPage=this.inCurrentPage;
+                  this.inCurrentPage = undefined;
+                }
             })
         },
         filterDatas() {
@@ -258,7 +263,7 @@ export default {
           };
             const param = {
                 tagTypeList: this.filter.tagType[0] && this.filter.tagType|| this.tagTypesList,
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 type: this.filter.tagAdscription,
                 tagName: this.filter.tagSysName.trim(),

src/components/icss/MedicalMultRelation.vue

@@ -121,6 +121,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -184,6 +185,10 @@
             this.list = data.records;
             this.cacheData[param.current] = data.records;
             this.total = data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -211,7 +216,7 @@
         };
         const param = {
           name: this.filter.term.trim(),
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           type: this.filter.type,
           isDeleted: this.isState,

src/components/icss/MedicalName.vue

@@ -170,6 +170,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -227,6 +228,10 @@
             this.list = data.records;
             // this.cacheData[param.current] = data.records;
             this.total = data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -254,7 +259,7 @@
         };
         const param = {
           name: this.filter.term.trim(),
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           type:this.filter.type,
           libName:this.filter.libName.trim(),

src/components/icss/MedicalRelation.vue

@@ -173,6 +173,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm, to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -217,6 +218,10 @@
               this.cacheData = {}
             }
             this.total = data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -245,7 +250,7 @@
           this.clearFilter();
         };
         const param = {
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           relationId: this.filter.type,
           startName: this.filter.startName.trim(),

src/components/icss/MedicinePrompt.vue

@@ -144,6 +144,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -206,6 +207,10 @@
             this.list = data.records;
             this.cacheData[param.current] = data.records;
             this.total = data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -227,7 +232,7 @@
         const param = {
           conceptName:this.filter.term.trim(),
           title:this.filter.title,
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           status:this.filter.status,
           libType:this.filter.libType,

src/components/icss/PhysicalExamTemplate.vue

@@ -122,6 +122,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm, to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -189,6 +190,10 @@
             const data = res.data.data;
             this.list = data.records;
             this.total = data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -204,7 +209,7 @@
         };
         const param = {
           deptId: this.filter.deptId,
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize
         };
         return param;

src/components/icss/TemplateMaintenance.vue

@@ -192,6 +192,7 @@
               vm.filter.ownTo = flt.ownTo;
             });
         }
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -242,6 +243,10 @@
             }
             this.list = list;
             this.total = res.data.data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         })
       },
@@ -303,7 +308,7 @@
           };
         };
         const param = {
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           moduleType:this.filter.templateType,

src/components/medicalTerm/AssistCheckMultRelation.vue

@@ -112,6 +112,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -166,6 +167,10 @@
             this.list = data.records;
             this.cacheData[param.current] = data.records;
             this.total = data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }
         }).catch((error) => {
           console.log(error);
@@ -178,7 +183,7 @@
         };
         const param = {
           name: this.filter.term,
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           relationId: 17,
           startTypeIds: [71],

src/components/medicalTerm/AssistCheckSon.vue

@@ -121,6 +121,7 @@
     next(vm => {
       //const pm = to.param;
       Object.assign(vm, to.params);
+      vm.inCurrentPage=to.params.currentPage;
     })
   },
     methods: {
@@ -143,6 +144,10 @@
                 if(res.data.code == '0') {
                     this.list = res.data.data.records;
                     this.total = res.data.data.total;
+                  if(this.inCurrentPage!==undefined){
+                    this.currentPage=this.inCurrentPage;
+                    this.inCurrentPage = undefined;
+                  }
                 }
             })
         },
@@ -190,7 +195,7 @@
             this.filter.conceptName='';
           };
             const param = {
-                current: this.currentPage,
+                current: this.inCurrentPage||this.currentPage,
                 size: this.pageSize,
                 name:this.filter.conceptName
             };

src/components/preTreat/CombinQuestion.vue

@@ -138,6 +138,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -185,6 +186,10 @@
           }
           this.list = list;
           this.total = res.data.data.total;
+          if(this.inCurrentPage!==undefined){
+            this.currentPage=this.inCurrentPage;
+            this.inCurrentPage = undefined;
+          }
         })
       },
       filterDatas() {
@@ -228,7 +233,7 @@
         };
         let param = {
           tagTypeList: this.filter.tagType[0] ? this.filter.tagType: [4,6],
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           callType:2,
           size: this.pageSize,
           type: this.filter.tagAdscription,

src/components/preTreat/QuestionModules.vue

@@ -138,6 +138,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -198,6 +199,10 @@
             }
             this.list = list;
             this.total = res.data.data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
           }else{
             this.$message({
               message: res.data.msg,
@@ -256,7 +261,7 @@
           type:this.filter.type,
           moduleType: this.filter.moduleType,
           relationId: this.filter.moduleType==1?this.filter.relationId:'',
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
         };
         return param;

src/components/preTreat/SimpleQuestion.vue

@@ -148,6 +148,7 @@
       next(vm => {
         //const pm = to.param;
         Object.assign(vm,to.params);
+        vm.inCurrentPage=to.params.currentPage;
       })
     },
     methods: {
@@ -195,6 +196,10 @@
           }
           this.list = list;
           this.total = res.data.data.total;
+          if(this.inCurrentPage!==undefined){
+            this.currentPage=this.inCurrentPage;
+            this.inCurrentPage = undefined;
+          }
         })
       },
       filterDatas() {
@@ -273,7 +278,7 @@
         const param = {
           tagTypeList: [1],
           callType:1,
-          current: this.currentPage,
+          current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
           tagName: this.filter.tagSysName.trim(),