拆分导入成功列表刷新

jero-web/src/common/lang/en-us.js

@@ -573,5 +573,6 @@ module.exports = {
   documentSplitList:'document split list display',
   selectSplitListDisplay:'Please select whether to split the document list for display',
   selectDisplayList:'please select whether to display in list',
+  documentSplitDisplay:'document splitting module display',
 
 }

jero-web/src/common/lang/zh-cn.js

@@ -577,5 +577,6 @@ module.exports = {
   documentSplitList:'文档拆分列表展示',
   selectSplitListDisplay:'请选择是否文档拆分列表展示',
   selectDisplayList:'请选择是否列表展示',
+  documentSplitDisplay:'文档拆分模块展示',
 
 }

jero-web/src/components/SplitDetailTable/index.vue

@@ -106,7 +106,8 @@
     watch:{
       menuId(oldValue,newValue){
         // console.log('oldnew',oldValue,newValue)
-        this.getTableList()
+
+        // this.getTableList()
       }
     },
     mounted() {
@@ -188,17 +189,19 @@
         this.getTableList()
       },
       getTableList() {
+        console.log('this.searchParmestable',this.searchParmes)
         let pageNo = JSON.parse(JSON.stringify(this.pageNo))
         let pageSize = JSON.parse(JSON.stringify(this.pageSize))
         let params = {
           ...this.searchParmes,
           // orderBy: this.orderBy,
           // orderByField: this.orderByField,
-          info_id:this.infoId,
+          // info_id:this.infoId,
-          menu_id:this.menuId,
+          // menu_id:this.searchParmes.menuId?this.searchParmes.menuId:this.menuId,
           pageNo: pageNo + '',
           pageSize: pageSize + ''
         }
+
         // console.log('parmsss',params)
         this.loading = true
         postAction(this.url.tableList, params).then((res) => {

jero-web/src/components/SplitImport/index.vue

@@ -96,7 +96,7 @@
         // console.log('rrr',this.myfileList)
       },
       handleChange(info) {
-        // console.log('info',info)
+        console.log('info',info)
         let { file } = info;
         const status = info.file.status;
         info.fileList.forEach((val,index)=>{
@@ -129,6 +129,8 @@
               this.$message.destroy()
               this.$message.success(`${info.file.name} 删除成功。`);
             } else if (status === 'done') {
+              // console.log('file1111',this.fileList)
+              this.$emit('uploadSuccess', this.fileList,'success')
               this.fileList = []
               this.myfileList = info.fileList;
               // console.log('file3333',info.fileList)
@@ -143,8 +145,8 @@
                     this.fileList.push(res)
                   }
                 })
-                // console.log('file1111',this.fileList)
+
-                this.$emit('uploadSuccess', this.fileList)
+                this.$emit('uploadSuccess', this.fileList,'success')
                 this.$message.destroy()
                 this.$message.error('最多只能上传一个文件');
                 return
@@ -160,7 +162,8 @@
               })
 
               if(this.myfileList.length > 0){
-                this.$emit('uploadSuccess', this.fileList)
+                console.log('file1111',this.fileList)
+                this.$emit('uploadSuccess', this.fileList,'success')
                 this.$message.destroy()
                 this.$message.success(`${info.file.name} 文件上传成功。`);
               }

jero-web/src/components/SplitSearch/index.vue

