From a1e0d470093b77b1723f3e7bb28e564944062fe9 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 23 May 2022 17:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/documentManage/collection/index.vue | 137 +++++---
 .../splitting/modules/SplitAddForm.vue        |   2 +-
 .../documentManage/subscribtion/index.vue     | 302 +++++++++++-------
 3 files changed, 273 insertions(+), 168 deletions(-)

diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue
index f352a636c..21feda519 100644
--- a/jero-web/src/views/documentManage/collection/index.vue
+++ b/jero-web/src/views/documentManage/collection/index.vue
@@ -3,37 +3,46 @@
       <a-card :bordered="false">
         <div class="collection-search-wrapper">
           <div class="collection-search-header">
-            <a-form layout="inline" @keyup.enter.native="searchQuery(queryParams)">
-              <a-form-model
-                class="collection-content"
-                :model="queryParams"
-                ref="tagEditForm"
-              >
-              <a-row :gutter="24" type="flex" justify="start">
+            <div class="table-page-search-wrapper">
+              <a-row :gutter="24">
                 <a-col :md="6" :sm="8">
-                  <a-form-model-item :label="$t('standard')">
-                    <a-input :placeholder="$t('enterNumber')" v-model="queryParams.serialNumber"></a-input>
-                  </a-form-model-item>
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('standard')">
+                      <span>{{$t('standard')}}</span>
+                    </div>
+                    <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                             v-model="queryParams.serialNumber"></a-input>
+                  </div>
                 </a-col>
                 <a-col :md="6" :sm="8">
-                  <a-form-model-item :label="$t('title')">
-                    <a-input :placeholder="$t('enterTitle')" v-model="queryParams.title"></a-input>
-                  </a-form-model-item>
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('title')">
+                      <span>{{$t('title')}}</span>
+                    </div>
+                    <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                             v-model="queryParams.title"></a-input>
+                  </div>
                 </a-col>
                 <a-col :md="6" :sm="8">
-                  <a-form-model-item :label="$t('status')">
-                    <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="$t('selectStatus')" />
-                  </a-form-model-item>
-                </a-col>
-                <a-col :md="6" :sm="8">
-                  <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                    <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
-                    <a-button @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
-                  </span>
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('status')">
+                      <span>{{$t('status')}}</span>
+                    </div>
+                    <j-dict-select-tag class="box-input" v-model="queryParams.state"
+                                       :placeholder="$t('PleaseSelect')+$t('status')"
+                                       :type="'select'"
+                                       :triggerChange="false" :dictCode="'state'"/>
+                  </div>
                 </a-col>
+                <span style="float: right;overflow: hidden;margin-right: 11px"
+                      class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+                 </span>
               </a-row>
-              </a-form-model>
-            </a-form>
+            </div>
           </div>
         </div>
         <div class="table-operator">
@@ -272,28 +281,64 @@
       }
     }
   }
-</style>
-<style lang="less">
-  .collection{
-    .collection-content{
-      .ant-form-item-control-wrapper{
-        min-width: 180px;
-      }
-    }
-  }
-  .collection-search-header{
-    .ant-form-item-control-wrapper{
-      min-width: 200px;
-      .ant-form-item{
-        display: flex;
-      }
-    }
-    .ant-col-md-6{
-      display: flex;
-    }
-    .table-page-search-submitButtons{
-      float: none!important;
-    }
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
   }
 
