From 3e35bccad04e3ef1d601b4c00a32b8b2d92f03bd Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Sun, 24 Apr 2022 21:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E4=BA=BA=E5=91=98=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/PersonnelSelection/index.vue |  4 +++-
 jero-web/src/components/SplitImport/index.vue        |  7 ++++++-
 jero-web/src/components/SplitUpload/index.vue        |  2 +-
 .../splitting/modules/SplitAddForm.vue               |  8 +++++---
 .../documentManage/splitting/modules/SplitDetail.vue | 12 ++++++------
 .../src/views/documentManage/tags/dialog/TagForm.vue |  4 ++--
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 7a7ca0779..1e541beb1 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -32,6 +32,7 @@
           checkable
           :loading="loading"
           :tree-data="gData"
+          v-model:checkedKeys="selectedKey"
           @select="onSelect"
           @check="onCheck"
           @expand="onExpand"
@@ -69,7 +70,7 @@
         userIds: [],
         searchModel:'',
         defaultExpandedKeys: [],
-        defaultCheckedKeys: []
+        defaultCheckedKeys: [],
       }
     },
     mounted() {
@@ -167,6 +168,7 @@
             this.gData = res.result
             this.defaultExpandedKeys = [this.departId]
             this.defaultCheckedKeys = this.personneQuery[this.query.db_field_name + '_id'] ? this.personneQuery[this.query.db_field_name + '_id'].split(',') : []
+            this.selectedKey = this.personneQuery[this.query.db_field_name + '_id'] ? this.personneQuery[this.query.db_field_name + '_id'].split(',') : []
             console.log(this.defaultCheckedKeys)
             this.treeVisible = true
           } else {
diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue
index d26d54337..f616626eb 100644
--- a/jero-web/src/components/SplitImport/index.vue
+++ b/jero-web/src/components/SplitImport/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="ocr-upload">
+  <div class="split-upload">
     <!--    <a-modal v-model="visible" :maskClosable="false" :footer="[]" :title="title" class="ocr-upload-modal">-->
     <a-upload
       :accept='accept'
@@ -234,4 +234,9 @@
     margin-top: 10px;
   }
 }
+  .upload-split {
+    .import{
+      margin-right: 3px!important;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue
index bd260efb6..6c7a80208 100644
--- a/jero-web/src/components/SplitUpload/index.vue
+++ b/jero-web/src/components/SplitUpload/index.vue
@@ -4,7 +4,7 @@
       <a-upload-dragger
         :accept='accept'
         :disabled="disabled"
-        class="ant-upload-list"
+        class="split-upload-list"
         name="file"
         :file-list="myfileList"
         :multiple="true"
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index 603adbee8..ce236680e 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -709,7 +709,10 @@
 
                 params.info_id=this.infoId
                 params.menu_id=this.menuId
-              console.log(this.contentList,'this.contentListthis.contentList')
+              if (this.formInline.id) {
+                params.menu_id=this.itemVal.menu_id
+              }
+              // console.log(this.contentList,'this.contentListthis.contentList')
               let contentList=JSON.parse(JSON.stringify(this.contentList))
               contentList.forEach((item,index)=>{
                 if(item.type==='IMG'){
@@ -722,8 +725,6 @@
               params.itemValEOList=contentList
               // console.log('paramsformInline',params)
               params.delItemIds=this.deleteIds.join(',')
-              console.log(params,'paramsparams,paramsparams')
-              console.log()
               axios({
                 url: url,
                 method: 'post',
@@ -1079,6 +1080,7 @@
         this.visible=true
         this.type = 'edit'
         this.itemVal=item
+
         // this.getForm(() => {
         //   this.formInline=item
         // })
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 759a0948a..c02c0b517 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -62,8 +62,7 @@
                   {{ $t('add') }}
                 </div>
                 <div class="operator-text upload-split" @click="handleImportManage" v-has="'split:sarFileSplitItems:import'">
-                  <a-icon type="import" :rotate="-90" v-if="uploadMenuId===undefined||uploadMenuId===''" />
-                  {{ (uploadMenuId===''||uploadMenuId===undefined)? $t('import'):'' }}
+                  <a-icon type="import" :rotate="-90" v-if="uploadMenuId===undefined||uploadMenuId===''" />{{ (uploadMenuId===''||uploadMenuId===undefined)? $t('import'):'' }}
                   <upload v-if="menuId" ref="uploadSplit":infoId="infoId" :menuId="uploadMenuId" @uploadSuccess="uploadSuccess"></upload>
 <!--                  <ImportFile :url="url"/>-->
 
@@ -1234,10 +1233,11 @@
     .upload-split{
       .ant-upload{
         color:#040B29;
-        i.import{
-          display: inline-block;
-          margin-right: 4px;
-        }
+
+      }
+      .anticon-import{
+        display: inline-block;
+        margin-right: 3px!important;
       }
     }
   }
diff --git a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
index 2280ee6e9..eec7b25ef 100644
--- a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
@@ -335,7 +335,7 @@ export default {
         this.form.isModel='0'
         this.moduleShow=false
       }
-      // this.disabledEdit=false
+      this.disabledEdit=false
     }else if(this.submitEdit==='edit'){
       if(this.submitKey==='1'){
         this.form.isModel='1'
@@ -344,7 +344,7 @@ export default {
         this.form.isModel='0'
         this.moduleShow=false
       }
-      // this.disabledEdit=true
+      this.disabledEdit=true
 
     }
     this.form={...this.editData}