增加文件下载，修改其他功能细节

src/dashoo.cn/backend/api/business/documentmanage/documentmanage.go

@@ -24,6 +24,7 @@ type DocumentInfo struct {
 type DocumentNameTimeInfo struct {
 	Name     string    `xorm:"VARCHAR(50)"`
 	CreateOn time.Time `xorm:"DATETIME"`
+	FileURL  string    `xorm:"VARCHAR(500)"`
 }
 
 type DocumentHistory struct {

src/dashoo.cn/backend/api/business/documentmanage/documentmanageService.go

@@ -2,6 +2,7 @@ package documentmanage
 
 import (
 	"strconv"
+	"time"
 
 	. "dashoo.cn/backend/api/mydb"
 	"dashoo.cn/utils"
@@ -24,7 +25,9 @@ func (s *DocumentmanageService) GetDocumentNameAndTime(table string, colName str
 	var err error
 	var sql string
 
-	sql = "select Name, CreateOn from " + table + " WHERE " + colName + " = 1 " + " ORDER BY CreateOn DESC "
+	nowTimeStr := time.Now().Format("2006-01-02 15:04:05")
+
+	sql = "select Name, CreateOn, FileURL from " + table + " WHERE " + colName + " = 1 " + "and ValidityTime >= '" + nowTimeStr + "' ORDER BY CreateOn DESC "
 
 	List := make([]DocumentNameTimeInfo, 0)
 	err = utils.DBE.Sql(sql).Find(&List)

src/dashoo.cn/frontend_web/src/components/samples/cellscollectiondialog.vue

@@ -9,7 +9,7 @@
           <el-input type="textarea" v-model="uploadform.UploadDesc" placeholder="附件说明"></el-input>
         </el-form-item>
         <el-form-item label="附件上传" required> 
-          <el-upload style="margin-top: 10px;" multiple="true" action="" ref="refuploadattach" :http-request="uploadrequest" class="attach-uploader"
+          <el-upload style="margin-top: 10px;" multiple action="" ref="refuploadattach" :http-request="uploadrequest" class="attach-uploader"
             :show-file-list="true" :before-upload="beforeAvatarUpload">
             <i class="el-icon-plus attach-uploader-icon"></i>
           </el-upload>

src/dashoo.cn/frontend_web/src/components/samples/protocoldialog.vue

@@ -7,7 +7,7 @@
           <el-input type="textarea" v-model="uploadform.UploadDesc" placeholder="协议文件说明"></el-input>
         </el-form-item>
         <el-form-item label="协议文件上传" required>
-          <el-upload style="margin-top: 10px;" multiple="true" action="" ref="refmaintainlogattach" :http-request="uploadrequest" class="attach-uploader"
+          <el-upload style="margin-top: 10px;" multiple action="" ref="refmaintainlogattach" :http-request="uploadrequest" class="attach-uploader"
             :show-file-list="true" :before-upload="beforeAvatarUpload">
             <i class="el-icon-plus attach-uploader-icon"></i>
           </el-upload>

src/dashoo.cn/frontend_web/src/pages/documentmanage/_opera/edit.vue

@@ -55,7 +55,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="文档上传" prop="Diseaseinfo">
-              <el-upload style="margin-top: 10px;" multiple="true" action="" :limit="1" ref="refuploadattach" :http-request="uploadrequest"
+              <el-upload style="margin-top: 10px;" multiple action="" :limit="1" ref="refuploadattach" :http-request="uploadrequest"
                 class="attach-uploader" :show-file-list="true" :before-upload="beforeAvatarUpload" >
                 <i class="el-icon-plus attach-uploader-icon"></i>
               </el-upload>
@@ -66,7 +66,7 @@
               <div style="overflow: auto;">
                 <template>
                   <el-row>
-                    <el-col :span="24" v-for="(v,K) in maintainlogattrlist" :key="v">
+                    <el-col :span="24" v-for="(v,K) in maintainlogattrlist" :key="v.name">
                       <span>
                         <el-button size="small" type="text" icon="el-icon-delete" title="删除" @click="deletedatafile(K)" ></el-button>
                       </span>
@@ -138,8 +138,8 @@
           label: 'ItemName',
           children: 'children'
         },
-        orgtreelist: [],
-        JLDirectoryIds: [], //文档结构
+        orgtreelist: [], //文档结构
+        JLDirectoryIds: [], //文档结构Id
         list: [],
         typeList: [], //文档类别列表
         uploadform: {
@@ -229,7 +229,11 @@
           })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,ItemName')
-            // _this.getfinaljiedian(_this.uploadform.DirectoryId)
+            //显示原来文档结构
+            let arr = []
+            arr.push(_this.orgtreelist[0].id)
+            arr.push(_this.orgtreelist[0].children[0].id)
+            _this.JLDirectoryIds = arr
           })
           .catch(err => {
             // handle error
@@ -239,31 +243,6 @@
       clickachment(url, uid) {
         window.open(`http://${url}`)
       },
-      //文档结构回显
-      getfinaljiedian(Id) {
-        let _this = this
-        this.$axios.get('/items/treeitemsdetailparentlist/' + Id, {})
-          .then(res => {
-            if (res.data.code === 0) {
-              // 选中状态
-              _this.JLDirectoryIds = []
-              for (var i = pidarr.length - 1; i >= 0; i--) {
-                if (pidarr[i] !== '0') {
-                  _this.JLDirectoryIds.push(parseInt(pidarr[i]))
-                }
-              }
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: '出现错误！'
-              })
-            }
-          })
-          .catch(err => {
-            // handle error
-            console.error(err)
-          })
-      },
       //保存编辑信息
       save() {
         let _this = this

src/dashoo.cn/frontend_web/src/pages/documentmanage/_opera/uploadnewdoc.vue

@@ -50,7 +50,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="文档上传" prop="Diseaseinfo">
-              <el-upload style="margin-top: 10px;" multiple="true" action="" :limit="1" ref="refuploadattach" :http-request="uploadrequest"
+              <el-upload style="margin-top: 10px;" multiple action="" :limit="1" ref="refuploadattach" :http-request="uploadrequest"
                 class="attach-uploader" :show-file-list="true" :before-upload="beforeAvatarUpload">
                 <i class="el-icon-plus attach-uploader-icon"></i>
               </el-upload>

src/dashoo.cn/frontend_web/src/pages/documentmanage/add.vue

@@ -55,7 +55,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="文档上传" prop="Diseaseinfo">
-              <el-upload style="margin-top: 10px;" multiple="true" action="" :limit="1" ref="refuploadattach" :http-request="uploadrequest"
+              <el-upload style="margin-top: 10px;" multiple action="" :limit="1" ref="refuploadattach" :http-request="uploadrequest"
                 class="attach-uploader" :show-file-list="true" :before-upload="beforeAvatarUpload">
                 <i class="el-icon-plus attach-uploader-icon"></i>
               </el-upload>

src/dashoo.cn/frontend_web/src/pages/documentmanage/index.vue

@@ -15,7 +15,7 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-tree highlight-current="true" :expand-on-click-node="true" node-key="id" :data="orgtreelist" :props="orgtreeprops" :default-expanded-keys="userdepartment"
+          <el-tree highlight-current :expand-on-click-node="true" node-key="id" :data="orgtreelist" :props="orgtreeprops" :default-expanded-keys="userdepartment"
             @node-click="orgtreeNodeClick" ref="orgmanagetree">
           </el-tree>
         </el-col>
@@ -83,7 +83,7 @@
 
 <script>
   export default {
-    name: 'itemsdetail',
+    name: 'itemsdetailA',
     data() {
       return {
         currentItemCount: 0,

src/dashoo.cn/frontend_web/src/pages/externalOrganize.vue

@@ -15,7 +15,7 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-tree highlight-current="true" :expand-on-click-node="true" node-key="id" :data="orgtreelist" :props="orgtreeprops" :default-expanded-keys="userdepartment"
+          <el-tree highlight-current :expand-on-click-node="true" node-key="id" :data="orgtreelist" :props="orgtreeprops" :default-expanded-keys="userdepartment"
             @node-click="orgtreeNodeClick" ref="orgmanagetree">
           </el-tree>
         </el-col>

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -14,7 +14,7 @@
                 <div style="padding: 10px 0 0 15px;"><img src="../assets/img/tongzhigonggao.jpg" alt="通知公告" style="height: 40px; width: 100px;"></div>
                 <div>
                   <template>
-                    <el-table :data="noticeList" show-header="false" style="width: 100%" max-height="200" >
+                    <el-table :data="noticeList" style="width: 100%" max-height="200" >
                       <el-table-column prop="Name" label="通知标题" width="450">
                         <template slot-scope="scope">
                           <i class="el-icon-caret-right"></i>
@@ -39,11 +39,11 @@
                     </li>
                   </ul> -->
                   <template>
-                    <el-table :data="fileList" show-header="false" style="width: 100%" max-height="200" >
+                    <el-table :data="fileList" style="width: 100%" max-height="200" @row-click="DownloadFile">
                       <el-table-column prop="Name" label="文件名" width="450">
                         <template slot-scope="scope">
                           <i class="el-icon-caret-right"></i>
-                          <span style="margin-left: 5px">{{ scope.row.Name }}</span>
+                          <a style="margin-left: 5px">{{ scope.row.Name }}</a>
                         </template>
                       </el-table-column>
                       <el-table-column prop="CreateOn" label="时间" width="141">
@@ -150,6 +150,13 @@
             console.log(error);
           });
       },
+      //下载文件
+      DownloadFile(row){
+        let val = row.FileURL
+        let urlArr = val.split('|')
+        location.href = "http://" + urlArr[0]
+      },
+      //格式化时间
       jstimehandle(val) {
         if (val === '') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/setting/systemitems/_opera/itemsdetail.vue

@@ -48,7 +48,7 @@
 
 <script>
   export default {
-  name: 'itemsdetail',
+  name: 'itemsdetailB',
     data() {
       return {
         titlename: '',

src/dashoo.cn/frontend_web/src/pages/setting/systemitems/_opera/treeitemsdetail.vue

@@ -17,7 +17,7 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-tree highlight-current="true" :expand-on-click-node="true" node-key="id" :data="orgtreelist" :props="orgtreeprops" :default-expanded-keys="userdepartment"
+          <el-tree highlight-current :expand-on-click-node="true" node-key="id" :data="orgtreelist" :props="orgtreeprops" :default-expanded-keys="userdepartment"
             @node-click="orgtreeNodeClick" ref="orgmanagetree">
           </el-tree>
         </el-col>
@@ -82,7 +82,7 @@
 
 <script>
   export default {
-    name: 'itemsdetail',
+    name: 'itemsdetailC',
     data() {
       return {
         titlename: '',

src/dashoo.cn/frontend_web/src/pages/setting/testlist/packagecategory/index.vue

@@ -15,7 +15,7 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-tree highlight-current="true" :expand-on-click-node="true" node-key="id" :data="orgtreelist" :props="orgtreeprops" :default-expanded-keys="userdepartment"
+          <el-tree highlight-current :expand-on-click-node="true" node-key="id" :data="orgtreelist" :props="orgtreeprops" :default-expanded-keys="userdepartment"
             @node-click="orgtreeNodeClick" ref="orgmanagetree">
           </el-tree>
         </el-col>