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

src/api/config.js

@@ -293,5 +293,8 @@ export default {
   ],
   msg:{
     imgTip:'无法上传图片，图片大小不可超过2M'
-  }
+  },
+  pageSizeArr:[10,50,100,500],         //分页每页显示条数选项
+  pageSize:10,      //初始每页显示条数
+  pageLayout:"total,sizes,prev, pager, next, jumper",        //分页组件成分
 }

src/api/utils.js

@@ -305,7 +305,8 @@ export default {
       "labelSuffix":'suffix',                                 //后缀
       "maxValue":'maxNormalVal',                                 //前缀
       "minValue":'minNormalVal',                                 //后缀
-      "specFlag": 'specFlag' //标记状态（0：没有标记，1：主诉高亮，2：诱因记录）
+      "specFlag": 'specFlag', //标记状态（0：没有标记，1：主诉高亮，2：诱因记录）
+      "selFlag":'selFlag',
     };
     if (tagFlag == 2) {
       maps["tagType"] = 'region2'

src/components/diagBase/DiagBase.vue

@@ -75,34 +75,24 @@
                 </el-table-column>
             </el-table>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                       :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                        @current-change="currentChange"
                        background
                        :page-size="pageSize"
-                       layout="total,prev, pager, next, jumper"
+                       :page-sizes="pageSizeArr"
+                       @size-change="handleSizeChange"
+                       :layout="pageLayout"
                        :total="total">
             </el-pagination>
         </div>
-        
         </div>
-       <!--  <div class="pagination">
-           <el-pagination v-if="total>pageSize"
-                      :current-page.sync="currentPage"
-                      @current-change="currentChange"
-                      background
-                      :page-size="pageSize"
-                      layout="total,prev, pager, next, jumper"
-                      :total="total">
-           </el-pagination>
-       </div> -->
-        
     </div>
 </template>
 
 <script>
 import api from '@api/diagBase.js';
 import apis from '@api/icss.js';
+import config from '@api/config.js';
 
 export default {
     name: 'diagBase',
@@ -117,7 +107,9 @@ export default {
                 hasQuestion: '', //有无问题词
             },
             currentPage: 1,
-            pageSize: 10,
+          pageSize: config.pageSize,
+          pageSizeArr:config.pageSizeArr,
+          pageLayout:config.pageLayout,
             total: 0,
             modifier: '',
         }
@@ -146,6 +138,10 @@ export default {
     })
   },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
         getDropList() {
           return apis.getKnowledgeEnums().then((res) =>{
               if(res.data.code === '0') {
@@ -171,8 +167,10 @@ export default {
         addDiagBase() {
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize};
           this.$router.push({name: 'AddDiagBase', params: pam});
         },
         verifyAllData() {
@@ -206,8 +204,10 @@ export default {
                     const item = Object.assign({},row,data);
                     const pam = this.searched ? {
                       currentPage: this.currentPage,
+                      pageSize:this.pageSize,
                       filter: this.filter
-                    } : {currentPage: this.currentPage};
+                    } : {currentPage: this.currentPage,
+                      pageSize:this.pageSize};
                     if(type == 'modify') {
                       this.$router.push({
                         name: 'AddDiagBase',

src/components/diagBase/QuestionWords.vue

@@ -64,12 +64,13 @@
                 </el-table-column>
             </el-table>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                       :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                        @current-change="currentChange"
                        background
                        :page-size="pageSize"
-                       layout="total,prev, pager, next, jumper"
+                       :page-sizes="pageSizeArr"
+                       @size-change="handleSizeChange"
+                       :layout="pageLayout"
                        :total="total">
             </el-pagination>
         </div>
@@ -82,6 +83,7 @@
 import api from '@api/diagBase.js';
 import apis from '@api/icss.js';
 import utils from '@api/utils.js';
+import config from '@api/config.js';
 
 export default {
     name: 'QuestionWords',
@@ -100,7 +102,9 @@ export default {
                 type:""
             },
             currentPage: 1,
-            pageSize: 10,
+            pageSize: config.pageSize,
+            pageSizeArr:config.pageSizeArr,
+            pageLayout:config.pageLayout,
             total: 0,
         }
     },
@@ -125,6 +129,10 @@ export default {
     })
   },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
         getValue(val) {
             // console.log('changeVal', val, this.filter.tagAdscription)
         },

src/components/icss/AddIndeptLabel.vue

@@ -174,6 +174,7 @@
             "minValue": this.dataPub.minNormalVal,        //化验最小正常值
             "maxValue": this.dataPub.maxNormalVal,         //化验最大正常值
             "specFlag": this.dataPub.specFlag,  //标记状态（0：没有标记，1：主诉高亮，2：诱因记录, 4:生命体征）
+            "selFlag": this.dataPub.selFlag,
             "questionDetails": this.options,
             "questionMappings": [],      //映射关系,
             "formulaCode": isEdit?data.formulaCode : ''

src/components/icss/AssaySon.vue

@@ -67,12 +67,13 @@
                 </el-table-column>
             </el-table>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                       :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                        @current-change="currentChange"
                        background
                        :page-size="pageSize"
-                       layout="total,prev, pager, next, jumper"
+                       :page-sizes="pageSizeArr"
+                       @size-change="handleSizeChange"
+                       :layout="pageLayout"
                        :total="total">
             </el-pagination>
         </div>       
@@ -82,6 +83,7 @@
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'AssaySon',   //慢病指标值关联维护
@@ -93,7 +95,9 @@
               conceptName:'',
             },
             currentPage: 1,
-            pageSize: 10,
+          pageSize: config.pageSize,
+          pageSizeArr:config.pageSizeArr,
+          pageLayout:config.pageLayout,
             total: 0,
         }
     },
@@ -119,6 +123,10 @@
     })
   },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
             this.searched = true;