@@ -0,0 +1,275 @@
+<template>
+  <a-form layout="inline" @keyup.enter.native="searchQuery">
+    <a-row :gutter="24">
+      <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+        <template v-if="index < 3">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template >
+
+        <template v-if="index >= 3 && toggleSearchStatus">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+      </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 @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
+                {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+               </a-col>
+      </span>
+    </a-row>
+  </a-form>
+</template>
+
+<script>
+  import { getAction } from '@/api/manage'
+  import eventBUs from '../../common/event.js'
+  import moment from 'moment'
+
+  export default {
+    name: 'SplitSearch',
+    props: {
+      url: {
+        type: Object,
+        default: {}
+      },
+      flag: {
+        type: String,
+        default: ''
+      },
+      infoId:{
+        type:String,
+        default:''
+      },
+      menuId:{
+        type:String,
+        default:''
+      }
+    },
+    data() {
+      return {
+        queryParam: {},
+        toggleSearchStatus: false,
+        searchList: [],
+        menu_id:''
+      }
+    },
+    watch:{
+      menuId:{
+        immediate:true,
+          handler(val){
+          this.menu_id=val
+            console.log('menuId',this.menu_id)
+        }
+      }
+    },
+    mounted() {
+      this.getSeach()
+    },
+    methods: {
+      searchQuery() {
+        let queryParam = {
+          ...this.queryParam,
+          menu_id:this.menu_id,
+          info_id:this.infoId
+        }
+        // console.log('11111',queryParam)
+        eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+      },
+      searchReset() {
+        this.queryParam = {
+          menu_id:'',
+          info_id:this.infoId
+        }
+        console.log('queryparamssss',this.queryParam)
+        this.$emit('resetSearch')
+        eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+      },
+      getSeach() {
+        let params = {
+          flag: this.flag
+        }
+        getAction(this.url.seachList, params).then((res) => {
+          if (res.success) {
+            this.searchList = res.result
+          }
+        })
+      },
+      // handleToggleSearch() {
+      //   this.toggleSearchStatus = !this.toggleSearchStatus
+      // },
+      dateChange(item) {
+        this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
+      },
+      onChange(item) {
+        let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
+        let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
+        this.queryParam[item] = [dateOne, dateTwo]
+      },
+      handleToggleSearch(){
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    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: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+</style>

jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue

@@ -670,7 +670,13 @@
                     this.$message.success(this.$t('OperationSuccessful'))
                     this.visible=false
                     // this.$emit('closeVisible',false)
-                    eventBUs.$emit('searchReset')
+                    let queryParam={
+                      menu_id:this.menuId,
+                      info_id: this.infoId,
+
+                    }
+                    eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                    // eventBUs.$emit('searchReset')
                     this.$emit('sumber')
                   }else{
                     this.$message.warning(this.$t('operationFailed'))

jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue

@@ -7,6 +7,7 @@
               <a-input-search style="margin-bottom: 8px" :placeholder="$t('NodeQuickLookup')" @change="onLeftChange" @search="onSearch" />
               <a-tree
                 v-if="gData.length>0"
+                :selected-keys="selectedKeys"
                 :expanded-keys="expandedKeys"
                 :auto-expand-parent="autoExpandParent"
                 :defaultExpandAll="true"
@@ -38,7 +39,8 @@
           <div class="split-detail-right">
             <div class="split-detail-right-wraper">
               <div class="split-detail-search-header">
-                <search :flag="'4'" :url="url"/>
+                <search :flag="'4'" :url="url" :infoId="$route.query.infoId"
+                        :menuId="menuId" @resetSearch="resetSearch" />
               </div>
               <div class="table-operator">
                 <div class="operator-text" @click="handleCopyManage">
@@ -161,7 +163,7 @@
 
 <script>
   import { getAction, postAction, deleteAction, putAction, downloadFile } from '@/api/manage'
-  import search from '@/components/search/index'
+  import search from '@/components/SplitSearch/index'
   import TableData from '@/components/SplitDetailTable/index'
   // import upload from '@/components/uploadFile/file.vue'
   import SplitBatForm from '@/components/SplitBatForm/index'
@@ -262,7 +264,8 @@
         ids:'',
         token:Vue.ls.get(ACCESS_TOKEN),
         // upAccept:'.zip',  //导入文件类型
-        uploadMenuId:''
+        uploadMenuId:'',
+        selectedKeys:[]
       }
     },
     mounted() {
@@ -410,6 +413,13 @@
       onSelect(selectedKeys){
         this.menuId=selectedKeys[0]
         this.uploadMenuId=selectedKeys[0]
+        this.selectedKeys=selectedKeys
+        let queryParam={
+          menu_id:this.menuId,
+          info_id: this.infoId,
+
+        }
+        eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
         // eventBUs.$emit('searchReset')
         // console.log('sele',selectedKeys)
         // console.log('uploadMenuId',this.uploadMenuId)
@@ -443,7 +453,13 @@
                 if (res.success) {
                   this.$message.success(this.$t('OperationSuccessful'))
                   this.loadMenuData()
-                  eventBUs.$emit('searchReset')
+                  let queryParam={
+                    menu_id:this.menuId,
+                    info_id: this.infoId,
+
+                  }
+                  eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                  // eventBUs.$emit('searchReset')
                 } else {
                   this.$message.warning(this.$t('operationFailed'))
                 }
@@ -451,6 +467,12 @@
             }
         })
       },
