Merge remote-tracking branch 'origin/master'

jero-web/src/views/documentManage/tags/tabs/TagItem.vue

@@ -3,14 +3,19 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
-           <a-col :md="6" :sm="12">
+           <a-col :md="6" :sm="12" v-show='submitKey=="1"'>
              <a-form-item :label="$t('ChineseName')">
-               <a-input :placeholder="$t('PleaseEnter')+$t('ChineseName')" v-model="queryParam.dbFieldTxt"></a-input>
+               <a-input :placeholder="$t('PleaseEnter')+$t('ChineseName')" v-model="queryParamOne.dbFieldTxt"></a-input>
+             </a-form-item>
+           </a-col>
+           <a-col :md="6" :sm="12" v-show='submitKey=="2"'>
+             <a-form-item :label="$t('ChineseName')">
+               <a-input :placeholder="$t('PleaseEnter')+$t('ChineseName')" v-model="queryParamTwo.dbFieldTxt"></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="6" :sm="8" v-show='submitKey=="1"'>
              <a-form-item :label="$t('DisplayArea')">
-               <a-select v-model="queryParam.showArea" :placeholder="$t('pleaseSelect')">
+               <a-select v-model="queryParamOne.showArea" :placeholder="$t('pleaseSelect')">
                  <a-select-option :value="item.id" v-for="item in areas">{{item.showArea}}</a-select-option>
                </a-select>
              </a-form-item>
@@ -58,10 +63,10 @@
        <a-spin :spinning="spinning">
        <a-tabs default-active-key="1" @change="callbackTab">
          <a-tab-pane key="1" :tab="$t('DocumentLibrary')">
-           <tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns"  :parm="queryParam" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" @selecteds="selecteds" :total="total"></tab-table>
+           <tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns"  :parm="queryParamOne" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParamsOne" @selecteds="selecteds" :total="total"></tab-table>
          </a-tab-pane>
          <a-tab-pane key="2" :tab="$t('DocumentSplitting')">
-           <tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns1" :parm="queryParam" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" @selecteds="selecteds" :total="total"></tab-table>
+           <tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns1" :parm="queryParamTwo" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParamsTwo" @selecteds="selecteds" :total="total"></tab-table>
 <!--           <tab-table  :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" :total="total" :parm="queryParam"></tab-table>-->
          </a-tab-pane>
        </a-tabs>
