用户新增字段

src/assets/styles/yxk-admin.scss

@@ -330,7 +330,7 @@
     @include tree_font_color;
   }
   .el-tree-node__children{
-    padding: 0 0 0 18px;
+    padding: 0 0 0 16px;
     .el-tree-node__content{
       @include tree_children_padding;
       height: 30px;

src/views/archivesStatistics/usageCountStatistics/index.vue

@@ -47,8 +47,8 @@
             {{ scope.row.isSummary ? '-' : scope.$index + 1 }}
           </template>
         </el-table-column>
-        <el-table-column prop="archiveNo" label="档号" align="center" width="200" show-overflow-tooltip />
-        <el-table-column prop="maintitle" label="档案名称" align="center" />
+        <el-table-column prop="archiveNo" label="档号" width="200" show-overflow-tooltip />
+        <el-table-column prop="maintitle" label="档案名称" />
         <el-table-column prop="categoryName" label="档案门类" align="center" width="180" show-overflow-tooltip />
         <el-table-column prop="archiveYear" label="归档年度" align="center" />
         <el-table-column prop="retention" label="保管期限" align="center" />

src/views/prearchiveLibrary/advancedSearchModal.vue

@@ -185,7 +185,7 @@ export default {
     }
   },
   mounted() {
-    this.getFieldCommon()
+    // this.getFieldCommon()
   },
   methods: {
     resetQuery() {
@@ -265,22 +265,29 @@ export default {
     },
     getFieldCommon() {
       console.log('selectedDocument', this.selectedDocument)
+      const currentDocumentKey = JSON.parse(localStorage.getItem('currentDocumentKey'))
+      console.log('currentDocumentKey', currentDocumentKey)
       const params = {
-        documentId: this.selectedDocument.id,
+        documentId: this.selectedDocument.id ? this.selectedDocument.id : currentDocumentKey.id,
         archivesId: null
       }
       console.log('params', params)
       FetchDoeditDocument(params).then((data) => {
-        const showFiledAll = data.showFiled.filter(item => item.isSequence).sort((a, b) => a.isSequence - b.isSequence)
-        this.fieldOptions = showFiledAll
-          .filter(item => item.fieldName !== 'fonds_no' && item.fieldName !== 'fonds_name')
-          .map(item => {
-            return {
-              id: item.id,
-              label: item.fieldCnName,
-              value: item.fieldName
-            }
-          })
+        if (data.code !== 500) {
+          const showFiledAll = data.showFiled.filter(item => item.isSequence).sort((a, b) => a.isSequence - b.isSequence)
+          this.fieldOptions = showFiledAll
+            .filter(item => item.fieldName !== 'fonds_no' && item.fieldName !== 'fonds_name')
+            .map(item => {
+              return {
+                id: item.id,
+                label: item.fieldCnName,
+                value: item.fieldName
+              }
+            })
+        } else {
+          this.fieldOptions = []
+          this.$message({ message: '获取字段失败', type: 'error', offset: 8 })
+        }
       })
     },
     checkConditions(conditionData) {

src/views/system/user/index.vue

@@ -123,17 +123,28 @@
                     <el-radio :label="0">禁用</el-radio>
                   </el-radio-group>
                 </el-form-item>
+
                 <el-form-item style="width: 100%;" label="角色" prop="roles" class="is-required selecct-dropdown">
                   <el-select v-model="roleDatas" style="width: 584px" multiple placeholder="请选择" :popper-append-to-body="false" @remove-tag="deleteTag" @change="changeRole">
                     <!-- :disabled="level !== 1 && item.level <= level" -->
                     <el-option v-for="item in roles" :key="item.name" :label="item.name" :value="item.id" />
                   </el-select>
                 </el-form-item>
-                <el-form-item style="margin-bottom: 0;" label="岗位" prop="posts" class="is-required">
+                <el-form-item label="岗位" prop="posts" class="is-required">
                   <el-select ref="paramsSelect" v-model="postDatas" style="width: 584px" multiple placeholder="请选择" @remove-tag="deleteTag" @change="changePost">
                     <el-option v-for="item in posts" :key="item.postName" :label="item.postName" :value="item.id" />
                   </el-select>
                 </el-form-item>
+                <el-row>
+                  <el-form-item label="业务账号" prop="internalId">
+                    <el-input v-model="form.internalId" />
+                  </el-form-item>
+                  <el-form-item label="业务系统" prop="systemCode">
+                    <el-select v-model="form.systemCode" placeholder="请选择">
+                      <el-option v-for="item in systemOptions" :key="item.dictionaryCode" :label="item.dictionaryName" :value="item.dictionaryCode" />
+                    </el-select>
+                  </el-form-item>
+                </el-row>
               </el-form>
               <div slot="footer" class="dialog-footer">
                 <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -166,6 +177,12 @@
             <el-table-column prop="deptsName" label="部门" />
             <el-table-column prop="job" label="岗位" />
             <el-table-column prop="roleIds" label="角色" />
+            <el-table-column prop="internalId" label="业务账号" />
+            <el-table-column prop="systemCode" label="业务系统">
+              <template slot-scope="scope">
+                {{ getSystemName(scope.row.systemCode) }}
+              </template>
+            </el-table-column>
             <el-table-column label="状态" align="center" prop="enabled" width="60">
               <template slot-scope="scope">
                 <el-switch v-model="scope.row.enabled" :disabled="user.id === scope.row.userId" active-color="#409EFF" inactive-color="#F56C6C" :active-value="1" :inactive-value="0" @change="changeEnabled(scope.row, scope.row.enabled)" />
@@ -187,6 +204,7 @@
 </template>
 
 <script>
+import { FetchDictionaryTree } from '@/api/system/dict'
 import { getToken } from '@/utils/auth'
 import crudUser, { resetpassword } from '@/api/system/user'
 // import { isvalidPhone } from '@/utils/validate'
@@ -209,7 +227,7 @@ import { exportFile } from '@/utils/index'
 import qs from 'qs'
 let userRoles = []
 let userPosts = []
-const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 1, fonds: { id: null }, roles: [], posts: [], dept: { id: null }, phone: null, isAdmin: false }
+const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 1, fonds: { id: null }, roles: [], posts: [], dept: { id: null }, phone: null, isAdmin: false, systemCode: null, internalId: null }
 export default {
   name: 'User',
   components: { Treeselect, crudOperation, pagination, DateRangePicker },
@@ -275,6 +293,7 @@ export default {
         { key: '0', display_name: '锁定' }
       ],
       deleteData: [],
+      systemOptions: [],
       rules: {
         username: [
           { required: true, message: '请输入用户名', trigger: 'blur' },
@@ -330,8 +349,23 @@ export default {
     this.getFondsDatas()
     this.getRoles()
     this.getPosts()
+    this.getDictsList()
   },
   methods: {
+    getDictsList() {
+      FetchDictionaryTree().then((res) => {
+        const filterCodes = ['system_code']
+        const filteredItems = JSON.parse(JSON.stringify(res)).filter(item => filterCodes.includes(item.dictionaryCode))
+        this.systemOptions = filteredItems[0].childDictionarys
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    getSystemName(code) {
+      if (!code) return ''
+      const item = this.systemOptions.find(opt => opt.dictionaryCode === code)
+      return item ? item.dictionaryName : code
+    },
     getAutoNameUnknown(name) {
       if (name.lastIndexOf('unknown') > -1) {
         return name.split('(')[0]