+      //清空按钮
+      resetSearch(){
+        this.menuId=''
+        this.uploadMenuId=''
+        this.selectedKeys=[]
+      },
       handleCancelMenuRight(){
         this.menuRightVisible=false
       },
@@ -477,7 +499,13 @@
                     this.onExpand(expandId)
                     this.form={}
                     this.loadMenuData()
-                    eventBUs.$emit('searchReset')
+                    let queryParam={
+                      menu_id:this.menuId,
+                      info_id: this.infoId,
+
+                    }
+                    eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                    // eventBUs.$emit('searchReset')
                   }else{
                     this.$message.warning(this.$t('operationFailed'))
                   }
@@ -580,7 +608,13 @@
                       this.$message.success(this.$t('OperationSuccessful'))
                       // this.loadData()
                       this.loadMenuData()
-                      eventBUs.$emit('searchReset')
+                      let queryParam={
+                        menu_id:this.menuId,
+                        info_id: this.infoId,
+
+                      }
+                      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                      // eventBUs.$emit('searchReset')
                     } else {
                       this.$message.warning(this.$t('operationFailed'))
                     }
@@ -618,15 +652,26 @@
 
       },
       //上传成功
-      uploadSuccess(data){
+      uploadSuccess(data,status){
+        console.log('data111',data)
+        if(status==='success'){
+          let queryParam={
+            menu_id:this.menuId,
+            info_id: this.infoId,
+
+          }
+          this.loadMenuData()
+          eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+        }
         let attIdList = []
         if(data && data.length > 0){
           data.forEach(item => {
             attIdList.push(item.id || data.name)
           })
           this.attId = attIdList.join(',')
-          this.loadMenuData()
+
-          eventBUs.$emit('searchReset')
+
+          // eventBUs.$emit('searchReset')
         }
       },
       //导出
@@ -670,7 +715,13 @@
                     if (res.data.success) {
                       this.$message.success(this.$t('OperationSuccessful'))
                       this.loadMenuData()
-                      eventBUs.$emit('searchReset')
+                      let queryParam={
+                        menu_id:this.menuId,
+                        info_id: this.infoId,
+
+                      }
+                      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                      // eventBUs.$emit('searchReset')
                       this.selectedRowKeys=[]
                     } else {
                       this.$message.warning(this.$t('operationFailed'))
@@ -738,7 +789,13 @@
                     if (res.data.success) {
                       this.$message.success(this.$t('OperationSuccessful'))
                       this.loadMenuData()
-                      eventBUs.$emit('searchReset')
+                      let queryParam={
+                        menu_id:this.menuId,
+                        info_id: this.infoId,
+
+                      }
+                      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                      // eventBUs.$emit('searchReset')
                     }else{
                       this.$message.warning(this.$t('operationFailed'))
                     }
@@ -800,7 +857,13 @@
                   if (res.data.success) {
                     this.$message.success(this.$t('OperationSuccessful'))
                     this.loadMenuData()
-                    eventBUs.$emit('searchReset')
+                    let queryParam={
+                      menu_id:this.menuId,
+                      info_id: this.infoId,
+
+                    }
+                    eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                    // eventBUs.$emit('searchReset')
                   }else{
                     this.$message.warning(this.$t('operationFailed'))
                   }

jero-web/src/views/documentManage/tags/dialog/TagForm.vue

@@ -73,7 +73,7 @@
               <j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn" :placeholder="$t('selectWhetherRequired')" />
             </a-form-model-item>
           </a-col>
-          <p class="tag-info">{{$t('DocumentLibraryModuleDisplay')}}</p>
+          <p class="tag-info">{{moduleShow?$t('DocumentLibraryModuleDisplay'):$t('documentSplitDisplay')}}</p>
           <a-divider dashed />
           <a-col :span="24">
             <a-form-model-item :label="$t('DocumentLibraryListDisplay')" prop="isShowList"  v-if="moduleShow">
@@ -489,3 +489,10 @@
     margin-left: 30px;
   }
 </style>
+<style lang="less">
+  .tag-content{
+    .ant-select-selection-selected-value{
+      color:rgba(0, 0, 0, 0.65);
+    }
+  }
+</style>