Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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);
 }

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>

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);
 
 	}
 

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',
 }

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

@@ -1172,4 +1172,9 @@ module.exports = {
   fullTextComments:'全文评论',
   fileDeclaration:'文件说明',
   FileForDetails:'文件详情',
+  Converting:'转换中',
+  convertNetwork:'转换完成',
+  convertFailed:'转换失败',
+  standardData:'标准数据',
+  Theorganization:'组织机构',
 }

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

@@ -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>

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>

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>

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>

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')">
+              <div class="title-text" :title="$t('translationResults')">
-                <span>{{$t('releaseSituation')}}</span>
+                <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">
+                        v-model="queryParam.translationResults">
-                <a-select-option v-for="(item, key) in gatherResultList"
+                <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">
+      <div @click="uploadClick" class="operator-text">
-        <a-icon type="apartment"/>
+        <a-icon type="cloud-upload"/>
-        {{$t('initiateComparison')}}
+        {{$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>

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()

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">-->