From 9c2c9570e9bab47d4cd9bcc7883eafa4bc148996 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Thu, 7 Apr 2022 17:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/SplitSearch/index.vue |  2 +
 .../splitting/modules/SplitDetail.vue         | 46 +++++++++++++------
 .../documentManage/tags/dialog/TagForm.vue    |  8 +++-
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue
index b31f9fbd0..7e53ca453 100644
--- a/jero-web/src/components/SplitSearch/index.vue
+++ b/jero-web/src/components/SplitSearch/index.vue
@@ -200,6 +200,7 @@
         }
         // console.log('11111',queryParam)
         eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+        this.$emit('queryParams',this.queryParam)
       },
       searchReset() {
         this.queryParam = {
@@ -208,6 +209,7 @@
         }
         // console.log('queryparamssss',this.queryParam)
         this.$emit('resetSearch')
+        this.$emit('queryParams',{})
         eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
       },
       getSeach() {
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 6ddaec914..16bdbd767 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="split-detail"  @click="clearMenu">
+    <div class="split-detail"  @click="clearMenu" :style="'width:' + (fullWidth - 200) + 'px'">
       <a-card :bordered="false" >
         <div class="split-detail-wrap">
           <div class="split-detail-left">
@@ -58,7 +58,7 @@
             <div class="split-detail-right-wraper">
               <div class="split-detail-search-header">
                 <search :flag="'4'" :url="url" :infoId="$route.query.infoId"
-                        :menuId="menuId" @resetSearch="resetSearch" />
+                        :menuId="menuId" @resetSearch="resetSearch" @queryParams="queryParamsValues" />
               </div>
               <div class="table-operator">
                 <div class="operator-text" @click="handleCopyManage">
@@ -286,27 +286,24 @@
         uploadMenuId:'',
         selectedKeys:[],
         deleteNode:false,
-
+        fullWidth:'',
+        parameter:{}
       }
     },
     watch:{
       deleteNode(){
 
-      }
+      },
     },
     computed:{
 
     },
     mounted() {
-      // let widthBrown = document.documentElement.offsetWidth || document.body.offsetWidth
-      // let client = document.querySelector('.split-detail-table .ant-table-content').getBoundingClientRect()
-      // let width =  widthBrown - client.left
-      // console.log('width111',width)
-      //
-      //     document.querySelector('.split-detail-table .ant-table-content').style.width=width+'px'
-          // window.fullHeight = document.documentElement.clientHeight
-          // that.fullHeight = window.fullHeight
 
+      let widthBrown = document.documentElement.offsetWidth || document.body.offsetWidth
+      let client = document.querySelector('.split-detail-table .ant-table-content').getBoundingClientRect()
+      let width =  widthBrown - client.left
+      document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
 
       this.infoId=this.$route.query.infoId
       // console.log('info',this.$route.query)
@@ -721,14 +718,25 @@
           // eventBUs.$emit('searchReset')
         }
       },
+      queryParamsValues(search){
+        Object.keys(search).forEach(res => {
+          if (search[res] instanceof Array) {
+            search[res] = search[res].join(',')
+          }
+        })
+        this.parameter=search
+        this.parameter.info_id=this.infoId
+        this.parameter.menu_id=this.menuId
+      },
       //导出
       handleExportManage(){
+
         let dateName = moment(new Date()).format('YYYY-MM-DD HH-mm-ss')
         let name = this.$route.query.infoNumber +' '+ dateName+'.zip'
         let query = {
-          infoId:this.infoId,
-          exportName:this.$route.query.infoNumber +' '+ dateName,
-          idList:this.selectedRowKeys.join(',')
+          exportName: this.$route.query.infoNumber + ' ' + dateName,
+          idList: this.selectedRowKeys.join(','),
+          parameter: this.parameter
         }
 
         downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query)
@@ -1077,6 +1085,9 @@
 
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
+  .main{
+
+  }
   .split-detail{
     .split-detail-wrap{
       display: flex;
@@ -1199,6 +1210,11 @@
         }
       }
   }
+  .split-detail-table{
+    .ant-table-body{
+      overflow: auto!important;
+    }
+  }
   .item-content-show{
     .wordImg{
       width: 40px;
diff --git a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
index a01a24d8a..6a3999b96 100644
--- a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
@@ -331,12 +331,16 @@
       this.loadShowArea()
       // console.log('edit',this.submitEdit)
       if(this.submitEdit==='add'){
+        if(this.submitKey==='1'){
+          this.form.isModel='1'
+        }else if(this.submitKey==='2'){
+          this.form.isModel='0'
+        }
         this.disabledEdit=false
       }else if(this.submitEdit==='edit'){
         this.disabledEdit=true
+        this.form={...this.editData}
       }
-      this.form={...this.editData}
-      // console.log('drawerVisible',this.drawerVisible)
     },
     methods: {
       //获取选项内容