档案管理- 接口调试/样式修改

src/api/archivesManage/archivesList.js

@@ -2,6 +2,7 @@ import request from '@/utils/request'
 import qs from 'qs'
 // import { form } from '../../components/Crud/crud'
 
+// 档案列表获取显示列
 export function FetchTableDisplayFields(params) {
   return request({
     url: 'api/archives/initArchivesViewTable' + '?' + qs.stringify(params, { indices: false }),
@@ -9,6 +10,7 @@ export function FetchTableDisplayFields(params) {
   })
 }
 
+// 档案预编辑
 export function FetchFormDisplayFields(params) {
   return request({
     url: 'api/archives/doedit' + '?' + qs.stringify(params, { indices: false }),
@@ -20,6 +22,7 @@ export function add(form) {
   return edit(form)
 }
 
+// 档案编辑
 export function edit(parameter) {
   return request({
     url: 'api/archives/edit',
@@ -114,6 +117,15 @@ export function FetchDeleteFile(parameter) {
   })
 }
 
+// 附件排序
+export function FetchFileSort(parameter) {
+  return request({
+    url: 'api/archives/fileSort',
+    method: 'post',
+    data: parameter
+  })
+}
+
 // 档案还原
 export function FetchReduction(parameter) {
   return request({
@@ -123,14 +135,5 @@ export function FetchReduction(parameter) {
   })
 }
 
-// 根据门类导出数据
-// export function FetchExportArchives(params) {
-//   return request({
-//     url: 'api/archives/exportArchives?' + qs.stringify(params, { indices: false }),
-//     method: 'get',
-//     responseType: 'blob'
-//   })
-// }
-
 export default { add, edit, del, FetchInitArchivesView, FetchTableDisplayFields, FetchFormDisplayFields, FetchDoeditIsRepeat }
 

src/assets/icons/svg/bindbiaoqian.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="绑定" transform="translate(-2.788 -2.787)">
+	<path id="矩形_300" class="st0" d="M862.94,38.86L990.67,166.6c48.1,48.1,48.1,126.09,0,174.19L793.26,538.19
+		c-48.1,48.1-126.09,48.1-174.19,0L491.34,410.46c-48.1-48.1-48.1-126.09,0-174.19L688.75,38.86
+		C736.85-9.24,814.84-9.24,862.94,38.86z M677.14,480.13c16.03,16.03,42.03,16.03,58.06,0l197.41-197.41
+		c16.03-16.03,16.03-42.03,0-58.06L804.87,96.92c-16.03-16.03-42.03-16.03-58.06,0L549.4,294.33c-16.03,16.03-16.03,42.03,0,58.06
+		L677.14,480.13z"/>
+	<path id="矩形_301" class="st0" d="M410.5,491.38l127.74,127.74c48.1,48.1,48.1,126.09,0,174.19L340.83,990.71
+		c-48.1,48.1-126.09,48.1-174.19,0L38.9,862.98c-48.1-48.1-48.1-126.09,0-174.19l197.41-197.41
+		C284.41,443.28,362.4,443.28,410.5,491.38z M224.7,932.65c16.03,16.03,42.03,16.03,58.06,0l197.41-197.41
+		c16.03-16.03,16.03-42.03,0-58.06L352.44,549.44c-16.03-16.03-42.03-16.03-58.06,0L96.97,746.85c-16.03,16.03-16.03,42.03,0,58.06
+		L224.7,932.65z"/>
+	<path id="路径_623" class="st0" d="M288.59,781.76c-22.67,0.04-41.09-18.31-41.13-40.98c-0.02-10.93,4.32-21.42,12.06-29.14
+		L711.96,259.2c16.31-15.75,42.3-15.3,58.05,1.01c15.37,15.91,15.37,41.14,0,57.05L317.58,769.69
+		C309.9,777.4,299.47,781.74,288.59,781.76z"/>
+</g>
+</svg>

src/assets/icons/svg/fujian.svg

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#CCE5FF;}
+	.st1{fill:#3A99FD;}
+</style>
+<g id="组_215" transform="translate(1193.359 520.311)">
+	<path id="路径_796" class="st0" d="M-559.2-302.6l-608.3,36.4c-3.2,0-5.7-4.2-5.7-9l5.7-172.9l570.3,7.2c3.2,0,5.7,4.2,5.7,9
+		l37.9,120.3C-553.5-306.7-556.1-302.6-559.2-302.6z"/>
+</g>
+<path class="st1" d="M936.8,212.4H678.1L616.8,63.6c-7.3-19.5-25.6-32.6-46.4-33.2H78.2C32.6,33.1-2.2,72,0.1,117.6v147.8h0.1v640.9
+	c0.1,48.1,39.1,87.1,87.2,87.2h849.2c48.2,0,87.3-39.1,87.3-87.3V299.6C1023.9,251.5,984.9,212.5,936.8,212.4z M78.2,83.7h492.2
+	c1.4,0,2.6,0.9,3.1,2.2l52.1,126.5h-578v-94.6C46.7,100,60.4,84.8,78.2,83.7z"/>
+<path id="路径_797" class="st0" d="M587.4,361.9c-38.9-39.4-102.3-39.7-141.7-0.8c-0.3,0.3-0.6,0.6-0.8,0.8v0.8
+	c-0.4,0.4-1,0.7-1.6,0.8L210.8,596l-5.5,5.5c-2.1,2-3.7,4.4-4.7,7c-47.4,60.3-36.9,147.6,23.3,195c50.4,39.6,121.3,39.6,171.6,0
+	c2.9-1.4,5.6-3.2,7.8-5.5l161.3-161.3c9.4-9.6,9.4-24.9,0-34.4c-9.4-9.3-24.5-9.2-33.8,0.1c-0.2,0.2-0.4,0.4-0.6,0.7L376,757.3
+	l-1.6,1.6c-35.9,35.9-94.1,35.9-130,0s-35.9-94.1,0-130l1.6-1.6l231-231c0.4-0.4,0.7-1,0.8-1.6c21.2-20.4,54.8-19.7,75.2,1.4
+	c19.8,20.6,19.8,53.2,0,73.7c-0.4,0.4-1,0.7-1.6,0.8L314.1,710.9c-5.9,5.3-14.9,4.9-20.4-0.8c-3.1-2.5-4.8-6.2-4.7-10.2
+	c0.1-3.7,1.5-7.3,3.9-10.2l206.6-206.6c9.2-9.8,8.7-25.2-1.1-34.4c-9.4-8.8-24-8.8-33.3,0L259.2,656.2v0.8
+	c-23.7,24.7-22.8,63.9,1.8,87.5c22.6,21.6,57.7,23.1,82,3.3c1.7-0.8,3.3-1.8,4.7-3.1l238-238c0.4-0.4,0.7-1,0.8-1.6h0.8
+	c39.6-39,40.1-102.8,1.1-142.4C588.2,362.6,587.8,362.2,587.4,361.9z"/>
+<path id="路径_798" class="st0" d="M933.6,913.3h-341c-17.1,0.5-31.4-13-31.9-30.1V736.6c0.5-17.1,14.8-30.6,31.9-30.1h340.5
+	c17.1-0.4,31.4,13,31.9,30.1v146.1c0.1,16.9-13.6,30.6-30.4,30.6C934.2,913.3,933.9,913.3,933.6,913.3z"/>
+<path id="路径_799" class="st1" d="M660.2,796.4c5.7,9.4,8.7,20.2,8.4,31.2c0.5,20.8-8.1,31.2-25.8,30.8v-18.6
+	c5.9,0,9.1-5,9.1-14.5c0.3-10.1-2.9-20.1-9.1-28.1c3.4-11.2,5.4-22.8,5.9-34.4H641v117.3h-20.8V745.6h48v17.7
+	C666.9,774.6,664.2,785.8,660.2,796.4z M665.6,795.9V781c10-10.2,16-23.7,16.9-37.9h24c-1.7,10.1-4.9,19.9-9.5,29v107.8h-22.2v-86.5
+	c-2.7,0.9-5.9,1.8-9.1,2.7L665.6,795.9z M717.3,795.9c3.8,11.2,6.4,22.7,7.7,34.4h-20.8c-1.1-11.7-3.4-23.2-6.8-34.4H717.3z
+	 M725.7,743.4h22.6v20.8h7.3v16.9h-7.3v75.2c0.9,15.4-6.3,22.6-20.8,21.8h-15V862h5.9c5,0.5,7.3-2.3,7.3-7.7v-73.4h-25.3v-16.3h25.3
+	V743.4z M781,879.8v-81.1c-3.6,1.3-7.7,2.3-12.2,3.6v-14.9c13.5-11.3,21.7-27.7,22.6-45.3h25.3c-2.2,11.3-5.9,22.2-10.9,32.6v105.1
+	L781,879.8z M910.1,816.5v18.1h-31.7v45.7h-26.3v-45.7h-40.8v-18.1h40.8v-35.3h-14.5c-6.1,10.7-16.2,18.7-28.1,22.2v-15
+	c9.1-11.2,13.4-25.5,12.2-39.8h23.1c0.1,5-0.5,10.1-1.8,14.9h9.1v-22.2h26.3v22.2h28.1v17.7h-28.1v35.3L910.1,816.5L910.1,816.5z"/>
+</svg>

src/assets/icons/svg/jieyue.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path id="借阅" class="st0" d="M794.2,870.5c0,34.1-27.7,61.8-61.8,61.8H287.3c-34.1-0.1-61.7-27.7-61.8-61.8V214.7h568.8V870.5z
+	 M349.1,103.9c-0.1-6.9,5.4-12.6,12.4-12.7c0.1,0,0.2,0,0.3,0h296.7c6.9-0.1,12.6,5.4,12.7,12.4c0,0.1,0,0.2,0,0.3v36.5H349
+	L349.1,103.9z M979.7,140.4H745.1v-36.5c0-47.7-38.6-86.3-86.3-86.3l0,0H362.1c-47.6,0.2-86.1,38.7-86.3,86.3v36.5H40.2
+	C19.7,142.8,5,161.3,7.4,181.8c2,17.2,15.6,30.8,32.8,32.8h111v655.6c0,75.2,61,136.2,136.2,136.2l0,0h445.1
+	c75.2,0,136.2-61,136.2-136.2l0,0V214.7h111c20.5,0,37.2-16.6,37.2-37.2l0,0c0.4-20.2-15.7-36.8-35.8-37.2
+	C980.6,140.3,980.2,140.3,979.7,140.4L979.7,140.4z M509.9,820.7c20.5,0,37.2-16.6,37.2-37.2c0-0.1,0-0.1,0-0.2V387.7
+	c-1.4-20.5-19.1-36-39.6-34.6c-18.6,1.2-33.4,16-34.6,34.6v395.7C472.8,803.9,489.3,820.6,509.9,820.7c0.1,0,0.1,0,0.2,0
+	 M336.5,820.7c20.6,0,37.3-16.7,37.3-37.3V387.7c2.4-20.5-12.3-39-32.8-41.4c-20.5-2.4-39,12.3-41.4,32.8c-0.3,2.9-0.3,5.7,0,8.6
+	v395.7c0.5,20.3,16.8,36.7,37.2,37.3 M683.9,820.7c20.6-0.1,37.2-16.8,37.2-37.3V387.7c2.4-20.5-12.3-39-32.8-41.4
+	c-20.5-2.4-39,12.3-41.4,32.8c-0.3,2.9-0.3,5.7,0,8.6v395.7c0,20.6,16.7,37.3,37.3,37.3"/>
+</svg>

src/assets/icons/svg/ruku.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="入库">
+	<path class="st0" d="M846.9,1018.2H177c-79,0-143.3-64.3-143.3-143.3V205C33.7,126,98,61.7,177,61.7h111.7
+		c17.5,0,31.6,14.2,31.6,31.6s-14.2,31.6-31.6,31.6H177c-44.1,0-80,35.9-80,80v359.1h112.7c23.4,0,45.4,9.1,61.9,25.6L406,724.2
+		c4.6,4.6,10.7,7.1,17.2,7.1h177.1c6.5,0,12.6-2.5,17.1-7.1l134.5-134.5c16.1-16.2,38.8-25.6,61.9-25.6H927V205
+		c0-44.1-35.9-80-80-80H735.3c-17.5,0-31.7-14.2-31.7-31.6s14.2-31.6,31.7-31.6h111.7c79,0,143.3,64.3,143.3,143.3v669.9
+		C990.3,953.8,926,1018.2,846.9,1018.2z M97,627.4v247.5c0,44.1,36,79.9,80,79.9h669.9c44.1,0,80-35.9,80-80V627.4H813.8
+		c-6.4,0-12.7,2.5-17.1,7L662.2,768.9c-16.5,16.5-38.5,25.6-61.9,25.6H423.2c-23.4,0-45.4-9.1-61.9-25.6L226.9,634.5
+		c-4.6-4.6-10.7-7.1-17.2-7.1H97z M511.9,515.7c-0.6,0-1.2,0-1.7,0l0,0c0,0,0,0-0.1,0c-3.4-0.2-6.7-0.9-9.8-2.2
+		c-3.9-1.5-7.6-3.9-10.7-7.1L322.1,338.9c-12.4-12.4-12.4-32.4,0-44.7c12.4-12.4,32.4-12.4,44.7,0l113.5,113.5V37.5
+		c0-17.5,14.2-31.6,31.6-31.6c17.5,0,31.6,14.2,31.6,31.6v370.2L657,294.2c12.4-12.4,32.4-12.4,44.8,0c12.4,12.4,12.4,32.4,0,44.7
+		L534.4,506.3c-0.1,0-0.1,0.1-0.2,0.1c-3.2,3.2-7,5.6-10.9,7.1h0c0,0,0,0,0,0c-3,1.1-6.1,1.9-9.5,2l0,0
+		C513,515.3,512.6,515.7,511.9,515.7z"/>
+</g>
+</svg>

src/assets/icons/svg/zhuanghe.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="装盒" transform="translate(-4 -3)">
+	<path id="矩形_301" class="st0" d="M84.3,242.3h862.6c33.2-0.8,60.8,25.6,61.6,58.8v659.3c-0.8,33.2-28.3,59.6-61.6,58.8H84.3
+		c-33.2,0.8-60.8-25.6-61.6-58.8V301.1C23.5,267.8,51.1,241.5,84.3,242.3z M946.9,960.4V301.1H84.3v659.3H946.9z"/>
+	<path id="路径_622" class="st0" d="M702.7,668.4H328.8c-20.6,0-37.3-16.7-37.3-37.3s16.7-37.3,37.3-37.3h373.9
+		c20.6,0,37.3,16.7,37.3,37.3S723.3,668.4,702.7,668.4z"/>
+	<path id="路径_622-2" class="st0" d="M478.1,817.6V443.7c0-20.6,16.7-37.3,37.3-37.3s37.3,16.7,37.3,37.3v373.9
+		c0,20.6-16.7,37.3-37.3,37.3S478.1,838.2,478.1,817.6z"/>
+	<path id="路径_623" class="st0" d="M979.1,334.7c-9.3-0.2-18-5-23.2-12.8L785,85.4H246.4L75.3,321.7
+		c-8.1,12.8-24.9,16.6-37.7,8.5c-2.2-1.4-4.1-3-5.9-5c-12.9-14.8-14.1-36.5-2.9-52.6l180.3-249c5.2-7.8,13.9-12.5,23.3-12.8h566.6
+		c9.3,0.3,18,5,23.2,12.8l180.3,249.3c11.2,16.1,9.9,37.8-2.9,52.6C994.4,331.3,986.9,334.6,979.1,334.7z"/>
+</g>
+</svg>

src/assets/styles/archives-manage.scss

@@ -305,7 +305,7 @@ $arcCyan: #0FBED9;
 
 // 档案详情
 .base-info{
-  padding-top: 20px;
+  padding: 20px 20px 0 60px;
   color: #fff;
   .base-info-item{
     display: flex;

src/assets/styles/yxk-admin.scss

@@ -880,6 +880,11 @@
     }
   }
 }
+.preview-dialog{
+  .el-dialog__body{
+    padding: 30px 0 !important;
+  }
+}
 // 去除element ui 中el-input type=“number“的上下箭头
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {

src/utils/index.js

@@ -377,7 +377,6 @@ export function regMobile(mobile) {
 // 下载文件
 export function downloadFile(obj, name, suffix) {
   const url = window.URL.createObjectURL(new Blob([obj]))
-  console.log(url)
   const link = document.createElement('a')
   link.style.display = 'none'
   link.href = url
@@ -388,9 +387,8 @@ export function downloadFile(obj, name, suffix) {
   document.body.removeChild(link)
 }
 
-// new - 导出 - TEST
-export function exportFile(StingParams, fileName) {
-  const url = StingParams
+// new - 导出
+export function exportFile(url, fileName) {
   const link = document.createElement('a')
   link.style.display = 'none'
   link.href = url

src/views/archivesManage/archivesList/index.vue

@@ -236,34 +236,46 @@ export default {
     },
     getAjInProjectBtnState(data) {
       this.isProject = data
-      console.log('isProject', data)
     },
-    getProjectSelections(data) {
-      this.projectSelection = data
-      this.$nextTick(() => {
-        this.$refs.anjuan.getTableList()
-      })
+    getProjectSelections(data, selectData) {
+      if ((selectData && selectData.length > 1) || (selectData && selectData.length === 0)) {
+        this.projectSelection = {}
+        this.$nextTick(() => {
+          if (this.$refs.anjuan) {
+            this.$refs.anjuan.anjuanData = []
+          }
+        })
+      } else if (selectData && selectData.length === 1) {
+        this.projectSelection = selectData[0]
+        this.$nextTick(() => {
+          if (this.$refs.anjuan) {
+            this.$refs.anjuan.getTableList()
+          }
+        })
+      } else {
+        this.projectSelection = data
+        this.$nextTick(() => {
+          if (this.$refs.anjuan) {
+            this.$refs.anjuan.getTableList()
+          }
+        })
+      }
     },
     getSelections(data, selectData) {
-      if (selectData) {
-        if (selectData.length > 1 || selectData.length === 0) {
-          this.anjuanSelection = {}
-          this.$refs.file.junneiData = []
-        } else if (selectData.length === 1) {
-          this.anjuanSelection = selectData[0]
-          this.$nextTick(() => {
-            if (this.$refs.file) {
-              this.$refs.file.getTableList()
-            }
-          })
-        } else {
-          this.anjuanSelection = data
-          this.$nextTick(() => {
-            if (this.$refs.file) {
-              this.$refs.file.getTableList()
-            }
-          })
-        }
+      if ((selectData && selectData.length > 1) || (selectData && selectData.length === 0)) {
+        this.anjuanSelection = {}
+        this.$nextTick(() => {
+          if (this.$refs.file) {
+            this.$refs.file.junneiData = []
+          }
+        })
+      } else if (selectData && selectData.length === 1) {
+        this.anjuanSelection = selectData[0]
+        this.$nextTick(() => {
+          if (this.$refs.file) {
+            this.$refs.file.getTableList()
+          }
+        })
       } else {
         this.anjuanSelection = data
         this.$nextTick(() => {
@@ -282,7 +294,7 @@ export default {
   }
 }
 </script>
- m
+
 <style lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
 </style>

src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue

@@ -10,7 +10,7 @@
         <!-- 删除btn 多选 -->
         <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="selections.length === 0" @click="toDelete(selections)">删除</el-button>
         <!-- 导出btn  :disabled="!crud.data.length"  -->
-        <el-button v-permission="permission.download" :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="doExport">导出</el-button>
+        <el-button v-permission="permission.download" :disabled="isProject && selectedCategory.isType === 2" :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="doExport">导出</el-button>
         <!-- 上传附件btn 针对卷内/文件 单选 -->
         <el-button v-if="selectedCategory.isType===5" :disabled="selections.length !== 1" size="mini" icon="el-icon-download" @click="uploadFile">上传附件</el-button>
       </div>
@@ -54,7 +54,7 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <!-- form -->
-        <PreviewForm v-if="formPreviewData.length && archivesTabIndex == 0" ref="previewForm" :is-disabled="false" :form-preview-data.sync="formPreviewData" :selected-category="selectedCategory" :parents-id="parentsId" :arc-id="arcId" @emitTableList="getTableList" />
+        <PreviewForm v-if="formPreviewData.length && archivesTabIndex == 0" ref="previewForm" :is-has-code="false" :is-disabled="false" :form-preview-data.sync="formPreviewData" :selected-category="selectedCategory" :parents-id="parentsId" :arc-id="arcId" @emitTableList="getTableList" />
         <div slot="footer" class="dialog-footer">
           <!-- :loading="crud.status.cu === 2"  -->
           <el-button type="primary" @click="handlerArchivesSubmit">保存</el-button>
@@ -153,7 +153,17 @@
     </el-card>
 
     <!-- 档案详情 -->
-    <ArchivesInfo ref="archivesInfo" :archives-details-data="archivesDetailsData" :archives-details-metadata.sync="archivesDetailsMetadata" />
+    <ArchivesInfo ref="archivesInfo" :archives-details-data="archivesDetailsData" :archives-details-metadata.sync="archivesDetailsMetadata" :category-id="categoryId" :arc-id="arcId" />
+
+    <!-- 上传附件 -->
+    <el-dialog class="upload-dialog" :modal-append-to-body="false" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="uploadFileVisible" title="上传附件">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <UploadFile ref="uploadFile" :category-id="categoryId" :arc-id="arcId" />
+      </div>
+    </el-dialog>
+
     <!-- 装盒 -->
     <Packing ref="packing" />
     <!-- 装盒 -->
@@ -182,19 +192,16 @@ import { del, FetchTableDisplayFields, FetchInitArchivesView, FetchFormDisplayFi
 import { header, form } from '@crud/crud'
 import { mapGetters } from 'vuex'
 import { exportFile } from '@/utils/index'
-// import { initData } from '@/api/data'
-// import crudOperation from '@crud/CRUD.operation'
-// import rrOperation from '@crud/RR.operation'
-// import pagination from '@crud/Pagination'
 import PreviewForm from '@/views/components/category/PreviewForm'
 import ArchivesInfo from '../archivesInfo/index'
 import Packing from '../packing/index'
 import PartPacking from '../partPacking/index'
 import Binding from '../binding/index'
+import UploadFile from '../uploadFile/index'
 
 export default {
   name: 'ArchivesAnjuan',
-  components: { PreviewForm, ArchivesInfo, Packing, Binding, PartPacking },
+  components: { PreviewForm, ArchivesInfo, Packing, Binding, PartPacking, UploadFile },
   mixins: [
     header(),
     form({})
@@ -245,8 +252,7 @@ export default {
       ],
       queryOption: [
         { value: 'maintitle', label: '题名' },
-        { value: 'archive_no', label: '档号' },
-        { value: 'archive_year', label: '年度' }
+        { value: 'archive_no', label: '档号' }
       ],
       inputSelect: '',
       permission: {
@@ -259,6 +265,7 @@ export default {
       deleteData: {}, // 删除选中data
       selections: [], // table已选择的
       archivesTabIndex: 0, // 新增
+      categoryId: null,
       arcId: null, // 档案ID
       arrySort: [], // 多项sort-query
       uploadFileVisible: false, // 上传附件
@@ -300,7 +307,6 @@ export default {
   methods: {
     doExport(fileName = '未知文件') {
       this.crud.downloadLoading = true
-      console.log(this.selectedCategory)
       if (this.selectedCategory.pid !== '0') {
         this.parentsId = this.selectedCategory.pid
       } else {
@@ -310,7 +316,6 @@ export default {
         'categoryId': this.selectedCategory.id,
         'parentsId': this.parentsId
       }
-      console.log(params)
       exportFile(this.baseApi + '/api/archives/exportArchives?' + qs.stringify(params))
       this.crud.downloadLoading = false
     },
@@ -406,6 +411,12 @@ export default {
     },
     // table - 双击查看详情
     tableDoubleClick(row) {
+      if (this.selectedCategory.isType !== 5) {
+        this.$refs.archivesInfo.isHasFile = false
+      } else {
+        this.$refs.archivesInfo.isHasFile = true
+      }
+      this.$refs.archivesInfo.detailTitle = '档案详情'
       this.$refs.archivesInfo.archivesInfoVisible = true
       this.$refs.archivesInfo.archivesTabIndex = 0
       const params = {
@@ -415,10 +426,10 @@ export default {
       FetchArchivesDetails(params).then(data => {
         this.archivesDetailsData = data
       })
-
       FetchArchivesMetadata(params).then(data => {
         this.archivesDetailsMetadata = data
       })
+      this.arcId = row.id
     },
     // table - 当前选中得row
     clickRowHandler(row) {
@@ -495,9 +506,11 @@ export default {
     // 上传附件
     uploadFile() {
       this.uploadFileVisible = true
-    },
-    uploadFileSave() {
-      this.uploadFileVisible = false
+      this.arcId = this.selections[0].id
+      this.$nextTick(() => {
+        this.$refs.uploadFile.tableData = []
+        this.$refs.uploadFile.getFileList()
+      })
     },
     // 绑定
     handleBinding(data) {
@@ -524,8 +537,9 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
+
 ::v-deep .el-table th.el-table__cell > .cell {
   white-space: pre;
-  // white-space: pre-wrap; // 也行。
+  // white-space: pre-wrap;
 }
 </style>

src/views/archivesManage/archivesList/module/archivesInfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="upload-dialog" title="档案详情" :close-on-click-modal="false" :visible.sync="archivesInfoVisible" :before-close="handleClose">
+  <el-dialog class="upload-dialog" :title="detailTitle" :close-on-click-modal="false" :visible.sync="archivesInfoVisible" :before-close="handleClose">
     <span class="dialog-right-top" />
     <span class="dialog-left-bottom" />
     <div class="setting-dialog">
@@ -7,20 +7,26 @@
         <!-- tab -->
         <ul class="archives-tab">
           <li :class="{'active': archivesTabIndex == 0}" @click="changeActiveTab(0)">基本信息</li>
-          <li :class="{'active': archivesTabIndex == 1}" @click="changeActiveTab(1)">附件</li>
+          <li v-if="isHasFile" :class="{'active': archivesTabIndex == 1}" @click="changeActiveTab(1)">附件</li>
           <li :class="{'active': archivesTabIndex == 2}" @click="changeActiveTab(2)">元数据</li>
         </ul>
         <!-- 基本信息 -->
         <div v-if="archivesTabIndex==0" class="base-info item-content">
           <el-row>
-            <el-col v-for="(item,index) in archivesDetailsData" :key="index" :span="item.isLine? 24 : 12" class="base-info-item">
+            <el-col v-for="(item,index) in archivesDetailsData" v-show="index<archivesDetailsData.length-5" :key="index" :span="item.isLine ? 24 : 12" class="base-info-item">
+              <span>{{ item.fieldCnName }}：</span>
+              <p :style="{ width: item.editLength+'px'}">{{ item.context }}</p>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col v-for="(item,index) in archivesDetailsData.slice(archivesDetailsData.length-5,archivesDetailsData.length)" :key="'last'+index" :span=" 12" class="base-info-item">
               <span>{{ item.fieldCnName }}：</span>
               <p :style="{ width: item.editLength+'px'}">{{ item.context }}</p>
             </el-col>
           </el-row>
         </div>
         <!-- 附件 -->
-        <UploadFile v-if="archivesTabIndex==1 " class="item-content" :is-upload-detail="false" />
+        <UploadFile v-if="archivesTabIndex==1" ref="uploadFile" class="item-content" :is-upload-detail="false" :category-id="categoryId" :arc-id="arcId" />
         <!-- 元数据 -->
         <div v-if="archivesTabIndex==2" class="item-content">
           <pre v-highlightjs="xml_show">
@@ -65,10 +71,24 @@ export default {
       default: function() {
         return {}
       }
+    },
+    categoryId: {
+      type: String,
+      default: function() {
+        return ''
+      }
+    },
+    arcId: {
+      type: String,
+      default: function() {
+        return ''
+      }
     }
   },
   data() {
     return {
+      detailTitle: '',
+      isHasFile: false,
       archivesInfoVisible: false,
       archivesTabIndex: 0,
       xml_show: null
@@ -98,20 +118,18 @@ export default {
       if (this.archivesTabIndex === 2) {
         this.setXml()
       }
+      this.$nextTick(() => {
+        if (this.$refs.uploadFile) {
+          this.$refs.uploadFile.tableData = []
+          this.$refs.uploadFile.getFileList()
+        }
+      })
     },
     // 删除 - 关闭
     handleClose(done) {
       this.archivesInfoVisible = false
       done()
     },
-    getPrefix(prefixIndex) {
-      var span = '    '
-      var output = []
-      for (var i = 0; i < prefixIndex; ++i) {
-        output.push(span)
-      }
-      return output.join('')
-    },
     // xml格式化
     showXml(str) {
       var that = this
@@ -181,6 +199,14 @@ export default {
         })
       outputText = outputText.replace(/\s+$/g, '').replace(/\r/g, '\r\n')
       return outputText
+    },
+    getPrefix(prefixIndex) {
+      var span = '    '
+      var output = []
+      for (var i = 0; i < prefixIndex; ++i) {
+        output.push(span)
+      }
+      return output.join('')
     }
   }
 }

src/views/archivesManage/archivesList/module/archivesJuannei/index.vue

@@ -10,7 +10,7 @@
         <!-- 删除btn 多选 -->
         <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="selections.length === 0" @click="toDelete(selections)">删除</el-button>
         <!-- 导出btn  :disabled="!crud.data.length"  -->
-        <el-button v-permission="permission.download" :disabled="isAnjuan" :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="doExport">导出</el-button>
+        <el-button v-permission="permission.download" :disabled="isAnjuan && selectedCategory.isType !== 4" :loading="crud.downloadLoading" size="mini" icon="el-icon-download" @click="doExport">导出</el-button>
         <!-- 上传附件btn 针对卷内/文件 单选 -->
         <el-button :disabled="selections.length !== 1" size="mini" icon="el-icon-download" @click="uploadFile">上传附件</el-button>
       </div>
@@ -36,7 +36,7 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <!-- form -->
-        <PreviewForm v-if="formPreviewData.length && archivesTabIndex == 0" ref="previewForm" :is-disabled="false" :form-preview-data.sync="formPreviewData" :selected-category="selectedCategory" :parents-id="parentsId" :arc-id="arcId" @emitTableList="getTableList" />
+        <PreviewForm v-if="formPreviewData.length && archivesTabIndex == 0" ref="previewForm" :is-has-code="false" :is-disabled="false" :form-preview-data.sync="formPreviewData" :selected-category="selectedCategory" :parents-id="parentsId" :arc-id="arcId" @emitTableList="getTableList" />
         <div slot="footer" class="dialog-footer">
           <!-- :loading="crud.status.cu === 2"  -->
           <el-button type="primary" @click="handlerArchivesSubmit">保存</el-button>
@@ -122,7 +122,7 @@
     </el-card>
 
     <!-- 档案详情 -->
-    <ArchivesInfo ref="archivesInfo" :is-has-file="true" :archives-details-data="archivesDetailsData" :archives-details-metadata.sync="archivesDetailsMetadata" />
+    <ArchivesInfo ref="archivesInfo" :is-has-file="true" :archives-details-data="archivesDetailsData" :archives-details-metadata.sync="archivesDetailsMetadata" :category-id="categoryId" :arc-id="arcId" />
 
     <!-- 上传附件 -->
     <el-dialog class="upload-dialog" :modal-append-to-body="false" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="uploadFileVisible" title="上传附件">
@@ -202,8 +202,7 @@ export default {
       ],
       queryOption: [
         { value: 'maintitle', label: '题名' },
-        { value: 'archive_no', label: '档号' },
-        { value: 'archive_year', label: '年度' }
+        { value: 'archive_no', label: '档号' }
       ],
       inputSelect: '',
       permission: {
@@ -368,10 +367,11 @@ export default {
     },
     // table - 双击查看详情
     tableDoubleClick(row) {
+      this.$refs.archivesInfo.isHasFile = true
+      this.$refs.archivesInfo.detailTitle = '档案详情'
       this.$refs.archivesInfo.archivesInfoVisible = true
       this.$refs.archivesInfo.archivesTabIndex = 0
       this.doubleCurrentRow = row
-      console.log(this.selectedCategory)
       const params = {
         categoryId: this.categoryId,
         archivesId: row.id
@@ -383,6 +383,7 @@ export default {
       FetchArchivesMetadata(params).then(data => {
         this.archivesDetailsMetadata = data
       })
+      this.arcId = row.id
     },
     // table - 当前选中得row
     clickRowHandler(row) {
@@ -444,6 +445,7 @@ export default {
       this.uploadFileVisible = true
       this.arcId = this.selections[0].id
       this.$nextTick(() => {
+        this.$refs.uploadFile.tableData = []
         this.$refs.uploadFile.getFileList()
       })
     }

src/views/archivesManage/archivesList/module/archivesProject/index.vue

@@ -32,7 +32,7 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <!-- form -->
-        <PreviewForm v-if="formPreviewData.length && archivesTabIndex == 0" ref="previewForm" :is-disabled="false" :form-preview-data.sync="formPreviewData" :selected-category="selectedCategory" :parents-id="parentsId" :arc-id="arcId" @emitTableList="getTableList" />
+        <PreviewForm v-if="formPreviewData.length && archivesTabIndex == 0" ref="previewForm" :is-has-code="true" :is-disabled="false" :form-preview-data.sync="formPreviewData" :selected-category="selectedCategory" :parents-id="parentsId" :arc-id="arcId" @emitTableList="getTableList" />
         <div slot="footer" class="dialog-footer">
           <!-- :loading="crud.status.cu === 2"  -->
           <el-button type="primary" @click="handlerArchivesSubmit">保存</el-button>
@@ -158,8 +158,7 @@ export default {
       ],
       queryOption: [
         { value: 'maintitle', label: '题名' },
-        { value: 'archive_no', label: '档号' },
-        { value: 'archive_year', label: '年度' }
+        { value: 'archive_no', label: '档号' }
       ],
       inputSelect: '',
       permission: {
@@ -283,10 +282,13 @@ export default {
     },
     // table - 双击查看详情
     tableDoubleClick(row) {
+      console.log('无附件-project')
+      this.$refs.archivesInfo.detailTitle = '项目详情'
+      this.$refs.archivesInfo.isHasFile = false
       this.$refs.archivesInfo.archivesInfoVisible = true
       this.$refs.archivesInfo.archivesTabIndex = 0
       const params = {
-        categoryId: this.categoryId,
+        categoryId: this.selectedCategory.id,
         archivesId: row.id
       }
       FetchArchivesDetails(params).then(data => {
@@ -299,15 +301,20 @@ export default {
     },
     // table - 当前选中得row
     clickRowHandler(row) {
-      this.$emit('getProjectSelections', row)
+      this.$refs.table.clearSelection()
+      this.$refs.table.toggleRowSelection(row)
+      this.selections = this.crud.selections
+      this.isProject = this.crud.selections.length !== 1
+      this.$emit('getAjInProjectBtnState', this.isProject)
+      this.$emit('getProjectSelections', row, null)
     },
     // 触发单选
     handleCurrentChange(selection, row) {
-      // this.$refs.table.toggleRowSelection(row)
       this.selections = selection
       // 判断项目内案卷-新增btn-状态
       this.isProject = selection.length !== 1
       this.$emit('getAjInProjectBtnState', this.isProject)
+      this.$emit('getProjectSelections', row, selection)
     },
     // 选择删除
     toDelete(data) {

src/views/archivesManage/archivesList/module/uploadFile/index.vue

@@ -2,15 +2,6 @@
   <div class="upload-file">
     <!-- 上传附件curd -->
     <div v-if="isUploadDetail" class="upload-curd">
-      <!-- <el-button icon="el-icon-plus">新增</el-button> -->
-      <!-- <el-upload
-        class="upload-demo"
-        action="#"
-        :on-preview="handlePreview"
-        :file-list="fileList"
-      >
-        <el-button icon="el-icon-plus" size="small" type="primary">新增</el-button>
-      </el-upload> -->
       <div class="upload-btn">
         <el-button icon="el-icon-plus" size="small" type="primary">添加</el-button>
         <input id="upFile" type="file" name="upFile" @change="changeFile($event)">
@@ -32,18 +23,24 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column prop="file_name" label="文件名称" min-width="140" align="center" />
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
-      <el-table-column prop="file_size" label="大小" min-width="85" align="center" />
+      <el-table-column prop="file_size" label="大小" min-width="85" align="center">
+        <template slot-scope="scope">
+          {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+        </template>
+      </el-table-column>
       <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center" />
       <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.file_thumbnail">
-            <img width="60px" height="32px" class="screenshot" :src="scope.row.file_thumbnail" @click="showCoverVisible=true">
+          <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
+            <img width="60px" height="32px" class="screenshot" :src="baseApi+ '/downloadFile' +scope.row.file_path" :onerror="defaultImg" @click="showCoverPreview(scope.row)">
+          </div>
+          <div v-else>
+            <svg-icon icon-class="fujian" class-name="svg-style" />
           </div>
         </template>
       </el-table-column>
       <el-table-column prop="create_time" label="创建时间" min-width="100" align="center" />
-      <!-- v-if="!isUploadDetail" -->
-      <el-table-column label="操作" min-width="100" align="center">
+      <el-table-column v-if="!isUploadDetail" label="操作" min-width="100" align="center">
         <template slot-scope="scope">
           <el-button class="file-down iconfont icon-weibiaoti-2" @click="downloadFile(scope.row)">下载</el-button>
         </template>
@@ -55,7 +52,7 @@
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog" style="max-height:calc(100vh - 230px); overflow:auto;">
-        <img style="width:100%; height:100%;" src="https://qiniu.aiyxlib.com/yuekan-5-h5bg.jpg">
+        <img style="max-width:100%; object-fit: contain;" :src="previewSrc" :onerror="defaultImg">
       </div>
     </el-dialog>
 
@@ -65,9 +62,9 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <i class="drag-tip">提示：请通过拖动鼠标来调整当前顺序</i>
-        <el-table :data="sortTableData" class="file-sort" style="width: 100%;max-height: 70vh;" row-key="id">
+        <el-table :data="tableData" class="file-sort" style="width: 100%;max-height: 70vh;" row-key="id">
           <el-table-column type="index" label="序号" width="100" align="center" />
-          <el-table-column prop="cnName" label="文件名称" />
+          <el-table-column prop="file_name" label="文件名称" />
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click.native="handleSort">保存</el-button>
@@ -92,13 +89,12 @@
 </template>
 
 <script>
-import { FetchInitArchiveFilesView, FetchEditFile, FetchDeleteFile } from '@/api/archivesManage/archivesList'
+import { FetchInitArchiveFilesView, FetchEditFile, FetchDeleteFile, FetchFileSort } from '@/api/archivesManage/archivesList'
 import { archivesUpload } from '@/utils/upload'
-import { getCurrentTime } from '@/utils/index'
+import { downloadFile, getCurrentTime } from '@/utils/index'
 import { mapGetters } from 'vuex'
 import { form } from '@crud/crud'
 import Sortable from 'sortablejs'
-// import data from '../data.json'
 export default {
   name: 'UploadFile',
   components: {},
@@ -125,22 +121,22 @@ export default {
   },
   data() {
     return {
+      defaultImg: 'this.src="' + require('@/assets/images/cover-bg.png') + '"',
       tableData: [], // 附件list
-      selections: [],
+      selections: [], // table - 选中的
       showCoverVisible: false, // 查看大图dialog
       sortVisible: false, // 排序dialog
-      sortTableData: [], // 排序table
       deleteVisible: false, // 删除附件 dialog
       deleteData: [], // 删除选中的data
       file: null, // 附件 change
       fileNames: '', // 附件 - name
       formatType: '', // 附件 - type
       postfix: '', // 附件 - 文件后缀
-      fileSize: '',
-      filePath: '',
-      px: '',
-      fileBase64: '',
-      nowDate: ''
+      fileSize: '', // 附件 - 大小
+      filePath: '', // 附件 - path
+      px: '', // 附件 - 分辨率
+      nowDate: '', // 当前时间
+      previewSrc: '' // 查看大图src
     }
   },
   computed: {
@@ -153,6 +149,7 @@ export default {
     }
   },
   methods: {
+    // 选择附件
     async changeFile(e) {
       this.file = e.target.files[0]
       this.fileSize = this.file.size
@@ -162,25 +159,22 @@ export default {
         this.fileNames.lastIndexOf('.') + 1,
         this.fileNames.length
       )
-      console.log(this.postfix)
-      // this.fileSize = (this.file.size / 1024).toFixed(2) + 'kB'
-
       if (this.formatType === 'image') {
-        this.fileBase64 = await this.getBase64(this.file)
-        const res = await this.getImgPx(this.fileBase64)
+        const fileBase64 = await this.getBase64(this.file)
+        const res = await this.getImgPx(fileBase64)
         this.px = res.width + 'px*' + res.height + 'px'
       } else {
         this.px = ''
       }
       // 上传附件
       archivesUpload(this.baseApi + '/api/archives/uploadFile', this.file, this.categoryId).then(res => {
-        console.log(res.data)
         if (res.data.code === 200) {
           this.filePath = res.data.data
           this.uploadSave()
         }
       })
     },
+    // 上传附件 - 选择上传即保存
     uploadSave() {
       this.nowDate = getCurrentTime()
       const json = {
@@ -195,7 +189,6 @@ export default {
         'create_time': this.nowDate,
         'id': null
       }
-      console.log(json)
       const arrayUpload = []
       arrayUpload.push(json)
       const params = {
@@ -212,7 +205,6 @@ export default {
         this.getFileList()
       })
     },
-
     // 将上传的图片转为base64
     getBase64(file) {
       const reader = new FileReader()
@@ -245,17 +237,14 @@ export default {
         this.tableData = data.returnlist
       })
     },
+    // 下载附件
     downloadFile(row) {
-      console.log(row.file_path)
       const url = this.baseApi + '/downloadFile' + row.file_path
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = url
-      link.setAttribute('target', '_blank')
-      link.setAttribute('download', 'testFile')
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link)
+      fetch(url).then(res => res.blob()).then(blob => {
+        downloadFile(blob, row.file_name.split('.')[0], row.file_type)
+      }).catch(() => {
+        alert('下载文件失败')
+      })
     },
     // 选择删除
     toDelete(data) {
@@ -301,20 +290,29 @@ export default {
     },
     // 排序
     opened() {
-      this.rowDrop('file-sort', 'sortTableData')
+      this.rowDrop('file-sort', 'tableData')
     },
-    // 排序 - data
+    // 排序 - 保存
     handleSort() {
-      // const data = this.sortTableData.map((value, index) => {
-      //   return { id: value.id, sort: index + 1 }
-      // })
-      // this.sortTableData.forEach((item, index) => {
-      //   item.categorySeq = index + 1
-      // })
-      // sort(data).then(() => {
-      //   this.sortVisible = false
-      //   this.$emit('treeNodeSort', this.sortTableData)
-      // })
+      const ids = []
+      const sequences = []
+      this.tableData.map((value, index) => {
+        ids.push(value.id)
+        sequences.push(index + 1)
+      })
+      const params = {
+        'categoryId': this.categoryId,
+        'ids': ids,
+        'sequences': sequences
+      }
+      FetchFileSort(params).then((res) => {
+        this.sortVisible = false
+        this.$notify({
+          title: '附件排序成功',
+          type: 'success',
+          duration: 2500
+        })
+      })
     },
     // table
     clickRowHandler(row) {
@@ -328,6 +326,11 @@ export default {
     handleClose(done) {
       this.showCoverVisible = false
       done()
+    },
+    // 查看大图
+    showCoverPreview(row) {
+      this.showCoverVisible = true
+      this.previewSrc = this.baseApi + '/downloadFile' + row.file_path
     }
   }
 }
@@ -335,5 +338,9 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
+.svg-style{
+  width: 60px;
+  height: 32px;
+}
 
 </style>

src/views/components/category/PreviewForm.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="preview-content right-preview">
-    <el-row :gutter="4">
-      <el-form ref="addOrUpdateForm" :model="addOrUpdateForm" :rules="rules" :validate-on-rule-change="false" label-width="120px">
-        <draggable v-bind="{draggable:'.drag-item',animation:500}" :disabled="!isDisabled" @update="datadragEnd">
-          <el-col v-for="(item,index) in formPreviewData" :key="index" :class="['drag-item',item.fieldName === 'barcode'? 'barcode-input':'']" :span="item.isLine || item.fieldName === 'barcode' ? 24 : 12">
+    <el-form ref="addOrUpdateForm" :model="addOrUpdateForm" :rules="rules" :validate-on-rule-change="false" label-width="120px">
+      <draggable v-bind="{draggable:'.drag-item',animation:500}" :disabled="!isDisabled" @update="datadragEnd">
+        <el-row :gutter="4" style="padding:0 20px">
+          <el-col v-for="(item,index) in formPreviewData" v-show="item.fieldName !== 'barcode'" :key="index" :class="['drag-item',item.fieldName === 'barcode'? 'barcode-input':'']" :span="item.isLine || item.fieldName === 'barcode' ? 24 : 12">
             <el-form-item :label="item.fieldCnName" :prop="item.fieldName">
               <!-- select  :load-options="loadOptions"-->
               <treeselect
@@ -12,7 +12,7 @@
                 :options="item.options"
                 :normalizer="normalizer"
                 placeholder=""
-                :style="{ width: item.editLength+14+'px'}"
+                :style="{ width: item.editLength+'px'}"
                 :disabled="isDisabled"
                 :validate-event="!isDisabled"
                 no-options-text="无数据"
@@ -35,17 +35,6 @@
               >
                 <i v-if="item.isInputClass === 'popover'" slot="suffix" class="el-input__icon iconfont icon-weibiaoti-2" @click="handleCurrentFieldName(item)" />
               </el-input>
-              <div v-if="item.fieldName === 'barcode' " class="last-barcode">
-                <el-input
-                  v-model="addOrUpdateForm[item.fieldName]"
-                  type="text"
-                  style="width: 510px"
-                  :disabled="isDisabled"
-                  :validate-event="!isDisabled"
-                  @keyup.enter.native="isRepeatHandle(item)"
-                  @blur="isRepeatHandle(item)"
-                />
-              </div>
               <!-- date -->
               <el-date-picker
                 v-if="item.isInputClass === 'date'"
@@ -61,9 +50,24 @@
               />
             </el-form-item>
           </el-col>
-        </draggable>
-      </el-form>
-    </el-row>
+        </el-row>
+        <el-row v-if="!isHasCode" style="border-top: 1px solid #339cff; padding: 20px 20px 0 20px;">
+          <el-col v-for="(item,index) in formPreviewData.slice(formPreviewData.length-1,formPreviewData.length)" :key="'barcode'+index">
+            <el-form-item :label="item.fieldCnName" :prop="item.fieldName">
+              <el-input
+                v-model="addOrUpdateForm[item.fieldName]"
+                type="text"
+                style="width: 510px"
+                :disabled="isDisabled"
+                :validate-event="!isDisabled"
+                @keyup.enter.native="isRepeatHandle(item)"
+                @blur="isRepeatHandle(item)"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </draggable>
+    </el-form>
 
     <!-- 弹框形式的内容展示 -->
     <el-dialog class="edit-form-dialog" :append-to-body="true" :visible="popoverVisible" :before-close="handleClose" :close-on-click-modal="false" title="字典列表">
@@ -82,7 +86,6 @@
 </template>
 
 <script>
-// import formPreviewData from './data.json'
 import { form } from '@crud/crud'
 import { edit, FetchDoeditIsRepeat } from '@/api/archivesManage/archivesList'
 import draggable from 'vuedraggable'
@@ -118,6 +121,10 @@ export default {
     parentsId: {
       type: String,
       default: ''
+    },
+    isHasCode: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
@@ -152,7 +159,6 @@ export default {
     }
   },
   mounted() {
-    // this.getAllSubset()
     this.editFormRow()
   },
   methods: {
@@ -327,15 +333,21 @@ export default {
 </script>
 <style lang="scss" scoped>
 .preview-content {
-  width: 640px !important;
+  // width: 640px !important;
   // height: calc(100vh - 312px);
   padding: 20px 0 0 0 !important;
   margin-top: 0 !important;
   border-radius: 4px;
   border: 1px solid #3a99fd;
   margin: 0 auto;
+
   .el-row{
-    margin-right: 20px !important;
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+  }
+  .el-col{
+    padding-left: 0 !important;
+    padding-right: 0 !important;
   }
   ::v-deep .el-input__inner {
     width: 100%;