diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
index 9bacd0c8d..2bd69698c 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
@@ -151,4 +151,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
 
 	List<SysUser> getPPEmployeeList(@Param("thirdType") String thirdType);
+
+	void updateByIdPP (SysUser sysUser);
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
index 6c22a7661..ee3c91cde 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
@@ -200,4 +200,26 @@
 		select * from sys_user where third_type = #{thirdType}
 	</select>
 
+	<update id="updateByIdPP">
+		UPDATE
+			sys_user
+		SET
+			username = #{username},
+			realname = #{realname},
+			status = #{status},
+		    del_flag = #{delFlag},
+			third_id = #{thirdId},
+			work_no = #{workNo},
+			worker_type = #{workerType},
+		    create_time = #{createTime},
+			update_time = #{updateTime},
+			job_code = #{jobCode},
+			job_title = #{jobTitle},
+			org_code = #{orgCode},
+			email = #{email},
+			telephone = #{telephone}
+		WHERE
+			id = #{id}
+	</update>
+
 </mapper>
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index e457b8b91..9ea7b911d 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -562,7 +562,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			}
 		}
 
-		updateById(sysUser);
+		this.baseMapper.updateByIdPP(sysUser);
 
 	}
 
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 423f7bcbd..c1c5b2d4a 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -38,7 +38,7 @@ module.exports = {
   serialNumber: 'Number',
   userAccount: 'User Account',
   userName: 'User Name',
-  Department: 'Department',
+  department: 'Department',
   status: 'Status',
   Operation: 'Operation',
   aRcord: 'A Rcord',
@@ -1168,4 +1168,9 @@ module.exports = {
   fullTextComments:'Full text comments',
   fileDeclaration:'file Declaration',
   FileForDetails:'File For Details',
+  Converting:'Converting',
+  convertNetwork:'Convert Network',
+  convertFailed:'Convert Failed',
+  standardData:'Standard Data',
+  Theorganization:'The Organization',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 30aeaec72..43142beb5 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1172,4 +1172,9 @@ module.exports = {
   fullTextComments:'全文评论',
   fileDeclaration:'文件说明',
   FileForDetails:'文件详情',
+  Converting:'转换中',
+  convertNetwork:'转换完成',
+  convertFailed:'转换失败',
+  standardData:'标准数据',
+  Theorganization:'组织机构',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/exportTree/index.vue b/jero-web/src/components/exportTree/index.vue
deleted file mode 100644
index fa269e4b0..000000000
--- a/jero-web/src/components/exportTree/index.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <div>
-    <a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange" />
-    <a-tree
-      :expanded-keys="expandedKeys"
-      :auto-expand-parent="autoExpandParent"
-      :tree-data="gData"
-      @expand="onExpand"
-    >
-      <template slot="title" slot-scope="{ title }">
-        <span v-if="title.indexOf(searchValue) > -1">
-          {{ title.substr(0, title.indexOf(searchValue)) }}
-          <span style="color: #f50">{{ searchValue }}</span>
-          {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
-        </span>
-        <span v-else>{{ title }}</span>
-      </template>
-      <template>
-        <a-dropdown :trigger="['contextmenu']">
-          <span>{{ title }}</span>
-          <template #overlay>
-            <a-menu @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey)">
-              <a-menu-item key="1">1st menu item</a-menu-item>
-              <a-menu-item key="2">2nd menu item</a-menu-item>
-              <a-menu-item key="3">3rd menu item</a-menu-item>
-            </a-menu>
-          </template>
-        </a-dropdown>
-      </template>
-    </a-tree>
-  </div>
-</template>
-
-<script>
-const x = 3;
-const y = 2;
-const z = 1;
-const gData = [];
-
-const generateData = (_level, _preKey, _tns) => {
-  const preKey = _preKey || '0';
-  const tns = _tns || gData;
-
-  const children = [];
-  for (let i = 0; i < x; i++) {
-    const key = `${preKey}-${i}`;
-    tns.push({ title: key, key, scopedSlots: { title: 'title' } });
-    if (i < y) {
-      children.push(key);
-    }
-  }
-  if (_level < 0) {
-    return tns;
-  }
-  const level = _level - 1;
-  children.forEach((key, index) => {
-    tns[index].children = [];
-    return generateData(level, key, tns[index].children);
-  });
-};
-generateData(z);
-
-const dataList = [];
-const generateList = data => {
-  for (let i = 0; i < data.length; i++) {
-    const node = data[i];
-    const key = node.key;
-    dataList.push({ key, title: key });
-    if (node.children) {
-      generateList(node.children);
-    }
-  }
-};
-generateList(gData);
-
-const getParentKey = (key, tree) => {
-  let parentKey;
-  for (let i = 0; i < tree.length; i++) {
-    const node = tree[i];
-    if (node.children) {
-      if (node.children.some(item => item.key === key)) {
-        parentKey = node.key;
-      } else if (getParentKey(key, node.children)) {
-        parentKey = getParentKey(key, node.children);
-      }
-    }
-  }
-  return parentKey;
-};
-export default {
-  data() {
-    return {
-      searchValue: '',
-      autoExpandParent: true,
-      expandedKeys: ['0-0-0', '0-0-1'],
-      gData,
-    };
-  },
-  methods: {
-    onExpand(expandedKeys) {
-      this.expandedKeys = expandedKeys;
-      this.autoExpandParent = false;
-    },
-    onChange(e) {
-      const value = e.target.value;
-      const expandedKeys = dataList
-        .map(item => {
-          if (item.title.indexOf(value) > -1) {
-            return getParentKey(item.key, gData);
-          }
-          return null;
-        })
-        .filter((item, i, self) => item && self.indexOf(item) === i);
-      Object.assign(this, {
-        expandedKeys,
-        searchValue: value,
-        autoExpandParent: true,
-      });
-    },
-    onContextMenuClick(treeKey, menuKey) {
-      console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
new file mode 100644
index 000000000..7237ce8f6
--- /dev/null
+++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
@@ -0,0 +1,365 @@
+<template>
+  <a-drawer
+    :title="$t('RetrieveFiles')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :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="queryParam.serial_number"></a-input>
+              </div>
+            </a-col>
+            <a-col :md="12" :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="queryParam.title"></a-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="12" :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>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: '100%'}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+`${total}`+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+      <a-form-model :model="formInline" class="formAdd-One" :rules="rules" ref="ruleForm">
+        <a-col :span="24">
+          <div class="box-title-text-One">
+            <div class="title-text-One" style="margin-left: 13px">
+              <span class="Required-One">*</span>
+              <span class="title-text-text-One" :title="$t('translationLanguage')">{{$t('translationLanguage')}}</span>
+            </div>
+            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="translationLanguage">
+              <a-select :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
+                        class="box-input-One"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="formInline.translationLanguage">
+                <a-select-option v-for="(item, key) in LanguageList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+            <span class="text-icon-One">
+                  <a-icon type="arrow-right" style="font-size: 20px"/>
+              </span>
+            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="translationLanguageOne">
+              <a-select :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
+                        class="box-input-One"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="formInline.translationLanguageOne">
+                <a-select-option v-for="(item, key) in LanguageList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </div>
+        </a-col>
+      </a-form-model>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'RetrieveFilesList',
+    components: {},
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        formInline: {},
+        rules: {
+          translationLanguage: [
+            {
+              required: true,
+              message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          translationLanguageOne: [
+            {
+              required: true,
+              message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        LanguageList: [],
+        columns: [
+          {
+            title: this.$t('number'),
+            align: 'center',
+            width: 70,
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            }
+          },
+          {
+            title: this.$t('standard'),
+            dataIndex: 'serial_number',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('title'),
+            dataIndex: 'title',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('TextStatus'),
+            dataIndex: 'TextStatus',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('fileName'),
+            dataIndex: 'fileName',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('textInformation'),
+            dataIndex: 'textInformation',
+            align: 'center',
+            ellipsis: true
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        fieldList: [],
+        queryConditionVOList: []
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      addModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        // this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction('', query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$refs.ruleForm.validate(valid => {
+            if (valid) {
+              this.confirmLoading = true
+              let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+              this.visible = false
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .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;
+  }
+
+  .box-title-text-One {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text-One {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input-One {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel-One {
+    width: calc(100% - 84px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text-One {
+    margin-top: 9px;
+  }
+
+  .formAdd-One {
+    margin-top: 20px;
+  }
+
+  .text-icon-One {
+    display: inline-block;
+    width: 40px;
+    text-align: center;
+    margin-top: 11px;
+  }
+
+  .Required-One {
+    color: red;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
new file mode 100644
index 000000000..2838e708c
--- /dev/null
+++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
@@ -0,0 +1,366 @@
+<template>
+  <div>
+    <a-modal
+      :title="$t('UploadFile')"
+      :width="600"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('file')">{{$t('file')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="file">
+                <a-button type="primary" class="button-text"
+                          @click="clickButtonToUpload('file')">
+                  {{ (formInline.file === 'null' || formInline.file === '' ||
+                  formInline.file == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                  }}
+                </a-button>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('standard')">{{$t('standard')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="standard">
+                <a-input class="box-input"
+                         readonly
+                         v-model="formInline.standard"
+                         @click.native="standardClick"
+                         :placeholder="$t('PleaseSelect')+$t('standard')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('TextStatus')">{{$t('TextStatus')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="translationResults">
+                <a-select :placeholder="$t('PleaseSelect')+$t('TextStatus')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.translationResults">
+                  <a-select-option v-for="(item, key) in translationResultsList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text" style="margin-left: 13px">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('translationLanguage')">{{$t('translationLanguage')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" style="width: calc(50% - 20px)" prop="translationLanguage">
+                <a-select :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.translationLanguage">
+                  <a-select-option v-for="(item, key) in LanguageList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+              <span class="text-icon">
+                  <a-icon type="arrow-right" style="font-size: 20px"/>
+              </span>
+              <a-form-model-item class="itemModel" style="width: calc(50% - 20px)" prop="translationLanguageOne">
+                <a-select :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.translationLanguageOne">
+                  <a-select-option v-for="(item, key) in LanguageList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <standardData ref="standardDataRef" @standardDataForm="standardDataForm"/>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  import standardData from './standardData'
+
+  export default {
+    name: 'addModel',
+    components: {
+      uploadFile,
+      standardData
+    },
+    data() {
+      return {
+        visible: false,
+        uploadName: '',
+        confirmLoading: false,
+        formInline: {},
+        rules: {
+          file: [
+            {
+              required: true,
+              message: this.$t('file') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          standard: [
+            {
+              required: true,
+              message: this.$t('standard') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          translationResults: [
+            {
+              required: true,
+              message: this.$t('TextStatus') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          translationLanguage: [
+            {
+              required: true,
+              message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          translationLanguageOne: [
+            {
+              required: true,
+              message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        ids: [],
+        translationResultsList: [],
+        LanguageList: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      add() {
+        this.visible = true
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let ids = JSON.parse(JSON.stringify(this.ids))
+            let query = {
+              ids: ids.join(','),
+              ...this.formInline
+            }
+            this.confirmLoading = true
+            postAction(this.url.setBatch, query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.confirmLoading = false
+                this.$emit('batSettingList')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.formInline = {}
+        this.visible = false
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      },
+      standardClick() {
+        this.$refs.standardDataRef.addModel()
+      },
+      standardDataForm() {
+
+      }
+    }
+  }
+</script>
+
+<style>
+  .formAdd .ant-form-item-label {
+    width: 130px;
+  }
+
+  .formAdd .ant-form-item-control-wrapper {
+    display: inline-block;
+    width: 100%;
+  }
+
+  /*.formAdd .ant-form-item {*/
+  /*  margin-bottom: 20px;*/
+  /*}*/
+
+  .itemModel .ant-form-item-control-wrapper {
+    width: 100%;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .box-input .ant-calendar-picker {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    height: 38px;
+  }
+
+  .box-input .ant-input-number-input-wrap {
+    line-height: 38px;
+    height: 38px;
+  }
+
+  .box-input .ant-calendar-picker-input {
+    padding: 4px 30px 4px 11px;
+  }
+</style>
+<style scoped>
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 84px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-bottom: 40px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .text-icon {
+    display: inline-block;
+    width: 40px;
+    text-align: center;
+    margin-top: 11px;
+  }
+
+  .Required {
+    color: red;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue
new file mode 100644
index 000000000..9ba6c282c
--- /dev/null
+++ b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue
@@ -0,0 +1,318 @@
+<template>
+  <a-drawer
+    :title="$t('standardData')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :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="queryParam.serial_number"></a-input>
+              </div>
+            </a-col>
+            <a-col :md="12" :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="queryParam.title"></a-input>
+              </div>
+            </a-col>
+            <a-col :md="12" :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="queryParam.state"
+                                   :placeholder="$t('PleaseSelect')+$t('status')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'state'"/>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
+                  <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>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1200}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+`${total}`+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+
+  export default {
+    name: 'standardData',
+    components: {
+      globalAdvancedQuery
+    },
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('standard'),
+            dataIndex: 'serial_number',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('title'),
+            dataIndex: 'title',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('zoneOfApplication'),
+            dataIndex: 'region',
+            align: 'center',
+            ellipsis: true
+          },
+          // {
+          //   title: this.$t('status'),
+          //   dataIndex: 'state',
+          //   align: 'center',
+          //   ellipsis: true
+          // },
+          // {
+          //   title: this.$t('technicalField'),
+          //   dataIndex: 'technology_territory',
+          //   align: 'center',
+          //   ellipsis: true
+          // },
+          {
+            title: this.$t('ImplementationDate'),
+            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('vehicleInProductionDate'),
+            dataIndex: 'implement_time',
+            align: 'center',
+            ellipsis: true
+          }
+          // {
+          //   title: this.$t('correspondingStandard'),
+          //   dataIndex: 'corresponding_standard',
+          //   align: 'center',
+          //   ellipsis: true
+          // }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        fieldList: [],
+        queryConditionVOList: [],
+        selectedRowKeysRecord:[],
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      addModel() {
+        this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.queryConditionVOList = []
+        this.replacePage()
+        this.queryConditionInventory()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.queryConditionVOList = []
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      replacePage() {
+        let queryConditionVOList = JSON.parse(JSON.stringify(this.queryConditionVOList))
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam,
+          queryConditionVOList: JSON.stringify(queryConditionVOList)
+        }
+        this.loading = true
+        postAction('/project/projectLawsInventoryEO/queryPageDummy', query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+        this.selectedRowKeysRecord = record.filter(res=>{
+          return res.id == this.selectedRowKeys[0]
+        })
+        this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.visible = false
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      queryConditionInventory() {
+        let query = {
+          flag: 1
+        }
+        getAction('/project/projectLawsInventoryEO/queryConditionInventory', query).then((res) => {
+          if (res.success) {
+            this.fieldList = res.result || []
+          } else {
+            this.fieldList = []
+          }
+        })
+      },
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          this.queryConditionVOList = []
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          this.queryConditionVOList = params
+          this.queryConditionVOList.forEach(res => {
+            res.type = matchType
+          })
+        }
+        this.replacePage()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .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>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
index 28593c4e6..fddde2cf3 100644
--- a/jero-web/src/views/documentTools/documentTranslation/index.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -23,15 +23,15 @@
           </a-col>
           <a-col :md="6" :sm="8">
             <div class="box-title-text tree-select">
-              <div class="title-text" :title="$t('releaseSituation')">
-                <span>{{$t('releaseSituation')}}</span>
+              <div class="title-text" :title="$t('translationResults')">
+                <span>{{$t('translationResults')}}</span>
               </div>
-              <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+              <a-select :placeholder="$t('PleaseSelect')+$t('translationResults')"
                         class="box-input"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         allowClear
-                        v-model="queryParam.flowStatus">
-                <a-select-option v-for="(item, key) in gatherResultList"
+                        v-model="queryParam.translationResults">
+                <a-select-option v-for="(item, key) in translationResultsList"
                                  :key="key"
                                  :value="item.value">
                      <span style="display: inline-block;width: 100%" :title=" item.name">
@@ -41,19 +41,53 @@
               </a-select>
             </div>
           </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text tree-select">
+                <div class="title-text" :title="$t('releaseSituation')">
+                  <span>{{$t('releaseSituation')}}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="queryParam.flowStatus">
+                  <a-select-option v-for="(item, key) in gatherResultList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+          </template>
           <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">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
                </a-col>
       </span>
         </a-row>
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="initiatingProcessClick" class="operator-text">
-        <a-icon type="apartment"/>
-        {{$t('initiateComparison')}}
+      <div @click="uploadClick" class="operator-text">
+        <a-icon type="cloud-upload"/>
+        {{$t('upload1')}}
+      </div>
+      <div @click="RetrieveFilesClick" class="operator-text">
+        <a-icon type="database"/>
+        {{$t('RetrieveFiles')}}
+      </div>
+      <div @click="BatchDelete" class="operator-text">
+        <a-icon type="delete"/>
+        {{$t('BatchDelete')}}
       </div>
     </div>
     <div>
@@ -93,24 +127,32 @@
         />
       </div>
     </div>
+    <addModel ref="addModelRef" @addModelForm="addModelForm"/>
+    <RetrieveFilesList ref="RetrieveFilesListRef" @RetrieveFilesListForm="RetrieveFilesListForm"/>
   </a-card>
 </template>
 
 <script>
   import { getAction, postAction } from '@/api/manage'
+  import addModel from './components/addModel'
+  import RetrieveFilesList from './components/RetrieveFilesList'
 
   export default {
     name: 'index',
-    components: {},
+    components: {
+      addModel,
+      RetrieveFilesList
+    },
     data() {
       return {
         //url传参严格按照当前命名
         url: {
           list: '',
-          deleteBatch:'',
+          deleteBatch: ''
         },
+        toggleSearchStatus: false,
         loading: false,
-        dataSource: [],
+        dataSource: [{}],
         selectedRowKeys: [],
         total: 0,
         pageSize: 10,
@@ -126,6 +168,20 @@
             name: this.$t('Published')
           }
         ],
+        translationResultsList: [
+          {
+            value: '1',
+            name: this.$t('Converting')
+          },
+          {
+            value: '2',
+            name: this.$t('convertNetwork')
+          },
+          {
+            value: '3',
+            name: this.$t('convertFailed')
+          }
+        ],
         columns: [
           {
             title: this.$t('standard'),
@@ -193,6 +249,15 @@
       this.getList()
     },
     methods: {
+      addModelForm() {
+        this.getList()
+      },
+      RetrieveFilesListForm() {
+        this.getList()
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
       searchQuery() {
         this.pageNo = 1
         this.getList()
@@ -240,19 +305,25 @@
       viewClick(row) {
 
       },
-      checkClick(row){
+      checkClick(row) {
 
       },
-      downloadData(){
+      downloadData() {
 
       },
       subscribe() {
 
       },
-      initiatingProcessClick(){
+      uploadClick() {
+        this.$refs.addModelRef.add()
+      },
+      RetrieveFilesClick() {
+        this.$refs.RetrieveFilesListRef.addModel()
+      },
+      BatchDelete(){
 
       },
-      deleteData(val){
+      deleteData(val) {
         let _this = this
         this.$confirm({
           content: _this.$t('ConfirmDelete'),
@@ -267,7 +338,7 @@
             })
           }
         })
-      },
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 329442c47..f261141e4 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -1,47 +1,106 @@
 <template>
-<div style='display:flex'>
-  <a-card :bordered="false">
-    <div style='width: 300px;background-color: white'>
-      <exportTree ref="exportRef" />
-    </div>
-  </a-card>
-  <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('fileName')">
-                <span>{{ $t('fileName') }}</span>
-              </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('fileName')"
-                       v-model="queryParam.fileName"></a-input>
+  <div class='mainItem'>
+    <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">
+            <div class="split-detail-left-tree">
+              <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.sync="expandedKeys"
+                :auto-expand-parent="autoExpandParent"
+                :defaultExpandAll="true"
+                :tree-data="gData"
+                @expand="onExpand"
+                @rightClick="rightClick"
+                @select="onSelect"
+              >
+                <!--                @rightClick="rightClick"-->
+                <template #title="{ key: treeKey, title, record }">
+                  <a-dropdown :trigger="['contextmenu']">
+                    <!--                    <span>{{ title }}</span>-->
+                    <span v-if="title.indexOf(searchValue) >= -1 && title.length <= 18" :title="title"
+                          class="expand-title">
+                      {{ title.substr(0, title.indexOf(searchValue)) }}<span
+                      style="color: #f50">{{ searchValue }}</span>{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
+                    </span>
+                    <span
+                      v-else-if="title.indexOf(searchValue) >= -1 && title.length > 18 && title.indexOf(searchValue)>18"
+                      :title="title">
+                      {{title && title.length > 18?title.slice(0,17)+'...':title}}
+                    </span>
+                    <span
+                      v-else-if="title.indexOf(searchValue) >= -1 && title.length > 18 && title.indexOf(searchValue)<=18"
+                      :title="title">
+                      {{ title.substr(0, title.indexOf(searchValue)) }}<span style="color: #f50">{{ title.indexOf(searchValue)+searchValue.length>18?searchValue.substr(0,18-title.indexOf(searchValue)) : searchValue }}</span>{{ title.indexOf(searchValue)+searchValue.length>18?'...': title.substr(title.indexOf(searchValue) + searchValue.length,18-title.indexOf(searchValue) - searchValue.length)+'...'  }}
+
+                    </span>
+                    <span v-else :title="title">
+                      {{title && title.length > 18?title.slice(0,17)+'...':title}}
+                    </span>
+                    <template #overlay>
+                      <a-menu
+                              @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
+                        <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('newNode')}}
+                        </a-menu-item>
+                        <a-menu-item key="2" @click="orgEdit" v-has="'split:sarFileSplitMenu:update'">
+                          {{$t('modifyNode')}}
+                        </a-menu-item>
+                        <a-menu-item key="3" @click="orgDelete"
+                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('deleteNode')}}
+                        </a-menu-item>
+                        <a-menu-item key="4" @click="orgDelete" v-if="deleteNode"
+                                     v-has="'split:sarFileSplitMenu:delete'">{{$t('add')}}
+                        </a-menu-item>
+                      </a-menu>
+                    </template>
+                  </a-dropdown>
+                </template>
+              </a-tree>
             </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('uploadedBy')">
-                <span>{{$t('uploadedBy')}}</span>
-              </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('uploadedBy')"
-                       v-model="queryParam.uploadedBy"></a-input>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('uploadTime')">
-                <span>{{ $t('uploadTime') }}</span>
-              </div>
-              <a-date-picker class="box-input"
-                             :placeholder="$t('PleaseSelect')+$t('uploadTime')"
-                             @change="onChange" @ok="onOk"
-                             format="YYYY-MM-DD"
-                             :getCalendarContainer="(trigger) => trigger.parentNode"
-                             v-model="queryParam.uploadTime"
-                             :disabled="false"/>
-            </div>
-          </a-col>
-          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+          </div>
+          <div class="split-detail-right">
+            <div class="split-detail-right-wraper">
+              <div class="split-detail-search-header">
+                <a-form layout="inline" @keyup.enter.native="searchQuery">
+                  <a-row :gutter="24">
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('fileName')">
+                          <span>{{ $t('fileName') }}</span>
+                        </div>
+                        <a-input class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+$t('fileName')"
+                                 v-model="queryParams.fileName"></a-input>
+                      </div>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('uploadedBy')">
+                          <span>{{$t('uploadedBy')}}</span>
+                        </div>
+                        <a-input class="box-input" style='width: 264px' :placeholder="$t('PleaseEnter')+$t('uploadedBy')"
+                                 v-model="queryParams.uploadedBy"></a-input>
+                      </div>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('uploadTime')">
+                          <span>{{ $t('uploadTime') }}</span>
+                        </div>
+                        <a-date-picker class="box-input"
+                                       style='width: 264px'
+                                       :placeholder="$t('PleaseSelect')+$t('uploadTime')"
+                                       @change="onChange"
+                                       format="YYYY-MM-DD"
+                                       :getCalendarContainer="(trigger) => trigger.parentNode"
+                                       v-model="queryParams.uploadTime"
+                                       :disabled="false"/>
+                      </div>
+                    </a-col>
+                    <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
 <!--                   <globalAdvancedQuery ref="globalAdvancedQueryRef"-->
                  <!--                                        @handleSuperQuery="handleSuperQuery"-->
@@ -51,65 +110,101 @@
                             @click="searchReset">{{ $t('reset') }}</a-button>
                </a-col>
             </span>
-        </a-row>
-      </a-form>
-    </div>
-    <div class="table-operator" style="overflow:hidden;margin-bottom: 20px">
-      <div style="float: right;margin-bottom: 0px;margin-left: 20px">
-        <div class="operator-text" @click="handleuploadFile()">
-          <a-icon type="import"/>
-          {{ $t('UploadFile') }}
-        </div>
-        <div class="operator-text" @click="handleDel()">
-          <a-icon type="delete"/>
-          {{ $t('BatchDelete') }}
-        </div>
-      </div>
-    </div>
-    <div>
-      <a-table
-        ref="table"
-        size="middle"
-        :loading="loading"
-        :pagination="false"
-        :scroll="{x: true}"
-        rowKey="id"
-        :data-source="dataSource"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :columns="columns"
-      >
+                  </a-row>
+                </a-form>
+              </div>
+              <div class="table-operator" style="overflow:hidden;margin-bottom: 20px">
+                <div style="float: right;margin-bottom: 0px;margin-left: 20px">
+                  <div class="operator-text" @click="handleuploadFile()">
+                    <a-icon type="import"/>
+                    {{ $t('UploadFile') }}
+                  </div>
+                  <div class="operator-text" @click="handleDel()">
+                    <a-icon type="delete"/>
+                    {{ $t('BatchDelete') }}
+                  </div>
+                </div>
+              </div>
+              <div>
+                <a-table
+                  ref="table"
+                  size="middle"
+                  :loading="loading"
+                  :pagination="false"
+                  :scroll="{x: true}"
+                  rowKey="id"
+                  :data-source="dataSource"
+                  :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+                  :columns="columns"
+                >
         <span slot="projectName" slot-scope="text,record" :title="text">
           <a @click="entryNameClick(record)">
             {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
           </a>
         </span>
-        <span slot="operation" slot-scope="text,record">
+                  <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>
             <a class="text-operation" @click="download(record)">{{$t('download')}}</a>
             <a class="text-operation" @click="handleEdit(record)">{{$t('edit')}}</a>
             <a class="text-operation" @click="batchDel(record)">{{$t('delete')}}</a>
         </span>
-      </a-table>
-    </div>
-    <div class="page">
-      <a-pagination
-        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-        show-quick-jumper
-        show-size-changer
-        :page-size.sync="pageSize"
-        :total="total"
-        :current="pageNo"
-        @change="pageOnChange"
-        @showSizeChange="SizeChange"
-      />
-    </div>
-    <!--  上传文件-->
-    <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
-    <!--  文件详情-->
-    <handleModel :url="url" ref="handleModelRef" />
-  </a-card>
-</div>
+                </a-table>
+              </div>
+              <div class="page">
+                <a-pagination
+                  :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                  show-quick-jumper
+                  show-size-changer
+                  :page-size.sync="pageSize"
+                  :total="total"
+                  :current="pageNo"
+                  @change="pageOnChange"
+                  @showSizeChange="SizeChange"
+                />
+              </div>
+              <!--  上传文件-->
+              <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+              <!--  文件详情-->
+              <handleModel :url="url" ref="handleModelRef" />
+              <!--          添加节点-->
+              <a-modal
+                class="add-menus"
+                :title="menuTitle"
+                :visible="menuRightVisible"
+                :confirm-loading="confirmLoading"
+                @cancel="handleCancelMenuRight"
+                @ok="hideModalMenuRight"
+              >
+                <a-form-model
+                  v-if="menuRightVisible"
+                  class="split-click-right-form"
+                  ref="ruleForm"
+                  :model="form"
+                  :rules="rules"
+                  :label-col="labelCol"
+                  :wrapper-col="wrapperCol"
+                >
+                  <a-form-model-item :label="$t('clauseNo')" prop="name">
+                    <a-input v-model="form.name" :placeholder="$t('PleaseEnter')+$t('clauseNo')"/>
+                  </a-form-model-item>
+                  <a-form-model-item :label="$t('clauseName')" prop="itemName">
+                    <a-input v-model="form.itemName" :placeholder="$t('PleaseEnter')+$t('clauseName')"/>
+                  </a-form-model-item>
+                  <a-form-model-item :label="$t('serialNumber')" prop="displaySeq">
+                    <a-input-number v-model="form.displaySeq" :min="1" :max="99999"
+                                    :placeholder="$t('PleaseEnter')+$t('serialNumber')" :formatter="limitNumber"
+                                    :parser="limitNumber" style="width: 100%"/>
+                    <!--                <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->
+                  </a-form-model-item>
+                </a-form-model>
+              </a-modal>
 
+        </div>
+          </div>
+        </div>
+      </a-card>
+  </div>
+  </div>
 </template>
 
 <script>
@@ -117,49 +212,90 @@ import addModel from './components/addModel'
 import handleModel from './components/handle'
 import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
 import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
-import exportTree from '@/components/exportTree/index'
+// import exportTree from '@/components/exportTree/index'
 import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 // import eventBUs from '../../../common/event'
 import Vue from 'vue'
 import moment from 'moment'
+import eventBUs from '@/common/event'
+import { mapGetters } from 'vuex'
 
 export default {
-  name: 'index',
+  name: 'SplitDetail',
   components: {
     addModel,
     handleModel,
-    exportTree,
+    // exportTree,
     globalAdvancedQuery
+    // ImportFile
   },
   data() {
     return {
-      token: Vue.ls.get(ACCESS_TOKEN),
-      loading: false,
-      toggleSearchStatus: false,
-      selectedRowKeys: [],
-      CategoryTreeList:[],
-      paramsManifestId:'',
-      item:{},
-      selectedRowKeysArray: '',
-      formInline: {},
-      rules: {
-        paramsTemplateName: [
-          { required: true, message: this.$t('PleaseEnter') + this.$t('templateName'), trigger: 'change' }
-        ]
+      labelCol: { span: 6 },
+      userData: {},
+      wrapperCol: { span: 16 },
+      contentVisible: false,  //条款内容弹框显示
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10
       },
-      fieldList: [],
-      visible: false,
-      dataSource: [],
-      confirmLoading: false,
-      url: {
-        list: 'project/lawsComplianceBoard/page',
-        getSysCategoryTree: '/sys/category/getSysCategoryTree',
-      },
-      total: 0,
       pageSize: 10,
       pageNo: 1,
-      title: '新增',
+      total: 0,
+      tableData: [],
+      selectedRowKeys: [],
+      dataSource: [],
+      selectedRows: [],
+      expandedKeys: [],
+      searchValue: '',
+      autoExpandParent: true,
+      dataList: [],
+      contentValue: '',
+      gData: [],
+      selecIds: [],
+      loading: false,
+      addVisible: false,
+      attId: '',
+      data: [],
+      confirmLoading: false,
+      NodeTreeItem: null,   //右键菜单
+      tmpStyle: '',   //右键菜单位置
+      menuTitle: this.$t('add'),
+      formTitle: '',
+      menuRightVisible: false,
+      form: {},
+      rules: {
+        name: [
+          { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
+          { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
+        ],
+        itemName: [
+          { required: true, message: this.$t('PleaseEnter') + this.$t('clauseName'), trigger: 'blur' },
+          { min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
+        ],
+        displaySeq: [
+          { required: true, message: this.$t('PleaseEnter') + this.$t('serialNumber'), trigger: 'blur' }
+          // { min: 1, max: 99999, message: this.$t('cantExeed') + '99999' + this.$t('characters'), trigger: 'blur' },
+        ]
+      },
+      infoId: '',
+      menuId: '',
+      itemId: '',
+      itemVal: {},
+      // NodeTreeItemVisible:false,
+      flag: false,  //提交按钮标识
+      isEdit: false,
+      OperationList: [   //操作栏
+        {
+          text: this.$t('edit'),
+          ClickEvent: 'editClick'
+        },   //编辑
+        {
+          text: this.$t('delete'),
+          ClickEvent: 'deleteClick'
+        }  //删除
+      ],
       columns: [
         {
           title: this.$t('fileName'),
@@ -195,132 +331,466 @@ export default {
           scopedSlots: { customRender: 'operation' }
         }
       ],
-      queryParam: {},
-      areaVisible: false,
-      paramsTemplateName: '',
-      queryConditionVOList: [],
-      drawerVisible: false,
-      titleTag: ''
+      url: {
+        list: 'project/lawsComplianceBoard/page',
+        getSysCategoryTree: '/sys/category/getSysCategoryTree',
+      },
+      ids: '',
+      token: Vue.ls.get(ACCESS_TOKEN),
+      // upAccept:'.zip',  //导入文件类型
+      uploadMenuId: '',
+      selectedKeys: [],
+      deleteNode: false,
+      fullWidth: '',
+      parameter: {},
+      widthBrown: '',
     }
   },
+  watch: {
+    deleteNode() {
+
+    },
+    screenWidth: {
+      immediate: true,
+      handler(newValue) {
+        // console.log(newValue)
+      }
+    }
+  },
+  computed: {},
   mounted() {
-    this.getList()
-    this.getSysCategoryTree()
-    this.queryConditionInventory()
+    const that = this
+    let client = ''
+    let width = ''
+    // this.widthBrown = window.screenWidth || document.body.clientWidth;
+    // let iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top
+    // document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px'
+    // console.log(iframeTop,'iframeTop2222')
+    // document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
+    // window.addEventListener('resize', () => {
+    //   that.screenWidth = window.screenWidth || document.body.clientWidth;
+    //   client = document.querySelector('.split-detail-table .ant-table-content').getBoundingClientRect()
+    //   // console.log('screenWidth',that.screenWidth)
+    //   width =  that.screenWidth - client.left
+    //   document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
+    //   iframeTop= document.querySelector('.split-detail-left').getBoundingClientRect().top
+    //   console.log(iframeTop,'iframeTop111')
+    //   document.querySelector('.split-detail-left').style.height = this.brownHeight-iframeTop-24 + 'px'
+    // }, false);
+
+
+    this.userData = this.userInfo()
+    this.infoId = this.$route.query.infoId
+    console.log('info', this.$route.query)
+    this.loadMenuData()
+    this.loadData()
+    this.generateList(this.gData)
   },
   methods: {
-    queryConditionInventory() {
-      let query = {
-        flag: 1
-      }
-      getAction('/project/projectLawsInventoryEO/queryConditionInventory', query).then((res) => {
-        if (res.success) {
-          this.fieldList = res.result || []
-        } else {
-          this.fieldList = []
-        }
-      })
+    ...mapGetters(['userInfo']),
+    //显示条款内容弹框
+    showContent(val) {
+      this.contentVisible = true
+      this.contentValue = val
     },
+    //关闭条款内容弹框
     handleCancel() {
-      this.areaVisible = false
+      this.contentVisible = false
     },
-    handleSubmit() {
-      if (this.formInline.paramsTemplateName !== undefined) {
-        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
+    generateList(data) {
+      for (let i = 0; i < data.length; i++) {
+        const node = data[i]
+        const key = node.key
+        this.dataList.push({ key, title: key })
+        if (node.children) {
+          this.generateList(node.children)
+        }
       }
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {
-            if (res.success) {
-              this.areaVisible = false
-              this.$message.success(res.message)
-              this.selectedRowKeys = []
-              this.getList()
-            } else {
-              this.$message.warning(res.message)
-            }
+    },
+
+    getParentKey(key, tree) {
+      let parentKey
+      for (let i = 0; i < tree.length; i++) {
+        const node = tree[i]
+        if (node.children) {
+          if (node.children.some(item => item.key === key)) {
+            parentKey = node.key
+          } else if (this.getParentKey(key, node.children)) {
+            parentKey = this.getParentKey(key, node.children)
+          }
+        }
+      }
+      return parentKey
+    },
+    onExpand(expandedKeys) {
+      // console.log('expandedKeys',expandedKeys)
+      this.expandedKeys = expandedKeys
+      this.autoExpandParent = false
+    },
+    onLeftChange(e) {
+      const value = e.target.value
+      const expandedKeys = this.dataList
+        .map(item => {
+          if (item.title.indexOf(value) > -1) {
+            return this.getParentKey(item.key, this.gData)
+          }
+          return null
+        })
+        .filter((item, i, self) => item && self.indexOf(item) === i)
+      Object.assign(this, {
+        expandedKeys,
+        searchValue: value,
+        autoExpandParent: true
+      })
+      this.onSearch()
+    },
+    //获取左侧目录数据
+    loadMenuData() {
+      let params = {
+        infoId: this.infoId
+      }
+      this.loading = true
+      getAction(`split/sarFileSplitMenu/getSplitMenusByInfoId`, params).then(res => {
+        if (res.success) {
+          this.data = this.toTree(res.result)
+          this.gData = [...this.data]
+          Object.assign(this, {
+            expandedKeys: this.expandedKeys,
+            autoExpandParent: true
           })
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
-    getSysCategoryTree() {
-      getAction(this.url.getSysCategoryTree, {}).then((res) => {
-        if (res.success) {
-          this.CategoryTreeList = res.result
+    //将数据拼成树形结构
+    toTree(config) {
+      // 删除 所有 children,以防止多次调用
+      config.forEach(function(item) {
+        delete item.children
+      })
+      // 将数据存储为 以 id 为 KEY 的 map 索引数据列
+      let map = {}
+      config.forEach((item) => {
+        item.label = item.name
+        item.key = item.id
+        item.title = item.name + (item.itemName ? ' ' + item.itemName : '')
+        map[item.id] = item
+      })
+      let val = []
+      config.forEach((item) => {
+        // 以当前遍历项，的pid,去map对象中找到索引的id
+        let parent = map[item.pid]
+        // 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
+        if (parent) {
+          (parent.children || (parent.children = [])).push(item)
         } else {
-          this.CategoryTreeList = []
+          //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级
+          val.push(item)
         }
       })
+      return val
     },
-    handleToggleSearch() {
-      this.toggleSearchStatus = !this.toggleSearchStatus
-    },
-    onSelectChange(value) {
-      this.selectedRowKeysArray = this.selectedRowKeys.join(',')
-    },
-    deriveconformanceresults(){
-      let query = {
-        ...this.queryParam,
-        exportAll:'yes',
-        ids: this.selectedRowKeys.join(',')
+    //鼠标右键
+    rightClick({ event, node }) {
+
+      this.deleteNode = node._props.dataRef.pid ? false : true
+      // console.log('eee',event,node)
+      // this.NodeTreeItemVisible=true
+      const x =
+        event.currentTarget.offsetLeft + event.currentTarget.clientWidth
+      const y = event.currentTarget.offsetTop
+      this.NodeTreeItem = {
+        pageX: x,
+        pageY: y,
+        id: node._props.dataRef.id,
+        name: node._props.dataRef.name,
+        itemName: node._props.dataRef.itemName,
+        displaySeq: node._props.dataRef.displaySeq,
+        title: node._props.dataRef.title,
+        pid: node._props.dataRef.pid || null
       }
-      downloadFile('/project/lawsComplianceBoard/exportComplianceResult', this.$t('complianceResults')+'.xls', query, this.Deselect)
+      this.nodeItem = JSON.parse(JSON.stringify(this.NodeTreeItem))
+      // this.form.pid=this.NodeTreeItem.id
+      // this.form.id=this.NodeTreeItem.id
+      this.tmpStyle = {
+        position: 'absolute',
+        maxHeight: 40,
+        textAlign: 'center',
+        left: `${x + 10 - 0}px`,
+        top: `${y + 6 - 0}px`,
+        background: `#FFFFFF`,
+        zIndex: `2`
+      }
+      // console.log('NodeTreeItem',this.NodeTreeItem)
     },
-    // 上传文件
-    handleuploadFile(e) {
-      this.$refs.addModelRef.addModel()
+    // 用于点击空白处隐藏增删改菜单
+    clearMenu() {
+      this.NodeTreeItem = null
+      // this.NodeTreeItemVisible=false
     },
-    hideModal() {
-      this.visible = false
+    //选择树节点
+    onSelect(selectedKeys) {
+      this.menuId = selectedKeys[0]
+      this.uploadMenuId = selectedKeys[0]
+      this.selectedKeys = selectedKeys
+      let queryParam = {
+        menu_id: this.menuId,
+        info_id: this.infoId
+
+      }
+      this.parameter.info_id = this.infoId
+      this.parameter.menu_id = this.menuId
+      // eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+      this.searchQuery(JSON.parse(JSON.stringify(queryParam)))
+      // eventBUs.$emit('searchReset')
+      console.log('sele', this.menuId, selectedKeys)
+      // console.log('uploadMenuId',this.uploadMenuId)
     },
-    //虚拟清单名称事件
-    entryNameClick(item) {
-      this.$router.push({
-        path: '/ParameterTemplateList',
-        query: item
+    //树形新增
+    orgAdd() {
+      this.menuTitle = this.$t('add')
+      this.isEdit = false
+      this.form = {}
+      this.menuRightVisible = true
+
+    },
+    //树形修改
+    orgEdit() {
+      this.menuTitle = this.$t('edit')
+      this.isEdit = true
+      this.form.id = this.nodeItem.id
+      this.form.pid = this.nodeItem.pid
+      this.form.name = this.nodeItem.name
+      this.form.itemName = this.nodeItem.itemName
+      this.form.displaySeq = this.nodeItem.displaySeq
+      this.menuRightVisible = true
+    },
+    //树形删除
+    orgDelete() {
+      this.$confirm({
+        content: this.$t('deleteNodes'),
+        onOk:
+          async () => {
+            getAction(`split/sarFileSplitMenu/deleteMenu`, { id: this.nodeItem.id }).then(res => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.loadMenuData()
+                let queryParam = {
+                  menu_id: this.menuId,
+                  info_id: this.infoId
+
+                }
+                // eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                this.searchQuery(JSON.parse(JSON.stringify(queryParam)))
+                // eventBUs.$emit('searchReset')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            })
+          }
       })
     },
-    searchQuery() {
-      this.pageNo = 1
-      this.getList()
+    onContextMenuClick(treeKey, menuKey) {
+      // console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
     },
-    searchReset() {
-      this.queryParam = {}
-      this.territory = ''
-      this.queryConditionVOList = []
-      this.$refs.globalAdvancedQueryRef.resetLine()
-      this.$refs.globalAdvancedQueryRef.emitCallback()
+    //清空按钮
+    resetSearch() {
+      this.menuId = ''
+      this.uploadMenuId = ''
+      this.selectedKeys = []
+    },
+    handleCancelMenuRight() {
+      this.menuRightVisible = false
+    },
+    //增加条款确定
+    hideModalMenuRight() {
+
+      let expandId = []
+      expandId.push(this.form.pid)
+      if (!this.isEdit) {
+        let params = {
+          infoId: this.infoId,
+          pid: this.nodeItem.id,
+          ...this.form
+        }
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+
+            // console.log('parms',this.params)
+            if (!this.flag) {
+              this.flag = true
+              postAction(`split/sarFileSplitMenu/addMenu`, params).then(res => {
+                if (res.success) {
+                  this.menuRightVisible = false
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  // this.onExpand(expandId)
+                  this.form = {}
+                  this.expandedKeys.push(this.nodeItem.id)
+                  // console.log('expandedKeys1111',this.expandedKeys)
+                  this.loadMenuData()
+                  let queryParam = {
+                    menu_id: this.menuId,
+                    info_id: this.infoId
+
+                  }
+                  // eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                  this.searchQuery(JSON.parse(JSON.stringify(queryParam)))
+                  // eventBUs.$emit('searchReset')
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              }).finally(() => {
+                this.flag = false
+                this.menuRightVisible = false
+              })
+            }
+          }
+        })
+      } else {
+        let params = {
+          info_id: this.infoId,
+          ...this.form
+        }
+        if (!this.flag) {
+          this.flag = true
+          // console.log('parms',params)
+          putAction(`split/sarFileSplitMenu/updateMenu`, params).then(res => {
+            if (res.success) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.onExpand(expandId)
+              this.form = {}
+              this.loadMenuData()
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }).finally(() => {
+            this.flag = false
+            this.menuRightVisible = false
+          })
+        }
+      }
     },
     pageOnChange(page, pageSize) {
       this.pageNo = page
-      this.getList()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.getList()
+      this.loadData()
     },
     addModelList() {
       this.pageNo = 1
-      this.getList()
+      this.loadData()
     },
-    PersonnelSelectionChange(value, id) {
-      this.queryParam[value] = id
-      this.queryParam = { ...this.queryParam }
-    },
-    handleSuperQuery(params, matchType) {
-      let sqp = {}
-      if (!params || (params && params.length == 0)) {
-        this.queryConditionVOList = []
-        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
-      } else {
-        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
-        this.queryConditionVOList = params
-        this.queryConditionVOList.forEach(res => {
-          res.type = matchType
-        })
+    //获取列表数据
+    loadData(item) {
+      let params = {
+        ...this.queryParams,
+        ...item,
+        info_id: this.infoId
       }
-      this.getList()
+      this.loading = true
+      postAction(this.url.list, params).then(res => {
+        if (res.success) {
+          this.dataSource = res.result.records || []
+          this.total = res.result.total
+          this.loading = false
+        }
+      })
+    },
+    //搜索
+    searchQuery(item) {
+      this.pageNo = 1
+      this.loadData(item)
+    },
+    //清空
+    searchReset() {
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10
+      }
+      this.loadData()
+    },
+    //新增
+    handleAddManage() {
+      // console.log('this.menuId',this.menuId)
+      if (this.menuId) {
+        this.formTitle = this.$t('add')
+        this.itemId = ''
+        this.addVisible = true
+        this.$nextTick(() => {
+          this.$refs.splitForm.add()
+        })
+      } else {
+        this.$message.warning(this.$t('selectDirectoryTerms'))
+      }
+    },
+    closeVisible(val) {
+      this.addVisible = val
+    },
+    //导入
+    handleImportManage() {
+      if (!this.menuId) {
+        this.$message.warning(this.$t('selectDirectoryTerms'))
+      }
+
+    },
+    //上传成功
+    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)))
+        this.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(',')
+
+
+        // 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() {
+      if (JSON.stringify(this.parameter) == '{}') {
+        this.parameter.info_id = this.infoId
+        this.parameter.menu_id = this.menuId
+      }
+      // console.log('menuId',this.menuId)
+      let dateName = moment(new Date()).format('YYYY-MM-DD HH-mm-ss')
+      let name = this.$route.query.infoNumber + ' ' + dateName + '.zip'
+      let query = {
+        exportName: this.$route.query.infoNumber + ' ' + dateName,
+        idList: this.selectedRowKeys.join(','),
+        parameter: this.parameter
+      }
+
+      downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear)
+    },
+    onChange(){
+
+    },
+    selectClear() {
+      this.$refs.splitDetailTabel.selectedRowKeys = []
+      this.selectedRowKeys = []
+      this.selectedRows = []
+      this.selecIds = []
     },
     //查看
     handlelist(){
@@ -370,48 +840,215 @@ export default {
         this.$message.warning(this.$t('selectLeastOne'))
       }
     },
-    getList() {
-      let territory = ''
-      if (this.queryParam.technologyTerritory) {
-        this.territory = this.queryParam.technologyTerritory.join(',')
+    //保存成功
+    sumber() {
+      this.loadMenuData()
+    },
+    //删除
+    deleteClick(val) {
+      let params = {
+        ids: val.id
       }
-      // let queryParam = JSON.parse(JSON.stringify(this.queryParam))
-      let queryConditionVOList = JSON.parse(JSON.stringify(this.queryConditionVOList))
-      let query = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        queryConditionVOList: JSON.stringify(queryConditionVOList),
-        technology_territory: this.territory,
-        serial_number:this.queryParam.serialNumber,
-        title:this.queryParam.title,
-        state:this.queryParam.state
+      this.$confirm({
+        title: this.$t('areYouSure'),
+        content: '',
+        onOk:
+          async () => {
+            axios({
+              url: '/jero-boot/split/sarFileSplitItems/batchDeleteItems',
+              method: 'post',
+              data: params,
+              transformRequest: [function(data) {
+                // Do whatever you want to transform the data
+                let ret = ''
+                for (let it in data) {
+                  ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                }
+                return ret
+              }],
+              headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-Access-Token': this.token
+              }
+            })
+              .then((res) => {
+                if (res.data.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.loadMenuData()
+                  let queryParam = {
+                    menu_id: this.menuId,
+                    info_id: this.infoId
 
-      }
-      this.loading = true
-      postAction(this.url.list, query).then((res) => {
-        if (res) {
-          if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = res.result.current - 1
-            this.getList()
-            return
-          }
-          console.log(res.result)
-          this.dataSource = res.result.records || []
+                  }
+                  // eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
+                  this.searchQuery(JSON.parse(JSON.stringify(queryParam)))
+                  // eventBUs.$emit('searchReset')
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+              .catch((error) => {
+                console.log(error)
+              })
 
-          this.total = res.result.total
-          this.loading = false
-        } else {
-          this.loading = false
+
+            // postAction(`split/sarFileSplitItems/batchDeleteItems`,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
+            //     // }
+            //     // this.loadData()
+            //     this.loadMenuData()
+            //     eventBUs.$emit('searchReset')
+            //   }else{
+            //     this.$message.warning(this.$t('operationFailed'))
+            //   }
+            // })
+          },
+        onCancel() {
         }
       })
+    },
+    //选择框
+    onSelectChange(selectedRowKeys, rows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = rows
+      this.selecIds = selectedRowKeys
+      // console.log('rows',this.selectedRows)
+    },
+    //点击页数
+    onChangePage(page, pageSize) {
+      this.queryParams.pageNo = page
+      this.loadData()
+    },
+    //一页显示条数
+    SizeChange(page, pageSize) {
+      this.queryParams.pageSize = pageSize
+      this.queryParams.pageNo = 1
+      this.loadData()
+    },
+    // 上传文件
+    handleuploadFile(e) {
+      this.$refs.addModelRef.addModel()
+    },
+    onSearch() {
+      let self = this
+      let tree = JSON.parse(JSON.stringify(this.data))
+      this.expandedKeys = []
+      if (this.searchValue.trim() == '') {
+        this.gData = JSON.parse(JSON.stringify(this.data))
+        return
+      }
+      if (tree && tree.length > 0) {
+        tree.forEach((n, i, a) => {
+          self.searchEach(n, this.searchValue)
+        })
+
+        // 没有叶子节点的根节点也要清理掉
+        let length = tree.length
+        for (let i = length - 1; i >= 0; i--) {
+          let e2 = tree[i]
+          if (!this.isHasChildren(e2) && e2.title.indexOf(this.searchValue) <= -1) {
+            tree.splice(i, 1)
+            this.expandedKeys.push(e2.key)
+          }
+        }
+        this.gData = [...tree]
+      }
+    },
+    searchEach(node, value) {
+      let depth = this.getTreeDepth(node)
+      let self = this
+      for (let i = 0; i < depth - 1; i++) {
+        let spliceCounter = 0
+        this.traverseTree(node, n => {
+          if (self.isHasChildren(n)) {
+            let children = n.children
+            let length = children.length
+            for (let j = length - 1; j >= 0; j--) {
+              let e3 = children[j]
+              if (!self.isHasChildren(e3) && e3.title.indexOf(value) <= -1) {
+                children.splice(j, 1)
+                spliceCounter++
+              } else {
+                this.expandedKeys.push(e3.key)
+              }
+            }
+          }
+        })
+        if (spliceCounter == 0) {
+          break
+        }
+      }
+    },
+    // 判断树形结构中的一个节点是否具有孩子节点
+    isHasChildren(node) {
+      let flag = false
+      if (node.children && node.children.length > 0) {
+        flag = true
+      }
+      return flag
+    },
+
+    // 通过传入根节点获得树的深度
+    getTreeDepth(node) {
+      if (undefined == node || null == node) {
+        return 0
+      }
+      let r = 0
+      let currentLevelNodes = [node]
+      while (currentLevelNodes.length > 0) {
+        r++
+        let nextLevelNodes = new Array()
+        for (let i = 0; i < currentLevelNodes.length; i++) {
+          let e = currentLevelNodes[i]
+          if (this.isHasChildren(e)) {
+            nextLevelNodes = nextLevelNodes.concat(e.children)
+          }
+        }
+        currentLevelNodes = nextLevelNodes
+      }
+      return r
+    },
+
+    traverseTree(node, callback) {
+      if (!node) {
+        return
+      }
+      let stack = []
+      stack.push(node)
+      let tmpNode
+      while (stack.length > 0) {
+        tmpNode = stack.pop()
+        callback(tmpNode)
+        if (tmpNode.children && tmpNode.children.length > 0) {
+          for (let i = tmpNode.children.length - 1; i >= 0; i--) {
+            stack.push(tmpNode.children[i])
+          }
+        }
+      }
+    },
+    //正则替换小数点
+    limitNumber(value) {
+      if (typeof value === 'string') {
+        return !isNaN(Number(value)) ? value.replace(/\./g, '') : 0
+      } else if (typeof value === 'number') {
+        return !isNaN(value) ? String(value).replace(/\./g, '') : 0
+      } else {
+        return 0
+      }
     }
+
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', {}, false)
   }
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 @import '~@assets/less/common.less';
-
 .box-title-text {
   line-height: 1.4;
   display: flex;
@@ -421,7 +1058,7 @@ export default {
 
 .title-text {
   width: 20%;
-  min-width: 110px;
+  min-width: 80px;
   color: #000F16;
   display: inline-block;
   font-weight: 500;
@@ -484,40 +1121,242 @@ export default {
   height: 38px;
   width: 100%;
 }
+.split-detail {
+  /*height: 100% !important;*/
 
-.itemModel {
-  width: calc(100% - 130px);
-  display: inline-block;
-  margin-top: 2px;
+  .split-detail-wrap {
+    /*display: flex;*/
+    /*justify-content: space-between;*/
+
+    .split-detail-left {
+      /*height: 100%;*/
+      width: 300px;
+      float: left;
+      padding-right: 20px;
+      /*border-right: 1px solid #E6E7EC;*/
+      overflow-y: auto;
+
+      .split-detail-left-tree {
+
+      }
+
+      .menu-item {
+        padding: 2px 8px;
+        border: 1px solid #000000;
+        border-bottom: none;
+        cursor: pointer;
+      }
+
+      .menu-bottom {
+        border-bottom: 1px solid #000000;
+      }
+
+      .menu-item:hover {
+        background: #00B3BE;
+        color: #ffffff;
+      }
+    }
+
+    .split-detail-right {
+      padding-left: 20px;
+      width: calc(100% - 300px);
+      float: right;
+      border-left: 1px solid #E6E7EC;
+      /*flex: 1;*/
+
+      .split-detail-search-header {
+        margin-bottom: 20px;
+
+        .table-page-search-submitButtons {
+          display: flex;
+        }
+      }
+
+      .split-detail-table {
+        .action-edit {
+          margin-right: 20px;
+        }
+
+        .content-show {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 3;
+          -webkit-box-orient: vertical;
+          height: 60px;
+          line-height: 20px;
+          white-space: pre-wrap;
+        }
+
+        .page {
+          text-align: right;
+        }
+      }
+
+      .split-item {
+        display: flex;
+      }
+    }
+
+    .page {
+      margin-top: 20px;
+    }
+  }
 }
 
-.Required {
-  color: red;
-  margin-right: 4px;
-}
-
-.title-text-text {
-  margin-top: 9px;
-}
-
-.formAdd {
-  margin-bottom: 40px;
-}
-
-.drawer-bootom-button {
-  position: absolute;
-  bottom: 0;
-  z-index: 100;
-  width: 100%;
-  border-top: 1px solid #e8e8e8;
-  padding: 10px 16px;
-  text-align: right;
-  left: 0;
-  background: #fff;
-  border-radius: 0 0 2px 2px;
-}
-
-.add-text-text {
-  margin-top: -14px;
+/deep/ .ant-table-body {
+  overflow: hidden !important;
 }
 </style>
+
+<style lang="less">
+.split-item {
+  .ant-form-item-label {
+    min-width: 100px;
+  }
+}
+
+.add-menus {
+  .ant-modal-wrap {
+    .ant-modal-footer {
+      text-align: center;
+    }
+  }
+}
+
+.split-detail-right-wraper {
+  .table-page-search-submitButtons {
+    .ant-col-md-6 {
+      display: flex;
+    }
+  }
+
+  .split-detail-search-header {
+    .ant-col-sm-8 {
+      min-width: 300px;
+    }
+
+    .ant-select-selection--multiple {
+      ul {
+        height: 36px;
+        overflow-y: auto;
+      }
+    }
+  }
+
+  .upload-split {
+    .ant-upload {
+      color: #040B29;
+
+    }
+
+    .anticon-import {
+      display: inline-block;
+      margin-right: 3px !important;
+    }
+  }
+}
+
+.show-setting {
+  .ant-modal {
+    min-width: 700px;
+  }
+
+  .ant-select-dropdown--multiple {
+    max-height: 39vh !important;
+  }
+
+  .ant-modal-body {
+    overflow-y: visible !important;
+  }
+
+  .ant-modal-footer {
+    text-align: center;
+  }
+}
+
+.split-detail-left {
+
+  .ant-tree-node-content-wrapper-normal {
+
+  }
+
+  ant-tree-node-content-wrapper {
+    .expand-title {
+
+    }
+  }
+
+  .ant-tree-title {
+    span {
+      //display: block;
+      width: auto;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+    }
+
+  }
+
+  .ant-tree-child-tree {
+    .ant-tree-title {
+      span {
+        //display: block;
+        width: auto;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
+      }
+
+    }
+  }
+
+}
+
+.ant-modal-body {
+  max-height: 500px;
+  overflow-y: auto;
+}
+
+.split-detail-table {
+  .ant-table-body {
+    overflow: auto !important;
+  }
+}
+
+.item-content-show {
+  .wordImg {
+    width: 40px;
+    height: auto;
+  }
+}
+
+@media screen and (min-width: 600px) and (max-width: 1600px) {
+
+  .operator-text {
+    margin-right: 20px !important;
+  }
+
+  /*.title-text {*/
+  /*  min-width: 73px !important;*/
+  /*}*/
+
+  /*.split-detail-wrap {*/
+  /*  height: 481px !important;*/
+  /*}*/
+
+  /*.mainItem {*/
+  /*  height: 500px;*/
+  /*}*/
+}
+
+@media screen and (min-width: 1600px) and (max-width: 2000px) {
+  /*.split-detail .split-detail-wrap .split-detail-left {*/
+  /*  height: 735px !important;*/
+  /*}*/
+
+  /*.mainItem {*/
+  /*  height: 800px !important;*/
+  /*}*/
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 45f381221..b44f2bb1a 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -57,13 +57,34 @@
                 </a-select>
               </div>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('department')">
+                  <span>{{ $t('department') }}</span>
+                </div>
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="queryParam.orgCode"
+                  :maxTagCount="1"
+                  show-search
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  :tree-data="CategoryTreeList"
+                  :placeholder="$t('PleaseSelect')+$t('department')"
+                />
+                <!--              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"-->
+                <!--                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"-->
+                <!--                                 :type="'select'"-->
+                <!--                                 :triggerChange="false" :dictCode="'duty_territory'"/>-->
+              </div>
+            </a-col>
           </template>
           <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">
-                {{ toggleSearchStatus ? $t('open') : $t('away') }}
+                {{ toggleSearchStatus ? $t('away') : $t('open') }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
               </a>
                </a-col>
@@ -141,7 +162,7 @@
   import DepartmentAllocation from './modules/departmentAllocation'
   import UserModal from './modules/UserModal'
   import PasswordModal from './modules/PasswordModal'
-  import { putAction, getFileAccessHttpUrl } from '@/api/manage'
+  import {getAction, putAction, getFileAccessHttpUrl } from '@/api/manage'
   import { frozenBatch } from '@/api/api'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import JInput from '@/components/jero/JInput'
@@ -174,6 +195,18 @@
         departmentvisible: false, // 部门配置得弹框
         selectedRowKeys: [],
         selectedRowKeysvalue: [],
+        CategoryTreeList:[],
+        ipagination: {
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '30', '50', '100'],
+          showTotal: (total, range) => {
+            return range[0] + '-' + range[1] + ' 共' + total + '条'
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
         columns: [
           {
             title: this.$t('serialNumber'),
@@ -259,6 +292,7 @@
           list: '/sys/user/page',
           delete: '/sys/user/delete',
           deleteBatch: '/sys/user/deleteBatch',
+          getSysCategoryTree: '/sys/sysDepart/queryTreeList',
           exportXlsUrl: '/sys/user/exportXls',
           importExcelUrl: 'sys/user/importExcel'
         }
@@ -269,6 +303,9 @@
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       }
     },
+    mounted() {
+      this.getSysCategoryTree()
+    },
     methods: {
       // 重置密码
       resetPassword(val) {
@@ -368,6 +405,15 @@
           })
         }
       },
+      getSysCategoryTree() {
+        getAction(this.url.getSysCategoryTree, {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
       handleMenuClick(e) {
         if (e.key == 1) {
           this.batchDel()
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index fe741c908..d0ddf3695 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -156,7 +156,7 @@
 <!--        :disabled="isDisabledAuth('user:form:phone')"-->
         <a-form-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :placeholder="$t('enterMobileNumber')" :disabled='isdisabled'
-                   v-decorator="[ 'phone', validatorRules.phone]"/>
+                   v-decorator="[ 'telephone', validatorRules.telephone]"/>
         </a-form-item>
 
         <!--<a-form-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol">-->