Merge branch 'diagBaseCopy' into test

src/api/utils.js

@@ -420,5 +420,9 @@ export default {
       $(document).on('mousemove', handleMove)
       $(document).on('mouseup', handleUp)
     }
+  },
+  getCurrentPage(currentChange, total, pageSize) {
+    const currentPage =  currentChange > Math.ceil(total/pageSize) ? Math.ceil(total/pageSize) : currentChange
+    return currentPage;
   }
 }

src/components/diagBase/DiagBase.vue

@@ -95,6 +95,7 @@
 import api from '@api/diagBase.js';
 import apis from '@api/icss.js';
 import config from '@api/config.js';
+import utils from '@api/utils.js';
 
 export default {
     name: 'diagBase',
@@ -142,6 +143,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
         getDropList() {

src/components/diagBase/QuestionWords.vue

@@ -131,6 +131,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
         getValue(val) {

src/components/icss/AssaySon.vue

@@ -84,6 +84,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'AssaySon',   //慢病指标值关联维护
@@ -125,6 +126,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
         getDataList(isTurnPage) {

src/components/icss/ChemicalAndCommonMapping.vue

@@ -88,6 +88,7 @@
 <script>
 import api from '@api/icss.js';
 import config from '@api/config.js';
+import utils from '@api/utils.js';
 
 export default {
     name: 'ChemicalAndCommonMapping',   //化验大小项和公表维护
@@ -132,6 +133,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
         getDataList(isTurnPage) {

src/components/icss/ChronicAndIndexRelation.vue

@@ -79,6 +79,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'ChronicAndIndexRelation',   //慢病指标值关联维护
@@ -119,6 +120,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
         getDataList(isTurnPage) {

src/components/icss/ChronicDiseaseStructureList.vue

@@ -87,6 +87,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'TemplateMaintenance',
@@ -137,6 +138,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       getDropList() {

src/components/icss/ConceptRelation.vue

@@ -91,6 +91,7 @@
 <script>
 import api from '@api/icss.js';
 import config from '@api/config.js';
+import utils from '@api/utils.js';
 
 export default {
     name: 'ConceptRelation',   //诊断量表关联维护
@@ -137,6 +138,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
         toggTab(item){

src/components/icss/IndeptLabel.vue

@@ -144,6 +144,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       getValue(val) {

src/components/icss/LabelGroup.vue

@@ -101,6 +101,7 @@
 <script>
 import api from '@api/icss.js';
 import config from '@api/config.js';
+import utils from '@api/utils.js';
 
 export default {
     name: 'tag-group',
@@ -146,6 +147,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
         getValue(val) {

src/components/icss/MedicalMultRelation.vue

@@ -75,6 +75,8 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
+  
   export default {
     name: 'MedicalName',
     data: function () {
@@ -124,6 +126,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       addMedicalMultR(){

src/components/icss/MedicalName.vue

@@ -120,7 +120,8 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
-
+  import utils from '@api/utils.js';
+  
   export default {
     name: 'MedicalName',
     data: function () {
@@ -174,6 +175,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       reloadLib(){

src/components/icss/MedicalRelation.vue

@@ -121,6 +121,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'MedicalRelation',
@@ -177,6 +178,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       addMedicalR(){

src/components/icss/MedicinePrompt.vue

@@ -94,6 +94,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'MedicinePrompt',
@@ -148,6 +149,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       addMedicalPrompt(){

src/components/icss/PhysicalExamTemplate.vue

@@ -81,6 +81,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'PhysicalExamTemplate',
@@ -126,6 +127,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       addModule() {

src/components/icss/TemplateMaintenance.vue

@@ -102,6 +102,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'TemplateMaintenance',
@@ -196,6 +197,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       getSubTemplate() {

src/components/icss/VersionInfo.vue

@@ -91,6 +91,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'VersionInfo',
@@ -137,6 +138,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       getProdType(item){

src/components/medicalTerm/AssistCheckSon.vue

@@ -84,6 +84,7 @@
 <script>
   import api from '@api/medicalTerm.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'AssistCheckSon',   //慢病指标值关联维护
@@ -125,6 +126,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
         getDataList(isTurnPage) {

src/components/preTreat/CombinQuestion.vue

@@ -99,6 +99,7 @@
 <script>
   import api from '@api/preTreat.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'combinQuestion',
@@ -142,6 +143,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       getDropList() {

src/components/preTreat/QuestionModules.vue

@@ -99,6 +99,7 @@
 <script>
   import api from '@api/preTreat.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'QuestionModules',
@@ -142,6 +143,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       getDropList() {

src/components/preTreat/SimpleQuestion.vue

@@ -107,6 +107,7 @@
 <script>
   import api from '@api/preTreat.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'simpleQuestion',
@@ -152,6 +153,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentChange, this.total, this.pageSize);
         this.getDataList();
       },
       getDropList() {