@@ -87,7 +92,11 @@
     data(){
       return{
         spinning:false,
-        queryParam:{
+        queryParamOne:{
+          pageNo:1,
+          pageSize:10,
+        },
+        queryParamTwo:{
           pageNo:1,
           pageSize:10,
         },
@@ -215,7 +224,8 @@
         });
       },
       searchQuery(){
-        this.queryParam.pageNo=1
+        this.queryParamOne.pageNo=1
+        this.queryParamTwo.pageNo=1
         if(this.key==1){
           this.loadData(1)
         }else if(this.key==2){
@@ -223,7 +233,11 @@
         }
       },
       searchReset(){
-        this.queryParam={
+        this.queryParamOne={
+          pageNo:0,
+          pageSize: 10
+        }
+        this.queryParamTwo={
           pageNo:0,
           pageSize: 10
         }
@@ -248,18 +262,25 @@
       loadData(val){
         this.spinning=true
         this.tableData=[]
-        let params={
+        let paramsOne={
-          ...this.queryParam,
+          ...this.queryParamOne,
           isModel:1
         }
+        let paramsTwo={
+          ...this.queryParamTwo,
+          isModel:1
+        }
+        let paramsItem
         // console.log('params',params)
         if(val==1){
           // console.log('1')
-          params.isModel=1
+          paramsOne.isModel=1
+          paramsItem = paramsOne
         }else if(val==0){
-          params.isModel=0
+          paramsTwo.isModel=0
+          paramsItem = paramsTwo
         }
-        postAction(`tag/onlCgformTag/page`,params).then(res=>{
+        postAction(`tag/onlCgformTag/page`,paramsItem).then(res=>{
           if(res.success){
             this.total=res.result.total
             this.tableData= [ ...res.result.records]
@@ -274,16 +295,16 @@
       callbackTab(value){
         this.key=value
         if(value==1){
-          this.queryParam.dbFieldTxt=''
+          this.queryParamOne.dbFieldTxt=''
           this.submitKey='1'
-          this.queryParam.pageNo=1
+          this.queryParamOne.pageNo=1
           this.loadData(1)
           // this.tableData=this.taglab
           // this.tableData=this.taglabSplit
         }else if(value==2){
-          this.queryParam.dbFieldTxt=''
+          this.queryParamTwo.dbFieldTxt=''
           this.submitKey='2'
-          this.queryParam.pageNo=1
+          this.queryParamTwo.pageNo=1
           this.loadData(0)
         }
       },
@@ -341,14 +362,14 @@
                 if (res.success) {
                   if (this.key == 1) {
                     this.$message.success(this.$t('OperationSuccessful'))
-                    if (this.tableData && this.tableData.length == 1 && this.queryParam.pageNo != 1) {
+                    if (this.tableData && this.tableData.length == 1 && this.queryParamOne.pageNo != 1) {
-                      this.queryParam.pageNo = this.queryParam.pageNo - 1
+                      this.queryParamOne.pageNo = this.queryParamOne.pageNo - 1
                     }
                     this.loadData(1)
                   } else if (this.key == 2) {
                     this.$message.success(this.$t('OperationSuccessful'))
-                    if (this.tableData && this.tableData.length == 1 && this.queryParam.pageNo != 1) {
+                    if (this.tableData && this.tableData.length == 1 && this.queryParamTwo.pageNo != 1) {
-                      this.queryParam.pageNo = this.queryParam.pageNo - 1
+                      this.queryParamTwo.pageNo = this.queryParamTwo.pageNo - 1
                     }
                     this.loadData(0)
                   }
@@ -382,14 +403,14 @@
                     if (this.key == 1) {
                       this.$message.success(this.$t('OperationSuccessful'))
                       if(this.ids&&this.ids.length==this.tableData.length){
-                        this.queryParam.pageNo=this.queryParam.pageNo-1
+                        this.queryParamOne.pageNo=this.queryParamOne.pageNo-1
                       }
                       this.selectedRowKey=[]
                       this.loadData(1)
                     } else if (this.key == 2) {
                       this.$message.success(this.$t('OperationSuccessful'))
                       if(this.ids&&this.ids.length==this.tableData.length){
-                        this.queryParam.pageNo=this.queryParam.pageNo-1
+                        this.queryParamTwo.pageNo=this.queryParamTwo.pageNo-1
                       }
                       this.loadData(0)
                     }
@@ -441,17 +462,37 @@
           this.isTagContent=true
         }
       },
-      //接收查询条件
+      queryParamsOne(val) {
-      queryParams(val){
+        this.queryParamOne.pageNo=val.pageNo
-        this.queryParam.pageNo=val.pageNo
+        this.queryParamOne.pageSize=val.pageSize
-        this.queryParam.pageSize=val.pageSize
         if(this.key==1){
           this.loadData(1)
-        }else if(this.key==2){
+        }
+        // else if(this.key==2){
+        //   this.loadData(0)
+        // }
+      },
+      queryParamsTwo(val) {
+        this.queryParamTwo.pageNo=val.pageNo
+        this.queryParamTwo.pageSize=val.pageSize
+        // if(this.key==1){
+        //   this.loadData(1)
+        // } else
+          if(this.key==2){
           this.loadData(0)
         }
-
       },
+      //接收查询条件
+      // queryParams(val){
+      //   this.queryParam.pageNo=val.pageNo
+      //   this.queryParam.pageSize=val.pageSize
+      //   if(this.key==1){
+      //     this.loadData(1)
+      //   }else if(this.key==2){
+      //     this.loadData(0)
+      //   }
+      //
+      // },
       handleOk () {
         this.$refs.realForm.submitForm();
       },