@@ -136,8 +144,10 @@
         addRelation() {
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize};
             this.$router.push({name:'AddAssaySon', params: pam})
         },
         modifyRelation(row) {
@@ -151,8 +161,10 @@
                 if(res.data.code == '0') {
                   const pam = this.searched ? {
                     currentPage: this.currentPage,
+                    pageSize:this.pageSize,
                     filter: this.filter
-                  } : {currentPage: this.currentPage};
+                  } : {currentPage: this.currentPage,
+                    pageSize:this.pageSize};
                     // const item = Object.assign({},row,{data: res.data.data});
                     const item = res.data.data;
                     this.$router.push({name:'AddAssaySon',params:Object.assign(pam, {isEdit:true,data:item})});

src/components/icss/ChemicalAndCommonMapping.vue

@@ -70,33 +70,24 @@
                 </el-table-column>
             </el-table>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                       :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                        @current-change="currentChange"
                        background
                        :page-size="pageSize"
-                       layout="total,prev, pager, next, jumper"
+                       :page-sizes="pageSizeArr"
+                       @size-change="handleSizeChange"
+                       :layout="pageLayout"
                        :total="total">
             </el-pagination>
         </div>
-        
         </div>
-       <!--  <div class="pagination">
-           <el-pagination v-if="total>pageSize"
-                      :current-page.sync="currentPage"
-                      @current-change="currentChange"
-                      background
-                      :page-size="pageSize"
-                      layout="total,prev, pager, next, jumper"
-                      :total="total">
-           </el-pagination>
-       </div> -->
         
     </div>
 </template>
 
 <script>
 import api from '@api/icss.js';
+import config from '@api/config.js';
 
 export default {
     name: 'ChemicalAndCommonMapping',   //化验大小项和公表维护
@@ -110,12 +101,18 @@ export default {
                 uniqueName:''
             },
             currentPage: 1,
-            pageSize: 10,
+          pageSize: config.pageSize,
+          pageSizeArr:config.pageSizeArr,
+          pageLayout:config.pageLayout,
             total: 0,
         }
     },
     created() {
-        this.getDataList()
+      const that = this;
+      //返回时避免参数未赋值就获取列表
+      setTimeout(function() {
+        that.getDataList();
+      });
         
     },
   watch: {
@@ -133,6 +130,10 @@ export default {
     })
   },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
           this.searched = true;
