文档管理修改

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

@@ -5,27 +5,25 @@ import (
 )
 
 type DocumentInfo struct {
-	Id                int       `xorm:"<- not null pk autoincr INT(10)"`
-	DirectoryId       int       `xorm:"INT(11)"`
-	DirectoryName     string    `xorm:"VARCHAR(50)"`
-	Name              string    `xorm:"VARCHAR(50)"`
-	VersionInfo       string    `xorm:"VARCHAR(50)"`
-	FileURL           string    `xorm:"VARCHAR(500)"`
-	AuthorOn          time.Time `xorm:"DATETIME"`
-	AuthorUserId      int       `xorm:"INT(11)"`
-	AuthorBy          string    `xorm:"VARCHAR(50)"`
-	AuditorStatus     int       `xorm:"INT(11)"`
-	AuditorOn         time.Time `xorm:"DATETIME"`
-	AuditorUserId     int       `xorm:"INT(11)"`
-	AuditorBy         string    `xorm:"VARCHAR(50)"`
-	Remark            string    `xorm:"VARCHAR(500)"`
-	DeletionStateCode int       `xorm:"INT(10)"`
-	CreateUserId      int       `xorm:"INT(10)"`
-	CreateBy          string    `xorm:"VARCHAR(50)"`
-	CreateOn          time.Time `xorm:"DATETIME created"`
-	ModifiedUserId    int       `xorm:"INT(10)"`
-	ModifiedBy        string    `xorm:"VARCHAR(50)"`
-	ModifiedOn        time.Time `xorm:"DATETIME updated"`
+	Id           int       `xorm:"<- not null pk autoincr INT(10)"`
+	DirectoryId  int       `xorm:"INT(11)"`
+	Name         string    `xorm:"VARCHAR(50)"`
+	VersionInfo  string    `xorm:"VARCHAR(50)"`
+	NoticeTab    int       `xorm:"INT(2)"`
+	DocTab       int       `xorm:"INT(2)"`
+	FileURL      string    `xorm:"VARCHAR(500)"`
+	ValidityTime time.Time `xorm:"DATETIME"`
+	Remark       string    `xorm:"VARCHAR(500)"`
+	CreateOn     time.Time `xorm:"DATETIME created"`
+	CreateBy     string    `xorm:"VARCHAR(50)"`
+	ModifiedOn   time.Time `xorm:"DATETIME updated"`
+	ModifiedBy   string    `xorm:"VARCHAR(50)"`
+}
+
+//文档名与创建时间
+type DocumentNameTimeInfo struct {
+	Name     string    `xorm:"VARCHAR(50)"`
+	CreateOn time.Time `xorm:"DATETIME"`
 }
 
 type DocumentHistory struct {
@@ -69,9 +67,3 @@ 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,7 +1,6 @@
 package documentmanage
 
 import (
-	"fmt"
 	"strconv"
 
 	. "dashoo.cn/backend/api/mydb"
@@ -25,7 +24,7 @@ func (s *DocumentmanageService) GetDocumentNameAndTime(table string) []DocumentN
 	var err error
 	var sql string
 
-	sql = `select Name, AuthorOn from ` + table + ` ORDER BY AuthorOn DESC `
+	sql = `select Name, CreateOn from ` + table + ` ORDER BY CreateOn DESC `
 
 	List := make([]DocumentNameTimeInfo, 0)
 	err = utils.DBE.Sql(sql).Find(&List)

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

@@ -2,7 +2,6 @@ package document
 
 import (
 	"encoding/json"
-	"fmt"
 	"time"
 
 	"dashoo.cn/backend/api/business/documentmanage"
@@ -20,7 +19,7 @@ type DocumentController struct {
 // @router /getdocumentlist [get]
 func (this *DocumentController) GetDocumentList() {
 	page := this.GetPageInfoForm()
-	where := " DeletionStateCode=0 "
+	where := " 1=1 "
 	DirectoryId := this.GetString("DirectoryId")
 	if DirectoryId != "" {
 		where = where + " and DirectoryId = " + DirectoryId
@@ -42,7 +41,7 @@ func (this *DocumentController) GetDocumentList() {
 }
 
 // @Title 获取文档名与创建时间
-// @Description get Name,AuthorOn
+// @Description get Name,CreateOn
 // @Success 200 {object} models.Userblood
 // @router /getdocumentnameandtime [get]
 func (this *DocumentController) GetDocumentNameAndTime() {
@@ -64,9 +63,11 @@ func (this *DocumentController) AddDocumentInfo() {
 	var model documentmanage.DocumentInfo
 	var jsonblob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonblob, &model)
+	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
-	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
+
 	_, err := svc.InsertEntityBytbl(this.User.AccCode+DocumentInfoName, &model)
 	var errinfo ErrorDataInfo
 	if err == nil {
@@ -83,15 +84,12 @@ func (this *DocumentController) AddDocumentInfo() {
 	}
 }
 
-// @Title 删除文档信息
-// @Param id
-// @Success 200 {object} ErrorInfo
-// @Failure 403 :id 为空
-// @router /deletedocumentdata/:id [delete]
-func (this *DocumentController) DeleteDocumentData() {
+// @Title 编辑文档信息   DocumentInfo
+// @Success	200	{object} controllers.Request
+// @router /editdocumentinfo/:id [put]
+func (this *DocumentController) EditDocumentInfo() {
 	id := this.Ctx.Input.Param(":id")
 	var errinfo ErrorInfo
-	var err error
 	if id == "" {
 		errinfo.Message = "操作失败！请求信息不完整"
 		errinfo.Code = -2
@@ -99,32 +97,43 @@ func (this *DocumentController) DeleteDocumentData() {
 		this.ServeJSON()
 		return
 	}
+	var model documentmanage.DocumentInfo
+	var jsonblob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonblob, &model)
+
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
-	whereStr := "Id= " + utils.ToStr(id)
-	err = svc.DeleteEntityBytbl(this.User.AccCode+DocumentInfoName, whereStr)
 
+	var entityempty documentmanage.DocumentInfo
+	var docinfo documentmanage.DocumentInfo
+	svc.GetEntityByIdBytbl(this.User.AccCode+DocumentInfoName, id, &docinfo)
+
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	opdesc := "编辑文档-" + model.Name
+	var cols []string = []string{"DirectoryId", "Name", "VersionInfo", "NoticeTab", "DocTab", "FileURL",
+		"ValidityTime", "Remark", "CreateBy", "ModifiedOn", "ModifiedBy"}
+
+	err := svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
 	if err == nil {
-		errinfo.Message = "删除成功"
+		errinfo.Message = "保存成功！"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
-		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
+		errinfo.Message = "保存失败！" + utils.AlertProcess(err.Error())
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	}
 }
 
-// @Title 删除文档信息   DocumentInfo
-// @Description
+// @Title 删除文档信息
+// @Param id
 // @Success 200 {object} ErrorInfo
 // @Failure 403 :id 为空
-// @router /deletedocumentInfo/:id [delete]
-func (this *DocumentController) DeleteDocumentInfo() {
+// @router /deletedocumentdata/:id [delete]
+func (this *DocumentController) DeleteDocumentData() {
 	id := this.Ctx.Input.Param(":id")
-	Name := this.GetString("Name")
-	flag, _ := this.GetInt("flag")
 	var errinfo ErrorInfo
 	var err error
 	if id == "" {
@@ -135,49 +144,9 @@ func (this *DocumentController) DeleteDocumentInfo() {
 		return
 	}
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
-	var model documentmanage.DocumentInfo
-	var entityempty documentmanage.DocumentInfo
-	var dochistorys []documentmanage.DocumentHistory
-	where_infoid := "InfoId=" + id
-	if flag == 0 { //删除当前版本，最近一次历史版本将设为当前版本
-		svc.GetEntitysByOrderbyWhere(this.User.AccCode+DocumentHistoryName, where_infoid, " AuthorOn desc ", &dochistorys)
-		if len(dochistorys) > 0 { //如果存在历史版本，数据返回到最新更改的一次
-			model.Name = dochistorys[0].Name
-			model.VersionInfo = dochistorys[0].VersionInfo
-			model.FileURL = dochistorys[0].FileURL
-			model.AuthorOn = dochistorys[0].AuthorOn
-			model.AuthorUserId = dochistorys[0].AuthorUserId
-			model.AuthorBy = dochistorys[0].AuthorBy
-			model.AuditorStatus = 1
-			model.AuditorOn = dochistorys[0].AuditorOn
-			model.AuditorUserId = dochistorys[0].AuditorUserId
-			model.AuditorBy = dochistorys[0].AuditorBy
-			model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-			model.ModifiedBy = this.User.Realname
-			opdesc := "删除文档-" + Name
-			var cols []string = []string{"Name", "VersionInfo", "FileURL", "AuthorOn", "AuthorUserId",
-				"AuthorBy", "AuditorStatus", "AuditorOn", "AuditorUserId", "AuditorBy", "ModifiedUserId",
-				"ModifiedBy"}
-			err = svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
-			where_hisid := "Id=" + utils.ToStr(dochistorys[0].Id)
-			_ = svc.DeleteEntityBytbl(this.User.AccCode+DocumentHistoryName, where_hisid)
-		} else { //不存在历史版本，将删除标志置1
-			model.DeletionStateCode = 1
-			model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-			model.ModifiedBy = this.User.Realname
-			opdesc := "删除文档-" + Name
-			var cols []string = []string{"DeletionStateCode", "ModifiedUserId", "ModifiedBy"}
-			err = svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
-		}
-	} else if flag == 1 { //删除当前版本及所有历史版本文档
-		model.DeletionStateCode = 1
-		model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-		model.ModifiedBy = this.User.Realname
-		opdesc := "删除所有文档-" + Name
-		var cols []string = []string{"DeletionStateCode", "ModifiedUserId", "ModifiedBy"}
-		err = svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
-		svc.UpdateDocHistoryDelete(this.User.AccCode+DocumentHistoryName, where_infoid, "1")
-	}
+	whereStr := "Id= " + utils.ToStr(id)
+	err = svc.DeleteEntityBytbl(this.User.AccCode+DocumentInfoName, whereStr)
+
 	if err == nil {
 		errinfo.Message = "删除成功"
 		errinfo.Code = 0
@@ -191,6 +160,81 @@ func (this *DocumentController) DeleteDocumentInfo() {
 	}
 }
 
+// @Title 删除文档信息   DocumentInfo
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /deletedocumentInfo/:id [delete]
+//func (this *DocumentController) DeleteDocumentInfo() {
+//	id := this.Ctx.Input.Param(":id")
+//	Name := this.GetString("Name")
+//	flag, _ := this.GetInt("flag")
+//	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)
+//	var model documentmanage.DocumentInfo
+//	var entityempty documentmanage.DocumentInfo
+//	var dochistorys []documentmanage.DocumentHistory
+//	where_infoid := "InfoId=" + id
+//	if flag == 0 { //删除当前版本，最近一次历史版本将设为当前版本
+//		svc.GetEntitysByOrderbyWhere(this.User.AccCode+DocumentHistoryName, where_infoid, " AuthorOn desc ", &dochistorys)
+//		if len(dochistorys) > 0 { //如果存在历史版本，数据返回到最新更改的一次
+//			model.Name = dochistorys[0].Name
+//			model.VersionInfo = dochistorys[0].VersionInfo
+//			model.FileURL = dochistorys[0].FileURL
+//			model.AuthorOn = dochistorys[0].AuthorOn
+//			model.AuthorUserId = dochistorys[0].AuthorUserId
+//			model.AuthorBy = dochistorys[0].AuthorBy
+//			model.AuditorStatus = 1
+//			model.AuditorOn = dochistorys[0].AuditorOn
+//			model.AuditorUserId = dochistorys[0].AuditorUserId
+//			model.AuditorBy = dochistorys[0].AuditorBy
+//			model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+//			model.ModifiedBy = this.User.Realname
+//			opdesc := "删除文档-" + Name
+//			var cols []string = []string{"Name", "VersionInfo", "FileURL", "AuthorOn", "AuthorUserId",
+//				"AuthorBy", "AuditorStatus", "AuditorOn", "AuditorUserId", "AuditorBy", "ModifiedUserId",
+//				"ModifiedBy"}
+//			err = svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
+//			where_hisid := "Id=" + utils.ToStr(dochistorys[0].Id)
+//			_ = svc.DeleteEntityBytbl(this.User.AccCode+DocumentHistoryName, where_hisid)
+//		} else { //不存在历史版本，将删除标志置1
+//			model.DeletionStateCode = 1
+//			model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+//			model.ModifiedBy = this.User.Realname
+//			opdesc := "删除文档-" + Name
+//			var cols []string = []string{"DeletionStateCode", "ModifiedUserId", "ModifiedBy"}
+//			err = svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
+//		}
+//	} else if flag == 1 { //删除当前版本及所有历史版本文档
+//		model.DeletionStateCode = 1
+//		model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+//		model.ModifiedBy = this.User.Realname
+//		opdesc := "删除所有文档-" + Name
+//		var cols []string = []string{"DeletionStateCode", "ModifiedUserId", "ModifiedBy"}
+//		err = svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
+//		svc.UpdateDocHistoryDelete(this.User.AccCode+DocumentHistoryName, where_infoid, "1")
+//	}
+//	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 get user by token
 // @Success 200 {object} models.Userblood
@@ -206,55 +250,6 @@ func (this *DocumentController) Geteditinitinfo() {
 	this.ServeJSON()
 }
 
-// @Title 编辑文档信息   DocumentInfo
-// @Success	200	{object} controllers.Request
-// @router /editdocumentinfo/:id [put]
-func (this *DocumentController) EditDocumentInfo() {
-	id := this.Ctx.Input.Param(":id")
-	var errinfo ErrorInfo
-	if id == "" {
-		errinfo.Message = "操作失败！请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	var model documentmanage.DocumentInfo
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &model)
-	var entityempty documentmanage.DocumentInfo
-	svc := documentmanage.GetDocumentmanageService(utils.DBE)
-	var docinfo documentmanage.DocumentInfo
-	svc.GetEntityByIdBytbl(this.User.AccCode+DocumentInfoName, id, &docinfo)
-	model.AuthorOn = time.Now()
-	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-	model.ModifiedBy = this.User.Realname
-	opdesc := "编辑文档-" + model.Name
-	var cols []string = []string{"DirectoryId", "DirectoryName", "Name", "VersionInfo", "FileURL",
-		"AuthorOn", "AuthorUserId", "AuthorBy", "AuditorStatus", "Remark", "ModifiedUserId", "ModifiedBy"}
-	err := svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
-	if err == nil {
-		if (docinfo.FileURL != model.FileURL) && docinfo.AuditorStatus == 1 {
-			var dochistory documentmanage.DocumentHistory
-			utils.AutoMap(&dochistory, &docinfo)
-			dochistory.InfoId, _ = utils.StrTo(id).Int()
-			dochistory.CreateBy = this.User.Realname
-			dochistory.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-			svc := documentmanage.GetDocumentmanageService(utils.DBE)
-			_, _ = svc.InsertEntityBytbl(this.User.AccCode+DocumentHistoryName, &dochistory)
-		}
-		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 获取历史文档管理列表  DocumentInfoHistory
 // @Description get user by token
 // @Success 200 {object} models.Userblood
@@ -282,37 +277,37 @@ func (this *DocumentController) GetDocumentHistoryList() {
 // @Title 文档审核   DocumentInfo
 // @Success	200	{object} controllers.Request
 // @router /auditorDocumentinfo/:id [put]
-func (this *DocumentController) AuditorDocumentInfoById() {
-	id := this.Ctx.Input.Param(":id")
-	var errinfo ErrorInfo
-	if id == "" {
-		errinfo.Message = "操作失败！请求信息不完整"
-		errinfo.Code = -2
-		this.Data["json"] = &errinfo
-		this.ServeJSON()
-		return
-	}
-	var model documentmanage.DocumentInfo
-	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &model)
-	var entityempty documentmanage.DocumentInfo
-	svc := documentmanage.GetDocumentmanageService(utils.DBE)
-	model.AuditorUserId, _ = utils.StrTo(this.User.Id).Int()
-	model.AuditorBy = this.User.Realname
-	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-	model.ModifiedBy = this.User.Realname
-	opdesc := "文档审核-" + model.Name
-	var cols []string = []string{"AuditorStatus", "AuditorOn", "AuditorUserId", "AuditorBy", "ModifiedUserId", "ModifiedBy"}
-	err := svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
-	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()
-	}
-}
+//func (this *DocumentController) AuditorDocumentInfoById() {
+//	id := this.Ctx.Input.Param(":id")
+//	var errinfo ErrorInfo
+//	if id == "" {
+//		errinfo.Message = "操作失败！请求信息不完整"
+//		errinfo.Code = -2
+//		this.Data["json"] = &errinfo
+//		this.ServeJSON()
+//		return
+//	}
+//	var model documentmanage.DocumentInfo
+//	var jsonblob = this.Ctx.Input.RequestBody
+//	json.Unmarshal(jsonblob, &model)
+//	var entityempty documentmanage.DocumentInfo
+//	svc := documentmanage.GetDocumentmanageService(utils.DBE)
+//	model.AuditorUserId, _ = utils.StrTo(this.User.Id).Int()
+//	model.AuditorBy = this.User.Realname
+//	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+//	model.ModifiedBy = this.User.Realname
+//	opdesc := "文档审核-" + model.Name
+//	var cols []string = []string{"AuditorStatus", "AuditorOn", "AuditorUserId", "AuditorBy", "ModifiedUserId", "ModifiedBy"}
+//	err := svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+DocumentInfoName, BaseOperationLogName, id, &model, &entityempty, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "文档管理")
+//	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()
+//	}
+//}

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

@@ -35,11 +35,11 @@
               <el-input v-model="uploadform.VersionInfo" placeholder="请输入版本信息" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="编辑人" prop="AuthorBy">
-              <el-input v-model="uploadform.AuthorBy" placeholder="请输入编辑人"></el-input>
+          <!-- <el-col :span="12">
+            <el-form-item label="编辑人" prop="CreateBy">
+              <el-input v-model="uploadform.CreateBy" placeholder="请输入编辑人"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="备注">
               <el-input type="textarea" :rows="2" v-model="uploadform.Remark" placeholder="请输入备注信息" ></el-input>
@@ -137,9 +137,10 @@
           DirectoryId: '', //目录结构Id
           Name: '', //文档名称
           VersionInfo: '', //文档版本
+          NoticeTab: '', //通知公告标签
+          DocTab: '', //文件资料标签
           FileURL: '', //文档地址
-          AuthorOn: new Date(),//编辑时间
-          AuthorBy: '',//编辑人
+          ValidityTime: new Date(), //有效期至
           Remark: '', //备注
         },
         AuthorUser: '',
@@ -165,11 +166,11 @@
             message: '请填写版本信息',
             trigger: 'blur'
           }],
-          AuthorBy: [{
-            required: true,
-            message: '请输入编辑人',
-            trigger: 'blur'
-          }],
+          // CreateBy: [{
+          //   required: true,
+          //   message: '请输入编辑人',
+          //   trigger: 'blur'
+          // }],
         },
       }
     },

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

@@ -30,14 +30,22 @@
               <el-input v-model="uploadform.Name" placeholder="请输入文档名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
+            <el-form-item label="有效期至" prop="ValidityTime">
+              <el-date-picker type="datetime" placeholder="请选择有效期" v-model="uploadform.ValidityTime" style="width: 100%;"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="版本信息" prop="VersionInfo">
               <el-input v-model="uploadform.VersionInfo" placeholder="请输入版本信息"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="编辑人" prop="AuthorBy">
-              <el-input v-model="uploadform.AuthorBy" placeholder="请输入编辑人"></el-input>
+            <el-form-item label="文档类别" prop="typeList">
+              <el-checkbox-group v-model="uploadform.typeList">
+                <el-checkbox label="通知公告" name="typeList" border></el-checkbox>
+                <el-checkbox label="文件资料" name="typeList" border></el-checkbox>
+              </el-checkbox-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -141,10 +149,12 @@
           DirectoryId: '',
           Name: '',
           VersionInfo: '',
+          NoticeTab: '',
+          DocTab: '',
           FileURL: '',
-          AuthorOn: new Date(),
-          AuthorBy: '',
           Remark: '',
+          ValidityTime: '',
+          typeList: [], //文档类别列表
           JLDirectoryId: []
         },
         rules: {
@@ -158,14 +168,20 @@
             message: '请填写文档名称',
             trigger: 'blur'
           }],
+          ValidityTime: [{
+            required: true,
+            message: '请选择有效期',
+            trigger: 'blur'
+          }],
           VersionInfo: [{
             required: true,
             message: '请填写版本信息',
             trigger: 'blur'
           }],
-          AuthorBy: [{
+          typeList: [{
+            type: 'array',
             required: true,
-            message: '请输入编辑人',
+            message: '请至少选择一个文档类别',
             trigger: 'blur'
           }],
           Diseaseinfo: [{
@@ -242,6 +258,17 @@
               _this.uploadform.DirectoryId = parseInt(_this.uploadform.JLDirectoryId[_this.uploadform.JLDirectoryId
                 .length -
                 1])
+              // 设置文档类别的对应标签值
+              for (let i = 0; i < _this.uploadform.typeList.length; i++) {
+                let v = _this.uploadform.typeList[i]
+                switch (v) {
+                  case "通知公告": _this.uploadform.NoticeTab = 1 
+                  break;
+                  case "文件资料": _this.uploadform.DocTab = 1
+                  break;
+                  default: _this.uploadform.DocTab = 1
+                }
+              }
               _this.$axios.post('/document/adddocumentinfo', _this.uploadform)
                 .then(function (response) {
                   if (response.data.code === 0) {

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

@@ -53,10 +53,10 @@
             </el-table-column>
             <el-table-column prop="Name" label="文档名称" align="center" header-align="center" show-overflow-tooltip></el-table-column>
             <el-table-column prop="VersionInfo" label="文档版本" align="center" header-align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="AuthorBy" label="编辑人" align="center" header-align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="AuthorOn" label="编辑时间" align="center" header-align="center" show-overflow-tooltip>
+            <el-table-column prop="CreateBy" label="编辑人" align="center" header-align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="CreateOn" label="编辑时间" align="center" header-align="center" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ jstimehandle(scope.row.AuthorOn+'') }}
+                {{ jstimehandle(scope.row.CreateOn+'') }}
               </template>
             </el-table-column>
           </el-table>
@@ -87,11 +87,6 @@
         userdepartment: [],
         list: [], //文档列表
         exId: '323', //当前选中结构ID,默认基础文档id:323
-        deleteForm: {
-          Name: '',
-          Id: '',
-          flag: 0
-        },
         searchForm: {
           Name: '' //文档名称
         },

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

@@ -26,7 +26,7 @@
                 <div>
                   <ul type="circle">
                     <li v-for="item in list">
-                      {{ item.Name }} <a style="font-weight: 400; font-size: 10px;">({{ jstimehandle(item.AuthorOn) }})</a>
+                      {{ item.Name }} <a style="font-weight: 400; font-size: 10px;">({{ jstimehandle(item.CreateOn) }})</a>
                     </li>
                   </ul>
                 </div>
@@ -99,7 +99,6 @@
         _this.$axios.get("/document/getdocumentnameandtime", {})
           .then(function (response) {
             _this.list = response.data
-            console.log("***_this.list**",_this.list);
           })
           .catch(function (error) {
             console.log(error);