完成文件管理功能

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

@@ -69,3 +69,9 @@ type DocumentHistoryModel struct {
 	Remark        string
 	VersionFlag   int //版本标志：0历史版本；1当前版本
 }
+
+//文档名与创建时间
+type DocumentNameTimeInfo struct {
+	Name     string    //文件名
+	AuthorOn time.Time //创建时间
+}

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

@@ -1,6 +1,7 @@
 package documentmanage
 
 import (
+	"fmt"
 	"strconv"
 
 	. "dashoo.cn/backend/api/mydb"
@@ -19,6 +20,20 @@ func GetDocumentmanageService(xormEngine *xorm.Engine) *DocumentmanageService {
 	return s
 }
 
+//获取文档名与创建时间
+func (s *DocumentmanageService) GetDocumentNameAndTime(table string) []DocumentNameTimeInfo {
+	var err error
+	var sql string
+
+	sql = `select Name, AuthorOn from ` + table + ` ORDER BY AuthorOn DESC `
+
+	List := make([]DocumentNameTimeInfo, 0)
+	err = utils.DBE.Sql(sql).Find(&List)
+	LogError(err)
+
+	return List
+}
+
 //获取文档信息
 func (s *DocumentmanageService) GetDocumentInfoByWhere(pageIndex, itemsPerPage int64, order, table string, where string) (int64, []DocumentInfo) {
 	var err error

src/dashoo.cn/backend/api/controllers/base.go

@@ -224,15 +224,15 @@ var (
 	UserQualificationName                    string = "UserQualification"   //用户资质表
 	LimsInstrumentGroup                      string = "LimsInstrumentGroup" // 检测仪器关联
 
-	OilBasisBuildName                        string = "OilBasisBuild" 			// 基建类资质对照表
-	OilGoodsAptitudeName	                 string = "OilGoodsAptitude" 		// 物资类项目与资质对照表
-	OilTableFiledSettingName                 string = "OilTableFiledSetting" 	// 资质项目与字段对照表
-	OilTechnologyServiceName                 string = "OilTechnologyService" 	// 技术服务类资质对照表
-	OilSupplierName  						 string = "OilSupplier" 			// 供方基本信息表
-	OilSupplierCertName  					 string = "OilSupplierCert" 		// 供方准入证书信息表
-	OilSupplierCertSubName  				 string = "OilSupplierCertSub" 		// 供方对应准入子分类表
-	OilGoodsAptitudeClassName 				 string = "OilGoodsAptitudeClass" 	// 物资类资质分类层级表
-	OilTechnologyServiceClassName 			 string = "OilTechnologyServiceClass" 	// 物资类资质分类层级表
+	OilBasisBuildName             string = "OilBasisBuild"             // 基建类资质对照表
+	OilGoodsAptitudeName          string = "OilGoodsAptitude"          // 物资类项目与资质对照表
+	OilTableFiledSettingName      string = "OilTableFiledSetting"      // 资质项目与字段对照表
+	OilTechnologyServiceName      string = "OilTechnologyService"      // 技术服务类资质对照表
+	OilSupplierName               string = "OilSupplier"               // 供方基本信息表
+	OilSupplierCertName           string = "OilSupplierCert"           // 供方准入证书信息表
+	OilSupplierCertSubName        string = "OilSupplierCertSub"        // 供方对应准入子分类表
+	OilGoodsAptitudeClassName     string = "OilGoodsAptitudeClass"     // 物资类资质分类层级表
+	OilTechnologyServiceClassName string = "OilTechnologyServiceClass" // 物资类资质分类层级表
 )
 
 //分页信息及数据
@@ -260,7 +260,7 @@ func (this *BaseController) Prepare() {
 		"/api/webinterface/preparelist", "/api/webinterface/prepareinfo",
 		"/api/sampletest_v/sampletest", "/api/sampletest_v/getpass", "/api/sampletest_v/editpass/",
 		"/api/sampletest_v/donorsdetail", "/api/sampletest_v/testdetail", "/api/uploads/samplesinput", "/api/doctemplate_onlyoffice/callback", "/api/doctemplate_onlyoffice/viewcallback", "/api/limsupload/usersignimg",
-		"/api/uploads/samplestypeimg", "/api/limsdataentry/historyimg/"}
+		"/api/uploads/samplestypeimg", "/api/limsdataentry/historyimg/", "/api/document/getdocumentnameandtime"}
 	for _, v := range urls {
 		fmt.Println("**this.Ctx.Input.URL()**", this.Ctx.Input.URL())
 		if this.Ctx.Input.URL() == v {

src/dashoo.cn/backend/api/controllers/document/document.go

@@ -2,6 +2,7 @@ package document
 
 import (
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"dashoo.cn/backend/api/business/documentmanage"
@@ -40,6 +41,21 @@ func (this *DocumentController) GetDocumentList() {
 	this.ServeJSON()
 }
 
+// @Title 获取文档名与创建时间
+// @Description get Name,AuthorOn
+// @Success 200 {object} models.Userblood
+// @router /getdocumentnameandtime [get]
+func (this *DocumentController) GetDocumentNameAndTime() {
+
+	svc := documentmanage.GetDocumentmanageService(utils.DBE)
+	var list []documentmanage.DocumentNameTimeInfo
+	tableName := "s5OVE" + DocumentInfoName
+	list = svc.GetDocumentNameAndTime(tableName)
+
+	this.Data["json"] = &list
+	this.ServeJSON()
+}
+
 // @Title 新增文档信息  DocumentInfo
 // @Param	body	body	business.device.DeviceChannels "需要注意"
 // @Success	200	{object} controllers.Request
@@ -67,6 +83,39 @@ func (this *DocumentController) AddDocumentInfo() {
 	}
 }
 
+// @Title 删除文档信息
+// @Param id
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /deletedocumentdata/:id [delete]
+func (this *DocumentController) DeleteDocumentData() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	var err error
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	svc := documentmanage.GetDocumentmanageService(utils.DBE)
+	whereStr := "Id= " + utils.ToStr(id)
+	err = svc.DeleteEntityBytbl(this.User.AccCode+DocumentInfoName, whereStr)
+
+	if err == nil {
+		errinfo.Message = "删除成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 // @Title 删除文档信息   DocumentInfo
 // @Description
 // @Success 200 {object} ErrorInfo

src/dashoo.cn/frontend_web/src/components/MenuList.vue

@@ -32,10 +32,6 @@
     },
     methods: {
       isActive (menu) {
-        // console.info("1:"+menu.url)
-        // console.info("2:"+this.$route.name)
-        // console.info("3:"+this.$route.path)
-        // console.info(this.$route.params)
         const objectEqual = (a, b) => (Object.keys(a).length !== Object.keys(b).length) || Object.keys(a).every(key => String(a[key]) === String(b[key]))
         const routeEqual = item => item.url === this.$route.path && (!item.params || objectEqual(item.params, this.$route.params))
         return routeEqual(menu) || (menu.children && menu.children.length && menu.children.some(item => routeEqual(item)))

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

@@ -35,12 +35,12 @@
             {{ jstimehandle(scope.row.AuthorOn+'') }}
           </template>
         </el-table-column>
-        <el-table-column prop="AuditorBy" label="审核人" align="center" header-align="center" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="AuditorBy" label="审核人" align="center" header-align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="AuditorOn" label="审核时间" align="center" header-align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.AuditorOn+'') }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="Remark" label="备注信息" align="center" header-align="center" show-overflow-tooltip></el-table-column>
       </el-table>
       <el-pagination style="float:right;margin:10px 0 10px 0;" @size-change="handleSizeChange" @current-change="handleCurrentChange"

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

@@ -8,12 +8,10 @@
     <el-card class="box-card">
       <div slot="header">
         <span>
-          <i class="icon icon-file-text"> 新增文档信息</i>
+          <i class="icon icon-file-text"> 文档编辑信息</i>
         </span>
         <span style="float: right;">
-          <el-button type="primary" class="el-button--small" @click="saveclick()" style="margin-left:5px" :disabled="uploadform.AuditorStatus == 1||!permissions[permissionscode.cellsdocumentedit]">保存</el-button>
-          <el-button :disabled="uploadform.AuditorStatus == 1||!permissions[permissionscode.cellsdocumentapprove]" type="primary" class="el-button--small"
-            @click="auditorDocumentinfo">审核</el-button>
+          <el-button type="primary" class="el-button--small" @click="save()" style="margin-left:5px" >保存</el-button>
           <router-link :to="'/documentmanage'">
             <el-button type="primary" class="el-button--small" style="margin-left:5px">返回</el-button>
           </router-link>
@@ -22,52 +20,47 @@
       <el-form :model="uploadform" :rules="rules" ref="uploadform" label-width="110px">
         <div class="el-row">
           <el-col :span="12">
-            <el-form-item label="文档结构" prop="JLDirectoryId">
+            <el-form-item label="文档结构" prop="JLDirectoryIds">
               <el-cascader :options="orgtreelist" style="width:100%" :props="orgtreeprops" change-on-select :show-all-levels="false" v-model="JLDirectoryIds"
-                :disabled="uploadform.AuditorStatus == 1||!permissions[permissionscode.cellsdocumentedit]" placeholder="请选择文档结构"></el-cascader>
+                placeholder="请选择文档结构"></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="文档名称" prop="Name">
-              <el-input v-model="uploadform.Name" placeholder="请输入文档名称" :disabled="uploadform.AuditorStatus == 1||!permissions[permissionscode.cellsdocumentedit]"></el-input>
+              <el-input v-model="uploadform.Name" placeholder="请输入文档名称" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="版本信息" prop="VersionInfo">
-              <el-input v-model="uploadform.VersionInfo" placeholder="请输入版本信息" :disabled="uploadform.AuditorStatus == 1||!permissions[permissionscode.cellsdocumentedit]"></el-input>
+              <el-input v-model="uploadform.VersionInfo" placeholder="请输入版本信息" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="编辑人" prop="AuthorUser">
-              <el-select v-if="uploadform.AuditorStatus == 0" ref="consigneeselect" v-model="AuthorUser" placeholder="请选择编辑人" style="width: 100%;"
-                @change="selectAuthorUser" :disabled="!permissions[permissionscode.cellsdocumentedit]">
-                <el-option v-for="item in acceptUsers" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-              <el-input v-if="uploadform.AuditorStatus == 1" v-model="uploadform.AuditorBy" disabled></el-input>
+            <el-form-item label="编辑人" prop="AuthorBy">
+              <el-input v-model="uploadform.AuthorBy" placeholder="请输入编辑人"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input type="textarea" :rows="2" v-model="uploadform.Remark" placeholder="请输入备注信息" :disabled="uploadform.AuditorStatus == 1||!permissions[permissionscode.cellsdocumentedit]"></el-input>
+              <el-input type="textarea" :rows="2" v-model="uploadform.Remark" placeholder="请输入备注信息" ></el-input>
             </el-form-item>
           </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"
-                class="attach-uploader" :show-file-list="true" :before-upload="beforeAvatarUpload" :disabled="uploadform.AuditorStatus == 1||!permissions[permissionscode.cellsdocumentedit]">
+                class="attach-uploader" :show-file-list="true" :before-upload="beforeAvatarUpload" >
                 <i class="el-icon-plus attach-uploader-icon"></i>
               </el-upload>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item class="maintainlog" label="" label-width="120px">
+            <el-form-item class="maintainlog" label="已有文档" label-width="120px">
               <div style="overflow: auto;">
                 <template>
                   <el-row>
                     <el-col :span="24" v-for="(v,K) in maintainlogattrlist" :key="v">
                       <span>
-                        <el-button size="small" type="text" icon="el-icon-delete" title="删除" @click="deletedatafile(K)" :disabled="uploadform.AuditorStatus == 1||!permissions[permissionscode.cellsdocumentedit]"></el-button>
+                        <el-button size="small" type="text" icon="el-icon-delete" title="删除" @click="deletedatafile(K)" ></el-button>
                       </span>
                       <a style="margin-left:10px" @click="clickachment(v.url)">{{ v.name }}</a>
                     </el-col>
@@ -121,19 +114,12 @@
     },
     data() {
       var CheckDirectoryId = (rule, value, callback) => {
-        if (this.JLDirectoryId && this.JLDirectoryId.length < 1) {
+        if (this.JLDirectoryIds && this.JLDirectoryIds.length < 1) {
           callback(new Error('请选择文档结构'))
         } else {
           callback()
         }
       }
-      var checkAuthorUser = (rule, value, callback) => {
-        if (!this.AuthorUser || this.AuthorUser == '' || this.AuthorUser == 0) {
-          callback(new Error('请输入接收人'))
-        } else {
-          callback()
-        }
-      }
       return {
         documentId: 0,
         waituploads: [], // 等待上传的附件列表
@@ -148,33 +134,23 @@
         JLDirectoryIds: [], //文档结构
         list: [],
         uploadform: {
+          DirectoryId: '', //目录结构Id
           Name: '', //文档名称
           VersionInfo: '', //文档版本
-          DirectoryId: 0, //目录结构Id
-          Remark: '', //备注
           FileURL: '', //文档地址
-          AuditorBy: '', //审核人
-          AuthorUserId: 1, //审核人Id
-          AuditorStatus: 0, //0未审核;1已审核
-          AuditorOn: new Date() //审核时间
+          AuthorOn: new Date(),//编辑时间
+          AuthorBy: '',//编辑人
+          Remark: '', //备注
         },
-        AuthorUser: '', //编辑人
+        AuthorUser: '',
         AuthorUserName: '',
         loginDialogVisible: false, //登陆验证弹窗
         isLoginSucceed: false,
-        permissionscode: {
-          cellsdocumentedit: 'cellbank.cell.cellsdocument.edit', //编辑
-          cellsdocumentapprove: 'cellbank.cell.cellsdocument.approve' //审核
-        },
-        permissions: {
-          'cellbank.cell.cellsdocument.edit': false,
-          'cellbank.cell.cellsdocument.approve': false
-        },
         acceptUsers: [],
         username: '',
         password: '',
         rules: {
-          JLDirectoryId: [{
+          JLDirectoryIds: [{
             required: true,
             validator: CheckDirectoryId,
             trigger: 'blur'
@@ -189,24 +165,17 @@
             message: '请填写版本信息',
             trigger: 'blur'
           }],
-          // AuthorUserId: [{
-          //   required: true,
-          //   message: '请选择编辑人',
-          //   trigger: 'blur'
-          // }],
-          AuthorUser: [{
-            validator: checkAuthorUser,
+          AuthorBy: [{
             required: true,
-            trigger: 'blur',
+            message: '请输入编辑人',
+            trigger: 'blur'
           }],
         },
       }
     },
     created() {
       this.documentId = this.$route.params.opera
-      //this.initinfo()
-      this.getUsersByPerCode()
-      this.getPermissions()
+      this.initinfo()
     },
     methods: {
       initinfo() {
@@ -214,14 +183,7 @@
         this.$axios.get('/document/geteditinitinfo/' + this.documentId, {})
           .then(res => {
             _this.uploadform = res.data.items
-            if (_this.uploadform.AuthorUserId && _this.uploadform.AuthorUserId != 0) {
-              for (var i = 0; i < _this.acceptUsers.length; i++) {
-                if (_this.acceptUsers[i].id === _this.uploadform.AuthorUserId) {
-                  _this.AuthorUser = _this.uploadform.AuthorUserId
-                }
-              }
-            }
-            _this.gettreelist(217)
+            _this.gettreelist(218)
             _this.getwendanginfo(res.data.items.FileURL)
 
           })
@@ -237,7 +199,7 @@
         }
         _this.maintainlogattrlist.push(params)
       },
-      //获取文档树
+      //获取文档结构树
       gettreelist(pid) {
         let _this = this
         let params = {
@@ -285,10 +247,10 @@
           })
       },
       //保存编辑信息
-      saveclick() {
+      save() {
+        let _this = this
         this.$refs["uploadform"].validate((valid) => {
           if (valid) {
-            let _this = this
             if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
               // 上传附件是否完成判断
               if (!this.attachissuccess()) {
@@ -304,6 +266,7 @@
                   }).then(() => {
                     _this.getattachissuccess()
                     _this.editdocumentinfo() //保存编辑信息
+                    _this.getwendanginfo(_this.uploadform.FileURL) //更新已有文档列表
                     // 清空上传数据
                     if (_this.$refs.refuploadattach) {
                       _this.$refs.refuploadattach.clearFiles()
@@ -339,8 +302,6 @@
       editdocumentinfo() {
         let _this = this
         _this.uploadform.DirectoryId = parseInt(_this.JLDirectoryIds[_this.JLDirectoryIds.length - 1])
-        _this.uploadform.AuthorUserId = parseInt(_this.AuthorUser)
-        _this.uploadform.AuthorBy = _this.$refs.consigneeselect.selectedLabel
         this.$axios.put('/document/editdocumentinfo/' + _this.documentId, _this.uploadform)
           .then(function (response) {
             if (response.data.code === 0) {
@@ -348,7 +309,6 @@
                 type: 'success',
                 message: response.data.message
               })
-              _this.initinfo()
             } else {
               _this.$message({
                 type: 'warning',
@@ -360,33 +320,6 @@
             console.log(error)
           })
       },
-      //文档审核
-      auditorDocumentinfo() {
-        let _this = this
-        _this.$confirm('确定审核该文档？审核后所有信息将不可修改！', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          _this.uploadform.AuditorStatus = 1
-          _this.uploadform.AuditorOn = new Date()
-          this.$axios.put('/document/auditorDocumentinfo/' + _this.documentId, _this.uploadform)
-            .then(function (response) {
-              if (response.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: response.data.message
-                })
-                window.history.go(-1)
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: response.data.message
-                })
-              }
-            })
-        }).catch(() => {})
-      },
       beforeAvatarUpload(file) {
         let isLt50m = file.size / 1024 / 1024 / 50 < 1
         if (!isLt50m) {
@@ -452,33 +385,6 @@
           }
         }
       },
-      //获取人员列表
-      getUsersByPerCode() {
-        let _this = this
-        // request
-        this.$axios.get("/role/getUsersWithRolePermission?perCode=cellbank.cell.cellsdocument.editer", {})
-          .then(res => {
-            if (res.data instanceof Array && res.data.length > 0) {
-              _this.acceptUsers = res.data
-              _this.initinfo()
-            }
-          })
-          .catch(err => {
-            // handle error
-            console.error(err)
-          })
-      },
-      //选择编辑人信息
-      selectAuthorUser() {
-        if (this.AuthorUser != this.authUser.Profile.Id) {
-          this.loginDialogVisible = true
-        }
-        for (var i = 0; i < this.acceptUsers.length; i++) {
-          if (this.acceptUsers[i].id === this.AuthorUser) {
-            this.AuthorUserName = this.acceptUsers[i].name
-          }
-        }
-      },
       //取消验证
       cancelLogin() {
         if (this.isLoginSucceed) {
@@ -513,32 +419,10 @@
             console.error(err)
           })
       },
-      //获取权限
-      getPermissions() {
-        let _this = this
-        // request
-        let params = {
-          percodes: `'${this.permissionscode.cellsdocumentedit}','${this.permissionscode.cellsdocumentapprove}'`
-        }
-        this.$axios.get('/permissions/isauths', {
-            params
-          })
-          .then(res => {
-            if (res.data instanceof Array && res.data.length > 0) {
-              res.data.forEach(element => {
-                _this.permissions[element.Code] = element.Isperm
-              });
-            }
-          })
-          .catch(err => {
-            // handle error
-            console.error(err)
-          })
-      },
       //删除文件
       deletedatafile() {
         let _this = this
-        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        _this.$confirm('此操作将彻底删除该数据, 是否继续?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'

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

@@ -11,7 +11,7 @@
           <i class="icon icon-file-text"> 新增文档信息</i>
         </span>
         <span style="float: right;">
-          <el-button :disabled="!permissions[permissionscode.cellsdocumentadd]" type="primary" class="el-button--small" @click="save()">保存</el-button>
+          <el-button type="primary" class="el-button--small" @click="save()">保存</el-button>
           <router-link :to="'/documentmanage'">
             <el-button type="primary" class="el-button--small" style="margin-left:5px">返回</el-button>
           </router-link>
@@ -36,11 +36,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="编辑人" prop="AuthorUser">
-              <el-select ref="consigneeselect" v-model="AuthorUser" placeholder="请选择编辑人" style="width: 100%;" @change="selectAuthorUser">
-                <el-option v-for="item in acceptUsers" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
+            <el-form-item label="编辑人" prop="AuthorBy">
+              <el-input v-model="uploadform.AuthorBy" placeholder="请输入编辑人"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -51,7 +48,7 @@
           <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"
-                class="attach-uploader" :show-file-list="true" :before-upload="beforeAvatarUpload" :disabled="!permissions[permissionscode.cellsdocumentadd]">
+                class="attach-uploader" :show-file-list="true" :before-upload="beforeAvatarUpload">
                 <i class="el-icon-plus attach-uploader-icon"></i>
               </el-upload>
             </el-form-item>
@@ -122,13 +119,6 @@
           callback()
         }
       }
-      var checkAuthorUser = (rule, value, callback) => {
-        if (!this.AuthorUser || this.AuthorUser == '' || this.AuthorUser == 0) {
-          callback(new Error('请选择编辑人'))
-        } else {
-          callback()
-        }
-      }
       var checkUploaddoc = (rule, value, callback) => {
         if (!this.$refs.refuploadattach.uploadFiles || this.$refs.refuploadattach.uploadFiles.length == 0) {
           callback(new Error('请上传文档'))
@@ -144,17 +134,17 @@
           label: 'ItemName',
           children: 'children'
         },
-        AuthorUser: '', //编辑人
+        AuthorUser: '',
         AuthorUserName: '',
         orgtreelist: [],
         uploadform: {
+          DirectoryId: '',
           Name: '',
           VersionInfo: '',
-          DirectoryId: 0,
-          Remark: '',
           FileURL: '',
-          AuditorBy: '',
-          AuthorUserId: 1,
+          AuthorOn: new Date(),
+          AuthorBy: '',
+          Remark: '',
           JLDirectoryId: []
         },
         rules: {
@@ -173,10 +163,10 @@
             message: '请填写版本信息',
             trigger: 'blur'
           }],
-          AuthorUser: [{
-            validator: checkAuthorUser,
+          AuthorBy: [{
             required: true,
-            trigger: 'blur',
+            message: '请输入编辑人',
+            trigger: 'blur'
           }],
           Diseaseinfo: [{
             validator: checkUploaddoc,
@@ -186,12 +176,6 @@
         },
         loginDialogVisible: false, //登陆验证弹窗
         isLoginSucceed: false,
-        permissionscode: {
-          cellsdocumentadd: 'cellbank.cell.cellsdocument.add' //添加
-        },
-        permissions: {
-          'cellbank.cell.cellsdocument.add': false,
-        },
         acceptUsers: [],
         username: '',
         password: '',
@@ -199,10 +183,8 @@
     },
     created() {
       let parentId = this.$route.query.exid
-      this.gettreelist(217)
+      this.gettreelist(218)
       this.getfinaljiedian(parentId)
-      this.getUsersByPerCode()
-      this.getPermissions() //获取权限
     },
     methods: {
       gettreelist(pid) {
@@ -260,8 +242,6 @@
               _this.uploadform.DirectoryId = parseInt(_this.uploadform.JLDirectoryId[_this.uploadform.JLDirectoryId
                 .length -
                 1])
-              _this.uploadform.AuthorUserId = parseInt(_this.AuthorUser)
-              _this.uploadform.AuthorBy = _this.$refs.consigneeselect.selectedLabel
               _this.$axios.post('/document/adddocumentinfo', _this.uploadform)
                 .then(function (response) {
                   if (response.data.code === 0) {
@@ -322,7 +302,7 @@
                 url: res.data.publicUrl,
                 fid: res.data.fid
               })
-              _this.uploadform.Name = _this.$refs.refuploadattach.uploadFiles[0].name
+              // _this.uploadform.Name = _this.$refs.refuploadattach.uploadFiles[0].name //获取上传文件的文件名，并赋值给uploadform.Name
               uploadajax(option)
             } else {
               _this.$message({
@@ -354,37 +334,6 @@
           }
         }
       },
-      //获取人员列表
-      getUsersByPerCode() {
-        let _this = this
-        // request
-        _this.$axios.get("/role/getUsersWithRolePermission?perCode=cellbank.cell.cellsdocument.editer", {})
-          .then(res => {
-            if (res.data instanceof Array && res.data.length > 0) {
-              _this.acceptUsers = res.data
-              for (var i = 0; i < _this.acceptUsers.length; i++) {
-                if (_this.acceptUsers[i].id === _this.authUser.Profile.Id) {
-                  _this.AuthorUser = _this.authUser.Profile.Id
-                }
-              }
-            }
-          })
-          .catch(err => {
-            // handle error
-            console.error(err)
-          })
-      },
-      //选择编辑人信息
-      selectAuthorUser() {
-        if (this.AuthorUser != this.authUser.Profile.Id) {
-          this.loginDialogVisible = true
-        }
-        for (var i = 0; i < this.acceptUsers.length; i++) {
-          if (this.acceptUsers[i].id === this.AuthorUser) {
-            this.AuthorUserName = this.acceptUsers[i].name
-          }
-        }
-      },
       //取消验证
       cancelLogin() {
         if (this.isLoginSucceed) {
@@ -419,28 +368,6 @@
             console.error(err)
           })
       },
-      //获取权限
-      getPermissions() {
-        let _this = this
-        // request
-        let params = {
-          percodes: `'${this.permissionscode.cellsdocumentadd}'`
-        }
-        this.$axios.get('/permissions/isauths', {
-            params
-          })
-          .then(res => {
-            if (res.data instanceof Array && res.data.length > 0) {
-              res.data.forEach(element => {
-                _this.permissions[element.Code] = element.Isperm
-              });
-            }
-          })
-          .catch(err => {
-            // handle error
-            console.error(err)
-          })
-      },
     }
   }
 

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

@@ -7,10 +7,10 @@
     <el-card class="box-card">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"> 文档管理列表</i>
+          <i class="icon icon-table2"> 文档列表</i>
         </span>
         <span style="float: right">
-          <el-button :disabled="!permissions[permissionscode.cellsdocumentadd]" size="small" type="primary" @click="toadddoc">添加</el-button>
+          <el-button size="small" type="primary" @click="toadddoc">添加</el-button>
         </span>
       </div>
       <el-row :gutter="20">
@@ -21,7 +21,7 @@
         </el-col>
         <el-col :span="18">
           <el-collapse>
-            <el-collapse-item title="查询">
+            <el-collapse-item title="文档查询">
               <el-form ref="form" :model="searchForm" label-width="120px">
                 <el-row>
                   <el-col :span="8">
@@ -44,19 +44,11 @@
             <el-table-column label="操作" width="120" align="center" header-align="center">
               <template slot-scope="scope">
                 <router-link :to="'/documentmanage/'+scope.row.Id+'/edit'">
-                  <el-button size="small" type="text" icon="el-icon-edit" title="编辑"></el-button>
+                  <el-button size="medium" type="text" icon="el-icon-edit" title="编辑"></el-button>
                 </router-link>
-                <el-button :disabled="scope.row.AuditorStatus == 0 || !permissions[permissionscode.cellsdocumentedit]" size="small" style="margin-left:3px;"
-                  type="text" title="上传新版本" @click="touploadnewdoc(scope.row.Id)">
-                  <i class="icon icon-folder-upload"></i>
+                <el-button size="medium" style="margin-left:3px;" type="text"
+                  icon="el-icon-delete" title="删除" @click="deletedata(scope.row.Id)">
                 </el-button>
-                <router-link :to="'/documentmanage/'+scope.row.Id+'/dochistory'">
-                  <el-button size="small" style="margin-left:3px;" type="text" title="查看历史版本">
-                    <i class="icon icon-file-text"></i>
-                  </el-button>
-                </router-link>
-                <el-button :disabled="!permissions[permissionscode.cellsdocumentdelete]" size="small" style="margin-left:3px;" type="text"
-                  icon="el-icon-delete" title="删除" @click="deletedialogShow(scope.row)"></el-button>
               </template>
             </el-table-column>
             <el-table-column prop="Name" label="文档名称" align="center" header-align="center" show-overflow-tooltip></el-table-column>
@@ -67,21 +59,6 @@
                 {{ jstimehandle(scope.row.AuthorOn+'') }}
               </template>
             </el-table-column>
-            <el-table-column label="审核状态" width="90">
-              <template slot-scope="scope">
-                <router-link :to="'/documentmanage/'+scope.row.Id+'/edit'">
-                  <el-tag v-show="scope.row.AuditorStatus=='0'" type="warning">待审核</el-tag>
-                </router-link>
-                <el-tag v-show="scope.row.AuditorStatus=='1'" type="success">已审核</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column prop="AuditorBy" label="审核人" align="center" header-align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="AuditorOn" label="审核时间" align="center" header-align="center" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{ jstimehandle(scope.row.AuditorOn+'') }}
-              </template>
-            </el-table-column>
-            <!-- <el-table-column prop="Remark" label="备注信息" align="center" header-align="center" show-overflow-tooltip></el-table-column> -->
           </el-table>
           <el-pagination style="float:right;margin:10px 0 10px 0;" @size-change="handleSizeChange" @current-change="handleCurrentChange"
             :current-page="currentPage" :page-size="size" :page-sizes="[10, 15, 20 ]" layout="total, sizes, prev, pager, next, jumper"
@@ -90,26 +67,6 @@
         </el-col>
       </el-row>
     </el-card>
-
-    <el-dialog title="删除选项" :visible.sync="deletedialog" size="small" top="5vh">
-      <el-form :model="deleteForm" ref="deleteForm" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-radio-group v-model="deleteForm.flag">
-                <el-radio class="radio" :label="0">删除当前版本</el-radio>
-                <el-radio class="radio" :label="1">删除所有</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer" style="margin-top:-35px;">
-        <el-button @click="deletedialog = false">取 消</el-button>
-        <el-button type="primary" @click="deletedata">确 定</el-button>
-      </div>
-    </el-dialog>
-
   </div>
 </template>
 
@@ -128,9 +85,8 @@
           children: 'children'
         },
         userdepartment: [],
-        list: [],
-        exId: '', //当前选中结构ID
-        deletedialog: false, //删除选项弹窗
+        list: [], //文档列表
+        exId: '323', //当前选中结构ID,默认基础文档id:323
         deleteForm: {
           Name: '',
           Id: '',
@@ -139,22 +95,11 @@
         searchForm: {
           Name: '' //文档名称
         },
-        permissionscode: {
-          cellsdocumentadd: 'cellbank.cell.cellsdocument.add', //添加
-          cellsdocumentedit: 'cellbank.cell.cellsdocument.edit', //编辑
-          cellsdocumentdelete: 'cellbank.cell.cellsdocument.delete' //删除
-        },
-        permissions: {
-          'cellbank.cell.cellsdocument.add': false,
-          'cellbank.cell.cellsdocument.edit': false,
-          'cellbank.cell.cellsdocument.delete': false,
-        },
       }
     },
     created() {
       this.initData()
-      this.gettreelist(217)
-      this.getPermissions()
+      this.gettreelist(218)
     },
     methods: {
       initData() {
@@ -162,7 +107,7 @@
         const params = {
           _currentPage: this.currentPage,
           _size: this.size,
-          Id: 217,
+          Id: 218,//Base_ItemTreeDetails表中的ItemsId
           DirectoryId: this.exId,
           Name: this.searchForm.Name
         }
@@ -182,25 +127,17 @@
         this.currentPage = 1
         this.initData()
       },
-      //删除选项弹窗显示
-      deletedialogShow(val) {
-        let _this = this
-        _this.deleteForm.Name = val.Name
-        _this.deleteForm.Id = val.Id
-        _this.deletedialog = true
-      },
-      deletedata() {
+      //删除文件
+      deletedata(val) {
         let _this = this
-        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        _this.$confirm('此操作将彻底删除该数据, 是否继续?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           })
           .then(() => {
-            _this.$axios.delete('/document/deletedocumentInfo/' + _this.deleteForm.Id + '?Name=' + _this.deleteForm.Name +
-                '&flag=' + _this.deleteForm.flag, {})
+            _this.$axios.delete('/document/deletedocumentdata/' + val, {})
               .then(function (response) {
-                // response
                 if (response.data.code === 0) {
                   _this.$message({
                     type: "success",
@@ -208,7 +145,6 @@
                   });
                   // 更新界面
                   _this.initData()
-                  _this.deletedialog = false
                 } else {
                   _this.$message({
                     type: "warning",
@@ -222,6 +158,7 @@
           })
           .catch(() => {});
       },
+      //获取文档目录列表
       gettreelist(pid) {
         let _this = this
         let params = {
@@ -238,38 +175,11 @@
             console.error(err)
           })
       },
-      touploadnewdoc(val) {
-        this.$router.push({
-          path: `/documentmanage/${val}/uploadnewdoc`
-        })
-      },
       toadddoc() {
         this.$router.push({
           path: `/documentmanage/add?exid=${this.exId}`
         })
       },
-      //获取权限
-      getPermissions() {
-        let _this = this
-        // request
-        let params = {
-          percodes: `'${this.permissionscode.cellsdocumentadd}','${this.permissionscode.cellsdocumentedit}','${this.permissionscode.cellsdocumentdelete}'`
-        }
-        this.$axios.get('/permissions/isauths', {
-            params
-          })
-          .then(res => {
-            if (res.data instanceof Array && res.data.length > 0) {
-              res.data.forEach(element => {
-                _this.permissions[element.Code] = element.Isperm
-              });
-            }
-          })
-          .catch(err => {
-            // handle error
-            console.error(err)
-          })
-      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -11,7 +11,7 @@
           <el-main style="height:760px; padding:5px 20px 0 15px; background-color: #D3DCE6;">
             <div>
               <div style="height:365px; background-color: white;">
-                <div style="padding: 10px 0 0 15px;"><img src="../assets/img/tongzhigonggao.jpg" style="height: 40px; width: 100px;"></div>
+                <div style="padding: 10px 0 0 15px;"><img src="../assets/img/tongzhigonggao.jpg" alt="通知公告" style="height: 40px; width: 100px;"></div>
                 <div>
                   <ul type="circle">
                     <li>苹果</li>
@@ -22,13 +22,12 @@
                 </div>
               </div>
               <div style="height:365px; background-color: white; margin: 20px 0 0 0;">
-                <div style="padding: 10px 0 0 15px;"><img src="../assets/img/ziliaoxiazai.jpg" style="height: 40px; width: 100px;"></div>
+                <div style="padding: 10px 0 0 15px;"><img src="../assets/img/ziliaoxiazai.jpg" alt="资料下载" style="height: 40px; width: 100px;"></div>
                 <div>
                   <ul type="circle">
-                    <li>苹果</li>
-                    <li>香蕉</li>
-                    <li>柠檬</li>
-                    <li>桔子</li>
+                    <li v-for="item in list">
+                      {{ item.Name }} <a style="font-weight: 400; font-size: 10px;">({{ jstimehandle(item.AuthorOn) }})</a>
+                    </li>
                   </ul>
                 </div>
               </div>
@@ -83,12 +82,41 @@
       }
 
       return {
+        list: [], //文档列表
         loginMode: 1,
         model: model,
         rules: rules,
         error: null,
         loading: false
       }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      initData() {
+        let _this = this
+        _this.$axios.get("/document/getdocumentnameandtime", {})
+          .then(function (response) {
+            _this.list = response.data
+            console.log("***_this.list**",_this.list);
+          })
+          .catch(function (error) {
+            console.log(error);
+          });
+      },
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      }
     }
   })
   export default class Login extends Vue {