@@ -150,16 +151,20 @@ export default {
         addRelation() {
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize};
           this.$router.push({name: 'AddChemicalAndCommonMapping', params: pam})
         },
         modifyRelation(row) {
             const item = Object.assign({},row);
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize};
           this.$router.push({
             name: 'AddChemicalAndCommonMapping',
             params: Object.assign(pam, {isEdit: true, data: item})

src/components/icss/ChronicAndIndexRelation.vue

@@ -62,33 +62,23 @@
                 </el-table-column>
             </el-table>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                       :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                        @current-change="currentChange"
                        background
                        :page-size="pageSize"
-                       layout="total,prev, pager, next, jumper"
+                       :page-sizes="pageSizeArr"
+                       @size-change="handleSizeChange"
+                       :layout="pageLayout"
                        :total="total">
             </el-pagination>
         </div>
-        
         </div>
-       <!--  <div class="pagination">
-           <el-pagination v-if="total>pageSize"
-                      :current-page.sync="currentPage"
-                      @current-change="currentChange"
-                      background
-                      :page-size="pageSize"
-                      layout="total,prev, pager, next, jumper"
-                      :total="total">
-           </el-pagination>
-       </div> -->
-        
     </div>
 </template>
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'ChronicAndIndexRelation',   //慢病指标值关联维护
@@ -100,7 +90,9 @@
                 diseaseName: ''
             },
             currentPage: 1,
-            pageSize: 10,
+          pageSize: config.pageSize,
+          pageSizeArr:config.pageSizeArr,
+          pageLayout:config.pageLayout,
             total: 0,
         }
     },
@@ -125,6 +117,10 @@
     })
   },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
             this.searched = true;
@@ -142,8 +138,10 @@
         addRelation() {
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize};
             this.$router.push({name:'AddChronicAndIndexRelation', params: pam})
         },
         modifyRelation(row) {
@@ -154,8 +152,10 @@
                 if(res.data.code == '0') {
                     const pam = this.searched ? {
                         currentPage: this.currentPage,
+                      pageSize:this.pageSize,
                         filter: this.filter
-                      } : {currentPage: this.currentPage};
+                      } : {currentPage: this.currentPage,
+                      pageSize:this.pageSize};
                     const item = Object.assign({},row,{data: res.data.data});
                     this.$router.push({name:'AddChronicAndIndexRelation',params:Object.assign(pam, {isEdit:true,data:item})});
                 }

src/components/icss/ChronicDiseaseStructureList.vue

@@ -70,12 +70,13 @@
 
         </div>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                        :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                         @current-change="currentChange"
                         background
                         :page-size="pageSize"
-                        layout="total,prev, pager, next, jumper"
+                        :page-sizes="pageSizeArr"
+                        @size-change="handleSizeChange"
+                        :layout="pageLayout"
                         :total="total">
             </el-pagination>
         </div>
@@ -85,6 +86,7 @@
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'TemplateMaintenance',
@@ -107,7 +109,9 @@
           tagSysName: '', //标签系统名称
         },
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
       }
     },