+  .title-text {
+    width: 33px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
+<style lang="less">
+  /*.collection{*/
+  /*  .collection-content{*/
+  /*    .ant-form-item-control-wrapper{*/
+  /*      min-width: 180px;*/
+  /*    }*/
+  /*  }*/
+  /*}*/
+  /*.collection-search-header{*/
+  /*  .ant-form-item-control-wrapper{*/
+  /*    min-width: 200px;*/
+  /*    .ant-form-item{*/
+  /*      display: flex;*/
+  /*    }*/
+  /*  }*/
+    /*.ant-col-md-6{*/
+    /*  display: flex;*/
+    /*}*/
+    /*.table-page-search-submitButtons{*/
+    /*  float: none!important;*/
+    /*}*/
+  /*}*/
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index e35c7bc11..d33dc24ac 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -1398,6 +1398,6 @@
   .box-input .ant-select-selection__rendered {
     line-height: 32px;
     height: 32px;
-    overflow-y: auto;
+    /*overflow-y: auto;*/
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue
index 21a28ed58..9bdb376a6 100644
--- a/jero-web/src/views/documentManage/subscribtion/index.vue
+++ b/jero-web/src/views/documentManage/subscribtion/index.vue
@@ -3,41 +3,56 @@
     <a-card :bordered="false">
       <div class="subscribtion-search-wrapper">
         <div class="subscribtion-search-header">
-<!--          <search :url="url" :flag="'1'"></search>-->
-          <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <!--          <search :url="url" :flag="'1'"></search>-->
+          <div class="table-page-search-wrapper">
             <a-row :gutter="24">
-              <a-col :md="6" :sm="6">
-                <a-form-item :label="$t('standard')">
-                  <a-input :placeholder="$t('enterNumber')" v-model="queryParams.serialNumber"></a-input>
-                </a-form-item>
+              <a-col :md="6" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('standard')">
+                    <span>{{$t('standard')}}</span>
+                  </div>
+                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                           v-model="queryParams.serialNumber"></a-input>
+                </div>
               </a-col>
-              <a-col :md="6" :sm="6">
-                <a-form-item :label="$t('title')">
-                  <a-input :placeholder="$t('enterTitle')" v-model="queryParams.title"></a-input>
-                </a-form-item>
+              <a-col :md="6" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('title')">
+                    <span>{{$t('title')}}</span>
+                  </div>
+                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                           v-model="queryParams.title"></a-input>
+                </div>
               </a-col>
-              <a-col :md="6" :sm="6">
-                <a-form-item :label="$t('status')">
-                  <j-dict-select-tag type="list" v-model="queryParams.state" dictCode="file_type" :placeholder="$t('selectStatus')" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="4">
-                <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                  <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
-                  <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{$t('reset')}}</a-button>
-                </span>
+              <a-col :md="6" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('status')">
+                    <span>{{$t('status')}}</span>
+                  </div>
+                  <j-dict-select-tag class="box-input" v-model="queryParams.state"
+                                     :placeholder="$t('PleaseSelect')+$t('status')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'state'"/>
+                </div>
               </a-col>
+              <span style="float: right;overflow: hidden;margin-right: 11px"
+                    class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+                 </span>
             </a-row>
-           </a-form>
+          </div>
         </div>
       </div>
       <div class="table-operator">
         <div class="operator-text" @click="handleBatManage">
-          <a-icon type="plus" />
+          <a-icon type="plus"/>
           {{ $t('SubscriptionManagement') }}
         </div>
         <div class="operator-text" @click="handleBatCancel">
-          <a-icon type="delete" />
+          <a-icon type="delete"/>
           {{ $t('BatchCancellation') }}
         </div>
       </div>
@@ -53,13 +68,13 @@
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         >
           <span slot="serialNumber" slot-scope="text, record">
-              <a class="table-del"  @click="onDetail(record)">{{record.serialNumber}}</a>
+              <a class="table-del" @click="onDetail(record)">{{record.serialNumber}}</a>
           </span>
           <span slot="serialtitle" slot-scope="text, record">
-              <a class="table-del"  @click="onDetail(record)">{{record.title}}</a>
+              <a class="table-del" @click="onDetail(record)">{{record.title}}</a>
           </span>
           <span slot="action" slot-scope="text, record">
-              <a class="table-del"  @click="onCancel(record)">{{$t('CancelSubscribe')}}</a>
+              <a class="table-del" @click="onCancel(record)">{{$t('CancelSubscribe')}}</a>
           </span>
         </a-table>
         <div class="page" v-if="tableData.length > 0">
@@ -82,196 +97,199 @@
 <script>
   import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
   import SubArea from './module/SubArea'
+
   export default {
-    name:'subscribtion',
-    components:{
-      SubArea,
+    name: 'subscribtion',
+    components: {
+      SubArea
     },
-    data(){
-      return{
-        selectedRowKeys:[],
-        queryParams:{
-          pageNo:1,
-          pageSize:10
+    data() {
+      return {
+        selectedRowKeys: [],
+        queryParams: {
+          pageNo: 1,
+          pageSize: 10
         },  //搜索条件
-        total:0,
+        total: 0,
         //列表表头
         columns: [
           {
             title: this.$t('standard'),
             dataIndex: 'serialNumber',
             key: 'serialNumber',
-            align: "center",
+            align: 'center',
             width: 100,
-            scopedSlots: {customRender: 'serialNumber'},
-            ellipsis: true,
+            scopedSlots: { customRender: 'serialNumber' },
+            ellipsis: true
           },
           {
             title: this.$t('title'),
-            align: "center",
+            align: 'center',
             width: 100,
             dataIndex: 'title',
-            scopedSlots: {customRender: 'serialtitle'},
-            ellipsis: true,
+            scopedSlots: { customRender: 'serialtitle' },
+            ellipsis: true
           },
           {
             title: this.$t('status'),
-            align: "center",
+            align: 'center',
             width: 100,
             dataIndex: 'state',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('subscriptionTime'),
-            align: "center",
+            align: 'center',
             width: 100,
             dataIndex: 'createTime',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('operation'),
             dataIndex: 'action',
-            scopedSlots: {customRender: 'action'},
-            align: "center",
+            scopedSlots: { customRender: 'action' },
+            align: 'center',
             width: 170
           }
         ],
-        tableData:[],  //列表数据
-        visible:false,
-        selecIds:[],
-        loading:false,
-        url:{
+        tableData: [],  //列表数据
+        visible: false,
+        selecIds: [],
+        loading: false,
+        url: {
           tableHeader: 'subscribe/onlCgformSubscribe/getHeader',      //表格头部字段
           seachList: 'subscribe/onlCgformSubscribe/queryCondition',   //搜索字段
-          tableList: 'subscribe/onlCgformSubscribe/page',         //表格数据
+          tableList: 'subscribe/onlCgformSubscribe/page'         //表格数据
         },
         OperationList: [
           {
             text: this.$t('CancelSubscribe'),
             ClickEvent: 'onCancel'
           }
-        ],
+        ]
       }
     },
     mounted() {
       this.loadData()
     },
-    methods:{
+    methods: {
       //获取列表数据
-      loadData(){
-        let params={
+      loadData() {
+        let params = {
           ...this.queryParams
         }
-        this.loading=true
-        postAction(`subscribe/onlCgformSubscribe/page`,params).then(res=>{
-          if(res.success){
-            this.tableData= [ ...res.result.records ]
-            this.total=res.result.total
-            this.loading=false
+        this.loading = true
+        postAction(`subscribe/onlCgformSubscribe/page`, params).then(res => {
+          if (res.success) {
+            this.tableData = [...res.result.records]
+            this.total = res.result.total
+            this.loading = false
           }
         })
       },//搜索
-      searchQuery(){
+      searchQuery() {
         this.loadData()
       },
       //订阅领域管理
-      handleBatManage(){
-        this.visible=true
+      handleBatManage() {
+        this.visible = true
       },
       //批量取消收藏
-      handleBatCancel(){
-        let params={
-          ids:this.selecIds.join(',')
+      handleBatCancel() {
+        let params = {
+          ids: this.selecIds.join(',')
         }
-        if(this.selecIds&&this.selecIds.length>0){
+        if (this.selecIds && this.selecIds.length > 0) {
           this.$confirm({
             title: this.$t('confirmBulkUnsubscribe'),
             content: '',
             onOk:
               async () => {
-                deleteAction(`subscribe/onlCgformSubscribe/deleteBatch`,params).then(res=> {
-                  if(res.success){
+                deleteAction(`subscribe/onlCgformSubscribe/deleteBatch`, params).then(res => {
+                  if (res.success) {
                     this.$message.success(this.$t('OperationSuccessful'))
-                    if(this.selecIds.length==this.tableData.length&&this.queryParams.pageNo!==1){
-                      this.queryParams.pageNo=this.queryParams.pageNo-1
+                    if (this.selecIds.length == this.tableData.length && this.queryParams.pageNo !== 1) {
+                      this.queryParams.pageNo = this.queryParams.pageNo - 1
                     }
                     this.loadData()
-                  }else{
+                  } else {
                     this.$message.warning(this.$t('operationFailed'))
                   }
                 })
               },
-            onCancel() {},
-          });
-        }else{
+            onCancel() {
+            }
+          })
+        } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
       //取消订阅
-      onCancel(record){
-        let params={
-          id:record.id
+      onCancel(record) {
+        let params = {
+          id: record.id
         }
         this.$confirm({
           title: this.$t('unsubscribeConfirm'),
           content: '',
           onOk:
             async () => {
-              deleteAction(`subscribe/onlCgformSubscribe/delete`,params).then(res=> {
-                if(res.success){
+              deleteAction(`subscribe/onlCgformSubscribe/delete`, params).then(res => {
+                if (res.success) {
                   this.$message.success(this.$t('OperationSuccessful'))
-                  if(this.tableData.length==1&&this.queryParams.pageNo!==1){
-                    this.queryParams.pageNo=this.queryParams.pageNo-1
+                  if (this.tableData.length == 1 && this.queryParams.pageNo !== 1) {
+                    this.queryParams.pageNo = this.queryParams.pageNo - 1
                   }
                   this.loadData()
-                }else{
+                } else {
                   this.$message.warning(this.$t('operationFailed'))
                 }
               })
             },
-          onCancel() {},
-        });
+          onCancel() {
+          }
+        })
       },
       //清空
-      searchReset(){
-        this.queryParams={
+      searchReset() {
+        this.queryParams = {
           pageNo: 1,
           pageSize: 10
         }
         this.loadData()
       },
       //点击页数
-      onChangePage(page,pageSize){
+      onChangePage(page, pageSize) {
         this.queryParams.pageNo = page
         this.loadData()
       },
       //一页显示条数
-      SizeChange(page,pageSize){
+      SizeChange(page, pageSize) {
         this.queryParams.pageSize = pageSize
-        this.queryParams.pageNo=1
+        this.queryParams.pageNo = 1
         this.loadData()
       },
       //选择框
       onSelectChange(rows) {
-        this.selectedRowKeys = rows;
+        this.selectedRowKeys = rows
         // let ids=[]
         // if(rows && rows.length>0){
         //   rows.forEach(item=>{
         //     ids.push(item.id)
         //   })
         // }
-        this.selecIds=rows
+        this.selecIds = rows
       },
       //点击编号
-      numberClick(records){
+      numberClick(records) {
 
       },
       //点击名称
-      titleClick(records){
+      titleClick(records) {
 
       },
-      areaVisible(val){
-        this.visible=val
+      areaVisible(val) {
+        this.visible = val
       },
       //跳转详情
       onDetail(item) {
@@ -279,9 +297,9 @@
         let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',
           query: {
-            id:item.documentId ,
-            serial_number:item.serialNumber,
-            title:item.title
+            id: item.documentId,
+            serial_number: item.serialNumber,
+            title: item.title
           }
         })
         window.open(newUrl.href, '_blank')
@@ -291,34 +309,76 @@
 </script>
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
-  .subscribtion{
-      .subscribtion-search-wrapper{
-        margin-bottom: 20px;
-      }
-      .page{
-        margin-top: 20px;
-        text-align: right;
-      }
+
+  .subscribtion {
+    .subscribtion-search-wrapper {
+      margin-bottom: 20px;
+    }
+
+    .page {
+      margin-top: 20px;
+      text-align: right;
+    }
   }
 
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 33px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
 </style>
 <style lang="less">
-  .subscribtion{
-    .subscribtion-content{
-      .ant-form-item-control-wrapper{
+  .subscribtion {
+    .subscribtion-content {
+      .ant-form-item-control-wrapper {
         min-width: 180px;
-        .ant-form-item{
+
+        .ant-form-item {
           display: flex;
         }
       }
     }
   }
-  .subscribtion-search-header{
-      .ant-form-item-control-wrapper{
-        min-width: 200px;
-      }
-    .table-page-search-submitButtons{
-      float: none!important;
+
+  .subscribtion-search-header {
+    .ant-form-item-control-wrapper {
+      min-width: 200px;
     }
+
+    /*.table-page-search-submitButtons {*/
+    /*  float: none !important;*/
+    /*}*/
+  }
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+  .box-input .ant-select-selection--single {
+    height: 38px;
   }
 </style>
\ No newline at end of file