Merge branch 'mhy' into 'master'

Mhy

See merge request !79

xichongSys/src/http/moudules/getlist.js

@@ -248,3 +248,43 @@ export const seletsywdc = (data) => {
     data
   })
 };
+//查询归档档案
+export const selectArchive = (data) => {
+  return axios({
+    url: '/archive/getList',
+    method: 'post',
+    data
+  })
+};
+//查询档案文件
+export const selectArchiveFiles = (data) => {
+  return axios({
+    url: '/archiveFile/getListByArchiveId',
+    method: 'post',
+    data
+  })
+};
+//查询待归档案
+export const selectExpectArchive = (data) => {
+  return axios({
+    url: '/archive/expectArchive',
+    method: 'post',
+    data
+  })
+};
+// 进行归档操作
+export const fileArchives = (data) => {
+  return axios({
+    url: '/archive/fileArchives',
+    method: 'post',
+    data
+  })
+};
+// 查询未归档文件
+export const selectNoArcEventLogList = (data) => {
+  return axios({
+    url: '/archive/getNoArcLogList',
+    method: 'post',
+    data
+  })
+};

xichongSys/src/router/index.js

@@ -48,6 +48,10 @@ import importBaseInfoByExcel from "@/views/Myvue/importBaseInfoByExcel";
 import importPayInfoByExcel from "@/views/Myvue/importPayInfoByExcel";
 import importGrantInfoByExcel from "@/views/Myvue/importGrantInfoByExcel";
 import tablep from "@/views/Myvue/tablep";
+import archivesAdministration from "@/views/Myvue/archivesAdministration";
+import filesOfArchive from "@/views/Myvue/filesOfArchive";
+import archivesExpect from "@/views/Myvue/archivesExpect";
+import noArchiveEventLog from "@/views/Myvue/noArchiveEventLog";
 
 Vue.use(Router)
 
@@ -216,6 +220,26 @@ const router = new Router({
           name:"领取人员导入",
           component: importGrantInfoByExcel
         },
+        {
+          path:"/archivesAdmin",
+          name:"档案管理",
+          component: archivesAdministration
+        },
+        {
+          path:"/archiveFiles",
+          name:"档案文件",
+          component: filesOfArchive
+        },
+        {
+          path:"/expectArchives",
+          name:"可归档案",
+          component: archivesExpect
+        },
+        {
+          path:"/noArchiveEventLog",
+          name:"未归档文件",
+          component: noArchiveEventLog
+        },
       ]
     },
     {

xichongSys/src/views/Myvue/drtsyw.vue

@@ -106,7 +106,7 @@
           this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
             loadingInstance.close();
           });
-          if (res.code == 200) {
+          if (res.code === 200) {
             this.tableData = res.data.content
             this.totals = res.data.totalSize
           }
@@ -165,7 +165,7 @@
         this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
           loadingInstance.close();
         });
-        if (res.code == 200) {
+        if (res.code === 200) {
           this.tableData = res.data.content
           this.totals = res.data.totalSize
         }

xichongSys/src/views/Sys/User.vue

@@ -58,7 +58,7 @@
         <el-input v-model="dataForm.truename" auto-complete="off"></el-input>
 			</el-form-item>
 			<el-form-item label="密码" prop="password">
-				<el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input>
+				<el-input v-model="dataForm.password" type="password" placeholder="密码必须为6至18位" auto-complete="off"></el-input>
 			</el-form-item>
       <el-form-item label="身份证" prop="bangIdcard">
         <el-input v-model="dataForm.bangIdcard" auto-complete="off"></el-input>