@@ -131,6 +135,10 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       getDropList() {
         let templateType = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleInfoTypeEnum : []
         this.AdscriptionsType = templateType;
@@ -167,8 +175,10 @@
       addIndeptTag() {
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name:'ChronicDiseaseAdd', params: pam})
       },
       modifyIndeptTag(row) {
@@ -177,8 +187,10 @@
             if(code=='0'){
               const pam = this.searched ? {
                 currentPage: this.currentPage,
+                pageSize:this.pageSize,
                 filter: this.filter
-              } : {currentPage: this.currentPage};
+              } : {currentPage: this.currentPage,
+                pageSize:this.pageSize};
               this.$router.push({name:'ChronicDiseaseAdd',params:Object.assign(pam, {isEdit:true,data:data,row:row})});
             }else{
               this.$message({

src/components/icss/ConceptRelation.vue

@@ -74,12 +74,13 @@
                 </el-table-column>
             </el-table>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-               :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                @current-change="currentChange"
                background
                :page-size="pageSize"
-               layout="total,prev, pager, next, jumper"
+               :page-sizes="pageSizeArr"
+               @size-change="handleSizeChange"
+               :layout="pageLayout"
                :total="total">
             </el-pagination>
         </div>
@@ -89,6 +90,7 @@
 
 <script>
 import api from '@api/icss.js';
+import config from '@api/config.js';
 
 export default {
     name: 'ConceptRelation',   //诊断量表关联维护
@@ -101,7 +103,9 @@ export default {
             type:'' 
           },
           currentPage: 1,
-          pageSize: 10,
+          pageSize: config.pageSize,
+          pageSizeArr:config.pageSizeArr,
+          pageLayout:config.pageLayout,
           total: 0,
           typeList:[]
         }
@@ -131,6 +135,10 @@ export default {
     })
   },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
         toggTab(item){
           // bug2348 搜索后切换tab时清空搜索条件
           this.filter.conceptName = '';
@@ -155,8 +163,10 @@ export default {
         addRelation() {
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage,filter:Object.assign(this.filter,{conceptName:''})};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize,filter:Object.assign(this.filter,{conceptName:''})};
           this.$router.push({name:'AddConceptRelation',params:pam})
         },
         modifyRelation(row) {
@@ -171,8 +181,10 @@ export default {
             }
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage,filter:Object.assign(this.filter,{conceptName:''})};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize,filter:Object.assign(this.filter,{conceptName:''})};
             api.getConceptRelationDet(param).then((res) => {
               if(res.data.code=='0'){
                 const { data } = res.data;

src/components/icss/IndeptLabel.vue

@@ -84,32 +84,21 @@
                     </template>
                 </el-table-column>
             </el-table>
-          <el-pagination v-if="total>pageSize"
-                        :current-page.sync="currentPage"
-                        @current-change="currentChange"
+          <el-pagination @current-change="currentChange"
                         background
                         :page-size="pageSize"
-                        layout="total,prev, pager, next, jumper"
+                        :page-sizes="pageSizeArr"
+                         @size-change="handleSizeChange"
+                        :layout="pageLayout"
                         :total="total">
             </el-pagination>
         </div>
-        <!-- <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                        :current-page.sync="currentPage"
-                        @current-change="currentChange"
-                        background
-                        :page-size="pageSize"
-                        layout="total,prev, pager, next, jumper"
-                        :total="total">
-            </el-pagination>
-        </div> -->
-
     </div>
 </template>
 
 <script>
   import api from '@api/icss.js';
-
+  import config from '@api/config.js';
   export default {
     name: 'tag-group',
     data: function() {
@@ -126,7 +115,9 @@
           tagSysName: '', //标签系统名称
         },
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
       }
     },
@@ -151,6 +142,10 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       getValue(val) {
         console.log('changeVal', val, this.filter.tagAdscription)
       },
@@ -194,8 +189,9 @@
       addIndeptTag() {
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,pageSize:this.pageSize};
         this.$router.push({
           name: 'AddIndeptLabel',
           params: pam
@@ -325,4 +321,11 @@
     .el-select .el-input .el-icon-circle-close{
         float:left;
     }
+  .el-pagination__sizes{
+      margin-right: 20px;
+    .el-input .el-input__inner{
+        height: 28px;
+        line-height: 28px;
+    }
+  }
 </style>

src/components/icss/LabelGroup.vue

@@ -83,33 +83,24 @@
                 </el-table-column>
             </el-table>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                       :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                        @current-change="currentChange"
                        background
                        :page-size="pageSize"
-                       layout="total,prev, pager, next, jumper"
+                        :page-sizes="pageSizeArr"
+                        @size-change="handleSizeChange"
+                        :layout="pageLayout"
                        :total="total">
             </el-pagination>
         </div>
-        
         </div>
-       <!--  <div class="pagination">
-           <el-pagination v-if="total>pageSize"
-                      :current-page.sync="currentPage"
-                      @current-change="currentChange"
-                      background
-                      :page-size="pageSize"
-                      layout="total,prev, pager, next, jumper"
-                      :total="total">
-           </el-pagination>
-       </div> -->
         
     </div>
 </template>
 
 <script>
 import api from '@api/icss.js';
+import config from '@api/config.js';
 
 export default {
     name: 'tag-group',
@@ -126,7 +117,9 @@ export default {
                 tagSysName: '', //标签系统名称
             },
             currentPage: 1,
-            pageSize: 10,
+            pageSize: config.pageSize,
+            pageSizeArr:config.pageSizeArr,
+            pageLayout:config.pageLayout,
             total: 0,
         }
     },
@@ -151,6 +144,10 @@ export default {
     })
   },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
         getValue(val) {
             // console.log('changeVal', val, this.filter.tagAdscription)
         },
@@ -199,8 +196,10 @@ export default {
         addTagGroup() {
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize};
           this.$router.push({name: 'AddLabelGroup', params: pam});
         },
         modifyTagGroup(row, type) {

src/components/icss/MedicalMultRelation.vue

@@ -58,12 +58,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -73,6 +74,7 @@
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
   export default {
     name: 'MedicalName',
     data: function () {
@@ -85,7 +87,9 @@
         isState:'',
         cacheData: {},
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
         searched: false,
         filter: {
@@ -118,11 +122,17 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       addMedicalMultR(){
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name:'AddMedicalMultRelation',
           params:pam});
       },
@@ -134,8 +144,10 @@
         };
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         api.relationContactDetail(param).then((res) => {
           const {code,data,msg} = res.data;
           if(code=='0'){

src/components/icss/MedicalName.vue

@@ -103,12 +103,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -118,6 +119,7 @@
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'MedicalName',
@@ -131,7 +133,9 @@
         // isState:'',
         cacheData: {}, //因为删除和恢复要及时更新，所以不做缓存
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
         searched:false,
         filter: {
@@ -168,6 +172,10 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       reloadLib(){
         if(this.reloadFlag){
           this.reloadFlag = false;
@@ -180,13 +188,17 @@
       },
       addMedicalName(){
         const pam = this.searched?{currentPage:this.currentPage,
-          filter:this.filter}:{currentPage:this.currentPage};
+          pageSize:this.pageSize,
+          filter:this.filter}:{currentPage:this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name:'AddMedicalName',
           params:pam});
       },
       toEditProduct(row,copy){
         const pam = this.searched?{currentPage:this.currentPage,
-          filter:this.filter}:{currentPage:this.currentPage};
+          pageSize:this.pageSize,
+          filter:this.filter}:{currentPage:this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({
           name:'AddMedicalName',
           // params: {info:row}

src/components/icss/MedicalRelation.vue

@@ -104,12 +104,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -119,6 +120,7 @@
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'MedicalRelation',
@@ -138,7 +140,9 @@
         },
         cacheData: {},
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
         typeList:[],
         titleWidth:'1070px' //头部最小宽度
@@ -171,11 +175,17 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       addMedicalR(){
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name: 'AddMedicalRelation', params: pam});
       },
       filterDatas(){

src/components/icss/MedicinePrompt.vue

@@ -77,12 +77,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -92,6 +93,7 @@
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'MedicinePrompt',
@@ -100,7 +102,9 @@
         list: [],
         cacheData: {},
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
         linkIn:[],
         pays:[],
@@ -142,19 +146,27 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       addMedicalPrompt(){
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name:'AddMedicinePrompt',
           params:pam});
       },
       toEditProduct(row){
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({
           name:'AddMedicinePrompt',
           params: Object.assign(pam, {data:row,isEdit:true})
@@ -163,8 +175,10 @@
       toCopyProduct(row){
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({
           name:'AddMedicinePrompt',
           params: Object.assign(pam, {data:row,isCopy:true})

src/components/icss/NoiseTemplate.vue

@@ -236,6 +236,7 @@ export default {
           // "subType": this.dataPub.region6,   	         //0:可以，1：不可以(当项目检索)
           "sexType": this.dataPub.region7,             //1:男，2：女，3：通用
           "specFlag": this.dataPub.specFlag,           //生命体征
+          "selFlag": this.dataPub.selFlag,           //一般情况/其他史标记
           "ageBegin": this.dataPub.region8,       		 //最小年龄
           "ageEnd": this.dataPub.region9,              //最大年龄
           "textGenerate": this.form.currentOrder,      //成文顺序 默认0

src/components/icss/PhysicalExamTemplate.vue

@@ -64,12 +64,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -79,7 +80,7 @@
 
 <script>
   import api from '@api/icss.js';
-  import utils from '@api/utils.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'PhysicalExamTemplate',
@@ -89,7 +90,9 @@
         cacheData: {},
         deptList: [], //科室下拉列表
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
         linkIn:[],
         pays:[],
@@ -121,11 +124,17 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       addModule() {
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name: 'AddPhysicalExamTemp', params: pam});
       },
       toEditProduct(row){

src/components/icss/PubIndeptTag.vue

@@ -304,12 +304,10 @@
               ></el-input>
             </el-form-item>
           </div>
-           <el-form-item v-if="form.region1 == 4">
-            <span>
-                <el-checkbox v-model="form.specFlag"  label="是否为生命体征" true-label="4" false-label="0"  @change="sendData"></el-checkbox>
-            </span>
-                
-          </el-form-item>
+           <el-form-item>
+               <el-checkbox v-if="form.region1 == 4" v-model="form.specFlag"  label="是否为生命体征" true-label="4" false-label="0"  @change="sendData"></el-checkbox>
+               <el-checkbox v-if="form.region1 == 1&&form.region2 == 1" v-model="form.selFlag"  label="一般情况类型" true-label=1 false-label=0  @change="sendData"></el-checkbox>
+           </el-form-item>
           
         </el-form>
     </div>
@@ -367,6 +365,7 @@
           region12: '0',        //是否为查体推送   
           region13:'',
           specFlag :'0',        //标记状态（0：没有标记，1：主诉高亮，2：诱因记录）
+          selFlag :0,
           prefix:'',            //前缀
           suffix:'',            //后缀
           tipLis:[],           //提示列表
@@ -450,7 +449,6 @@
       }
     },
     mounted() {
-      
       this.getDropList();
       //编辑时赋值
       const editData = this.$props.editData;
@@ -477,6 +475,9 @@
       },
       newSign(nextVal, prevVal) {
         const editData = this.$props.editData;
+        if(!editData.id){   //编辑时类型不可换
+          this.form.selFlag = 0;      //切换填写单类型，标记清空
+        }
         if(!this.isEditOrCopy) {
           this.initForm()
         }

src/components/icss/PubTagGroup.vue

@@ -258,10 +258,10 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.region1 == 4">
-          <span>
-              <el-checkbox v-model="form.specFlag"  label="是否为生命体征" true-label="4" false-label="0"  @change="sendData"></el-checkbox>
-          </span>
+      <el-form-item>
+          <el-checkbox v-if="form.region1 == 4" v-model="form.specFlag"  label="是否为生命体征" true-label="4" false-label="0"  @change="sendData"></el-checkbox>
+          <el-checkbox v-if="form.region1 == 3&&(form.region2 == 2||form.region2 == 6)" v-model="form.selFlag"  label="默认选中（选中互斥项）" true-label=1 false-label='0'  @change="sendData"></el-checkbox>
+          <el-checkbox v-if="form.region1 == 1&&form.region2 == 2" v-model="form.selFlag"  label="一般情况类型" true-label=1 false-label='0'  @change="sendData"></el-checkbox>
       </el-form-item>
     </el-form>
   </div>
@@ -322,7 +322,8 @@ export default {
         tagPool: [],          //标签池数据
         order: [],            //排序方式
         tipLis: [],           //提示列表
-        specFlag: '0'       //生命体征
+        specFlag: '0',       //生命体征
+        selFlag:0,        //一般情况或其他史标记
       },
       labelTypesMaps: {       //// 归属和填写单类型限制
         '1': ['2', '3', '4'],  //推送类型暂时不用
@@ -430,6 +431,9 @@ export default {
     },
     newSign(nextVal, prevVal) {
       this.tmpType = prevVal;
+      if(!this.editData.id){   //编辑时类型不可换
+        this.form.selFlag = 0;      //切换填写单类型，标记清空
+      }
      if(!this.isEditOrCopy) {
         this.initForm()
       }

src/components/icss/TemplateMaintenance.vue

@@ -85,12 +85,13 @@
 
         </div>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                        :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                         @current-change="currentChange"
                         background
                         :page-size="pageSize"
-                        layout="total,prev, pager, next, jumper"
+                        :page-sizes="pageSizeArr"
+                        @size-change="handleSizeChange"
+                        :layout="pageLayout"
                         :total="total">
             </el-pagination>
         </div>
@@ -100,6 +101,7 @@
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'TemplateMaintenance',
@@ -117,7 +119,9 @@
           tagAdscription: '', //标签归属
         },
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
         deptAndDisInfo:{},
       }
@@ -178,6 +182,7 @@
         //const pm = to.param;
         const flt = to.params.filter;
         vm.currentPage = to.params.currentPage||1;
+        vm.pageSize = to.params.pageSize;
         vm.deptAndDisInfo = JSON.parse(localStorage.getItem('deptDis')||null);
         if(flt){
           vm.filter.templateType = flt.templateType;
@@ -189,6 +194,10 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       getSubTemplate() {
         api.getAllDeptAndDisInfo({}).then((res) => {
           if (res.data.code === '0') {//获取科室和疾病所有信息
@@ -234,8 +243,10 @@
       addIndeptTag() {
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name: 'TemplateMaintenanceWrap', params: pam})
       },
       modifyIndeptTag(row) {

src/components/icss/VersionInfo.vue

@@ -74,12 +74,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -89,6 +90,7 @@
 
 <script>
   import api from '@api/icss.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'VersionInfo',
@@ -97,7 +99,9 @@
         list: [],
         cacheData: {},
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
         searched: false,
         filter: {
@@ -110,9 +114,11 @@
       }
     },
     created() {
-      this.getDataList();
-      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
-      this.typeList = typeList.productTypeEnum;
+      this.$nextTick(()=>{
+        this.getDataList();
+        let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
+        this.typeList = typeList.productTypeEnum;
+    })
     },
     watch: {
       'filter': {
@@ -129,6 +135,10 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       getProdType(item){
         let name = "";
         let type = item.productType;
@@ -143,8 +153,10 @@
         // 添加版本信息
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({
           name:'AddVersion',
           params: pam
@@ -153,8 +165,10 @@
       toEditVersion(row,flag){
         const pam = this.searched ? {
           currentPage: this.currentPage,
+          pageSize:this.pageSize,
           filter: this.filter
-        } : {currentPage: this.currentPage};
+        } : {currentPage: this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({
           name:'AddVersion',
           params: Object.assign(pam, {info: row, copy: flag})

src/components/medicalTerm/AssistCheckSon.vue

@@ -67,12 +67,13 @@
                 </el-table-column>
             </el-table>
         <div class="pagination">
-            <el-pagination v-if="total>pageSize"
-                       :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                        @current-change="currentChange"
                        background
                        :page-size="pageSize"
-                       layout="total,prev, pager, next, jumper"
+                       :page-sizes="pageSizeArr"
+                       @size-change="handleSizeChange"
+                       :layout="pageLayout"
                        :total="total">
             </el-pagination>
         </div>       
@@ -82,6 +83,7 @@
 
 <script>
   import api from '@api/medicalTerm.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'AssistCheckSon',   //慢病指标值关联维护
@@ -93,7 +95,9 @@
               conceptName:'',
             },
             currentPage: 1,
-            pageSize: 10,
+          pageSize: config.pageSize,
+          pageSizeArr:config.pageSizeArr,
+          pageLayout:config.pageLayout,
             total: 0,
         }
     },
@@ -119,6 +123,10 @@
     })
   },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
             this.searched = true;
@@ -136,8 +144,10 @@
         addRelation() {
           const pam = this.searched ? {
             currentPage: this.currentPage,
+            pageSize:this.pageSize,
             filter: this.filter
-          } : {currentPage: this.currentPage};
+          } : {currentPage: this.currentPage,
+            pageSize:this.pageSize};
             this.$router.push({name:'AddAssistCheckSon', params: pam})
         },
         modifyRelation(row) {
@@ -151,8 +161,10 @@
                 if(res.data.code == '0') {
                   const pam = this.searched ? {
                     currentPage: this.currentPage,
+                    pageSize:this.pageSize,
                     filter: this.filter
-                  } : {currentPage: this.currentPage};
+                  } : {currentPage: this.currentPage,
+                    pageSize:this.pageSize};
                     // const item = Object.assign({},row,{data: res.data.data});
                     const item = res.data.data;
                     this.$router.push({name:'AddAssistCheckSon',params:Object.assign(pam, {isEdit:true,data:item})});

src/components/preTreat/CombinQuestion.vue

@@ -83,12 +83,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -97,6 +98,7 @@
 
 <script>
   import api from '@api/preTreat.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'combinQuestion',
@@ -114,7 +116,9 @@
           name:'',          //界面名称
         },
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
       }
     },
@@ -136,6 +140,10 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       getDropList() {
         api.getPreTypeList().then((res) =>{
           this.getDataList();
@@ -176,7 +184,9 @@
       },
       addIndeptTag() {
         const pam = this.searched?{currentPage:this.currentPage,
-          filter:this.filter}:{currentPage:this.currentPage};
+          pageSize:this.pageSize,
+          filter:this.filter}:{currentPage:this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name:'AddCombinQuestion',
           params:pam});
       },
@@ -186,7 +196,9 @@
           if(code=='0'){
             const infos = Object.assign({},row,data);
             const pam = this.searched?{currentPage:this.currentPage,
-              filter:this.filter}:{currentPage:this.currentPage};
+              pageSize:this.pageSize,
+              filter:this.filter}:{currentPage:this.currentPage,
+              pageSize:this.pageSize};
             this.$router.push({name:'AddCombinQuestion',params:Object.assign(pam,{[isCopy?'isCopy':'isEdit']:true,data:infos})});
           }else{
             this.$message({

src/components/preTreat/PubSelect.vue

@@ -253,7 +253,7 @@
           });
           return ;
         }
-        const maps = {0:'${input_输入}',1:'${number_输入}'};
+        const maps = {0:'${input_其他（点击输入）}',1:'${number_其他（点击输入）}'};
         const key = this.focusName;
         this.noHolder = this.noHolder.replace(','+i,'');
         this.rows[i].name = this.rows[i].name+maps[type];

src/components/preTreat/QuestionModules.vue

@@ -83,12 +83,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -97,6 +98,7 @@
 
 <script>
   import api from '@api/preTreat.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'QuestionModules',
@@ -114,7 +116,9 @@
           relationId:'',  //归属科室
         },
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
       }
     },
@@ -136,6 +140,10 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       getDropList() {
         api.getPreTypeList().then((res) =>{
           this.getDataList();
@@ -196,7 +204,9 @@
       },
       addModule() {
         const pam = this.searched?{currentPage:this.currentPage,
-          filter:this.filter}:{currentPage:this.currentPage};
+          pageSize:this.pageSize,
+          filter:this.filter}:{currentPage:this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name:'AddQuestionModules',
           params:pam});
       },
@@ -206,7 +216,9 @@
           if(code=='0'){
             const item = Object.assign({},row,data);
             const pam = this.searched?{currentPage:this.currentPage,
-              filter:this.filter}:{currentPage:this.currentPage};
+              pageSize:this.pageSize,
+              filter:this.filter}:{currentPage:this.currentPage,
+              pageSize:this.pageSize};
             this.$router.push({name:'AddQuestionModules',params:Object.assign(pam,{isEdit:true,data:item})});
           }else{
             this.$message({

src/components/preTreat/SimpleQuestion.vue

@@ -91,12 +91,13 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination v-if="total>pageSize"
-                           :current-page.sync="currentPage"
+            <el-pagination :current-page.sync="currentPage"
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :page-sizes="pageSizeArr"
+                           @size-change="handleSizeChange"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -105,6 +106,7 @@
 
 <script>
   import api from '@api/preTreat.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'simpleQuestion',
@@ -124,7 +126,9 @@
           name:'',      //填写单界面名称
         },
         currentPage: 1,
-        pageSize: 10,
+        pageSize: config.pageSize,
+        pageSizeArr:config.pageSizeArr,
+        pageLayout:config.pageLayout,
         total: 0,
       }
     },
@@ -146,6 +150,10 @@
       })
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize = val;
+        this.getDataList();
+      },
       getDropList() {
         api.getPreTypeList().then((res) =>{
           this.getDataList();
@@ -186,7 +194,9 @@
       },
       addIndeptTag() {
         const pam = this.searched?{currentPage:this.currentPage,
-            filter:this.filter}:{currentPage:this.currentPage};
+          pageSize:this.pageSize,
+            filter:this.filter}:{currentPage:this.currentPage,
+          pageSize:this.pageSize};
         this.$router.push({name:'AddSimpleQuestion',
                             params:pam})
       },
@@ -196,7 +206,9 @@
           if(code=='0'){
             const item = Object.assign({},row,data);
             const pam = this.searched?{currentPage:this.currentPage,
-              filter:this.filter}:{currentPage:this.currentPage};
+              pageSize:this.pageSize,
+              filter:this.filter}:{currentPage:this.currentPage,
+              pageSize:this.pageSize};
             this.$router.push({name:'AddSimpleQuestion',params:Object.assign(pam,{isCopy:true,data:item})});
           }else{
             this.$message({
@@ -212,7 +224,9 @@
           if(code=='0'){
             const item = Object.assign({},row,data);
             const pam = this.searched?{currentPage:this.currentPage,
-              filter:this.filter}:{currentPage:this.currentPage};
+              pageSize:this.pageSize,
+              filter:this.filter}:{currentPage:this.currentPage,
+              pageSize:this.pageSize};
             this.$router.push({name:'AddSimpleQuestion',params:Object.assign(pam,{isEdit:true,data:item})});
           }else{
             this.$message({