数据录入，报告生成bug修改

src/dashoo.cn/backend/api/business/Limsreportyyaqf/LimsreportyyaqfService.go

@@ -329,11 +329,11 @@ func (s *LimsReportYyaqfService) DataToExcelReport(entrustMainEntity limsentrust
 		} else if qulify == 0 {
 			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C15", "    依据《"+DetectBasis+"》标准，检测数据不符合标准要求，检测结论：不合格。")
 		}
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B35", reportmainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "E35", reportmainlist.JHBy)     //校核人签名
-		if createreportlist.ConUserBy != "" {
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "I35", createreportlist.ConUserBy) //批准人签名
-		}
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B35", reportmainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "E35", reportmainlist.JHBy)     //校核人签名
+		// if createreportlist.ConUserBy != "" {
+		// 	xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "I35", createreportlist.ConUserBy) //批准人签名
+		// }
 		//插入主检人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(i+sheetIdx), "B35", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": false, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/Limsreportzuhq/LimsreportzuhqService.go

@@ -197,11 +197,11 @@ func (s *LimsreportzuhqService) DataToExcelReport(
 		} else if qulify == 0 {
 			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C14", "    依据《"+DetectBasis+"》标准，检测数据不符合标准要求，检测结论：不合格。")
 		}
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C36", reportmainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "F36", reportmainlist.JHBy)     //校核人签名
-		if createreportlist.ConUserBy != "" {
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "I36", createreportlist.ConUserBy) //批准人签名
-		}
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C36", reportmainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "F36", reportmainlist.JHBy)     //校核人签名
+		// if createreportlist.ConUserBy != "" {
+		// 	xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "I36", createreportlist.ConUserBy) //批准人签名
+		// }
 		//插入主检人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(i+sheetIdx), "C36", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": false, "positioning": "absolute "}`)
 		if pictureerr != nil {

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

@@ -23,14 +23,14 @@ type QianfaModel struct {
 	AuditorRemark string
 }
 type QianfaListModel struct {
-	Id           int
-	EId          int
-	ReportName   string
-	SignTrans    string
-	ReceiveBy    string
-	ReportUrl    string
-	TemplateId   int
-	TransTime    time.Time
+	Id         int
+	EId        int
+	ReportName string
+	SignTrans  string
+	ReceiveBy  string
+	ReportUrl  string
+	TemplateId int
+	TransTime  time.Time
 }
 
 type LimsCreateReport struct {
@@ -43,6 +43,7 @@ type LimsCreateReport struct {
 	FlowKey        string    `xorm:VARCHAR(50)`
 	TestDetail     string    `xorm:VARCHAR(50)`
 	TemplateId     int       `xorm:"INT(10)"`
+	DocName        string    `xorm:VARCHAR(255)`
 	ReportUrl      string    `xorm:VARCHAR(255)`
 	UnHGReportUrl  string    `xorm:VARCHAR(255)`
 	CheckRemark    string    `xorm:VARCHAR(255)`
@@ -99,46 +100,46 @@ type ReportTemplateModel struct {
 }
 
 type DataEntryEntrustModel struct {
-	Id             int       `xorm:"not null pk autoincr INT(10)"`
-	EId            int       `xorm:"INT(10)"`
-	DataEntryId    int       `xorm:"INT(10)"`
-	DocKey         string    `xorm:"VARCHAR(50)"`
-	TaskId         int       `xorm:"INT(10)"`
-	DocAddress     string    `xorm:VARCHAR(255)`
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:"INT(10)"`
+	DataEntryId        int       `xorm:"INT(10)"`
+	DocKey             string    `xorm:"VARCHAR(50)"`
+	TaskId             int       `xorm:"INT(10)"`
+	DocAddress         string    `xorm:VARCHAR(255)`
 	CreateReportStatus int       `xorm:"INT(11)"`
-	DocType        string    `xorm:VARCHAR(50)`
-	DocId          int       `xorm:"INT(10)"`
-	DocVersion     string    `xorm:VARCHAR(50)`
-	DocName        string    `xorm:VARCHAR(50)`
-	CheckStatus    int       `xorm:"INT(10)"`
-	EntrustNo      string    `xorm:"VARCHAR(50)"`
-	EntrustTime    time.Time `xorm:"DATETIME"`
-	EndTime        time.Time `xorm:"DATETIME"`
-	EntrustStatus  int       `xorm:"INT(10)"`
-	AuditorRemark  string    `xorm:"VARCHAR(255)"`
-	DeliverStatus  int       `xorm:"INT(10)"`
-	ReportStatus   int       `xorm:"INT(10)"`
-	EntrustType    string    `xorm:VARCHAR(50)`
-	EntrustTypeId  int       `xorm:"INT(10)"`
-	CustomerId     int       `xorm:"INT(10)"`
-	CustomerName   string    `xorm:VARCHAR(50)`
-	ProjectType    string    `xorm:VARCHAR(50)`
-	ProjectTypeId  int       `xorm:"INT(10)"`
-	DetectSample   string    `xorm:"VARCHAR(50)"`
-	DetectSampleId int       `xorm:"INT(10)"`
-	Samplelist     string    `xorm:VARCHAR(50)`
-	SampleNum      float32   `xorm:"FLOAT"`
-	Unit           string    `xorm:VARCHAR(50)`
-	Remarks        string    `xorm:VARCHAR(255)`       //描述
-	CreatedTime    time.Time `xorm:"DATETIME created"` //创建时间
-	CreateOn       time.Time `xorm:"DATETIME created"` //创建时间
-	CreateUserId   int       `xorm:"INT(10)"`
-	DataEntryUserId   int       `xorm:"INT(10)"`
-	DataEntryBy       string    `xorm:"VARCHAR(50)"` //创建人
-	CreateBy       string    `xorm:"VARCHAR(50)"` //创建人
-	ModifiedOn     time.Time `xorm:"DATETIME updated"`
-	ModifiedUserId int       `xorm:"INT(10)"`
-	ModifiedBy     string    `xorm:"VARCHAR(50)"`
+	DocType            string    `xorm:VARCHAR(50)`
+	DocId              int       `xorm:"INT(10)"`
+	DocVersion         string    `xorm:VARCHAR(50)`
+	DocName            string    `xorm:VARCHAR(50)`
+	CheckStatus        int       `xorm:"INT(10)"`
+	EntrustNo          string    `xorm:"VARCHAR(50)"`
+	EntrustTime        time.Time `xorm:"DATETIME"`
+	EndTime            time.Time `xorm:"DATETIME"`
+	EntrustStatus      int       `xorm:"INT(10)"`
+	AuditorRemark      string    `xorm:"VARCHAR(255)"`
+	DeliverStatus      int       `xorm:"INT(10)"`
+	ReportStatus       int       `xorm:"INT(10)"`
+	EntrustType        string    `xorm:VARCHAR(50)`
+	EntrustTypeId      int       `xorm:"INT(10)"`
+	CustomerId         int       `xorm:"INT(10)"`
+	CustomerName       string    `xorm:VARCHAR(50)`
+	ProjectType        string    `xorm:VARCHAR(50)`
+	ProjectTypeId      int       `xorm:"INT(10)"`
+	DetectSample       string    `xorm:"VARCHAR(50)"`
+	DetectSampleId     int       `xorm:"INT(10)"`
+	Samplelist         string    `xorm:VARCHAR(50)`
+	SampleNum          float32   `xorm:"FLOAT"`
+	Unit               string    `xorm:VARCHAR(50)`
+	Remarks            string    `xorm:VARCHAR(255)`       //描述
+	CreatedTime        time.Time `xorm:"DATETIME created"` //创建时间
+	CreateOn           time.Time `xorm:"DATETIME created"` //创建时间
+	CreateUserId       int       `xorm:"INT(10)"`
+	DataEntryUserId    int       `xorm:"INT(10)"`
+	DataEntryBy        string    `xorm:"VARCHAR(50)"` //创建人
+	CreateBy           string    `xorm:"VARCHAR(50)"` //创建人
+	ModifiedOn         time.Time `xorm:"DATETIME updated"`
+	ModifiedUserId     int       `xorm:"INT(10)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
 }
 
 //关联委托方表 获取委托列表
@@ -206,22 +207,22 @@ type LimsDeliver struct {
 	ModifiedUserId  int       `xorm:"INT(10)"`
 	ModifiedBy      string    `xorm:"VARCHAR(50)"`
 }
-type LimsReportSign struct{
-	Id              int       `xorm:"not null pk autoincr INT(10)"`
-	ReportId        int       `xorm:"INT(10)"`
-	ReportStatus	int       `xorm:"INT(10)"`
-	ReportCode		string    `xorm:VARCHAR(255)`
-	ReportName		string    `xorm:VARCHAR(255)`
-	SignTrans		string    `xorm:VARCHAR(255)`
-	ReceiveBy		string    `xorm:VARCHAR(255)`
-	TransTime		time.Time `xorm:"DATETIME created"`
-	Remark          string    `xorm:VARCHAR(255)`
-	CreateOn        time.Time `xorm:"DATETIME created"` //创建时间
-	CreateUserId    int       `xorm:"INT(10)"`
-	CreateBy        string    `xorm:"VARCHAR(50)"` //创建人
-	ModifiedOn      time.Time `xorm:"DATETIME updated"`
-	ModifiedUserId  int       `xorm:"INT(10)"`
-	ModifiedBy      string    `xorm:"VARCHAR(50)"`
+type LimsReportSign struct {
+	Id             int       `xorm:"not null pk autoincr INT(10)"`
+	ReportId       int       `xorm:"INT(10)"`
+	ReportStatus   int       `xorm:"INT(10)"`
+	ReportCode     string    `xorm:VARCHAR(255)`
+	ReportName     string    `xorm:VARCHAR(255)`
+	SignTrans      string    `xorm:VARCHAR(255)`
+	ReceiveBy      string    `xorm:VARCHAR(255)`
+	TransTime      time.Time `xorm:"DATETIME created"`
+	Remark         string    `xorm:VARCHAR(255)`
+	CreateOn       time.Time `xorm:"DATETIME created"` //创建时间
+	CreateUserId   int       `xorm:"INT(10)"`
+	CreateBy       string    `xorm:"VARCHAR(50)"` //创建人
+	ModifiedOn     time.Time `xorm:"DATETIME updated"`
+	ModifiedUserId int       `xorm:"INT(10)"`
+	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }
 type LimsReportHistory struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
@@ -230,14 +231,14 @@ type LimsReportHistory struct {
 	Version        string    `xorm:"not null default '0' comment('版本') VARCHAR(50)"`
 	Address        string    `xorm:"not null default '0' comment('地址') VARCHAR(255)"`
 	SaveTime       time.Time `xorm:"comment('保存时间') DATETIME"`
-	CreateOn        time.Time `xorm:"DATETIME created"` //创建时间
-	CreateUserId    int       `xorm:"INT(10)"`
-	CreateBy        string    `xorm:"VARCHAR(50)"` //创建人
-	ModifiedOn      time.Time `xorm:"DATETIME updated"`
-	ModifiedUserId  int       `xorm:"INT(10)"`
-	ModifiedBy      string    `xorm:"VARCHAR(50)"`
+	CreateOn       time.Time `xorm:"DATETIME created"` //创建时间
+	CreateUserId   int       `xorm:"INT(10)"`
+	CreateBy       string    `xorm:"VARCHAR(50)"` //创建人
+	ModifiedOn     time.Time `xorm:"DATETIME updated"`
+	ModifiedUserId int       `xorm:"INT(10)"`
+	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }
-type ReportModel struct{
+type ReportModel struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
 	EId            int       `xorm:"INT(10)"`
 	ReportCode     string    `xorm:VARCHAR(50)`

src/dashoo.cn/backend/api/business/limsdataentry/limsdataentryService.go

@@ -246,7 +246,7 @@ func (s *LimsDataEntryService) GetDataEntryEntrust(dataentrytable string, taskba
 //根据用户角色获取用户列表
 func (s *LimsDataEntryService) GetUserByRole(roleid string, acccode string) (utree []userRole.Base_RoleList) {
 	users := make([]userRole.Base_RoleList, 0)
-	userlist := utils.RBAC.GetUsersForRoleInDomain("rid_"+roleid,utils.DOMAIN)
+	userlist := utils.RBAC.GetUsersForRoleInDomain("rid_"+roleid, utils.DOMAIN)
 	for _, userid := range userlist {
 		userid = strings.Trim(userid, "uid_")
 		s.DBE.SQL("SELECT Id,Realname FROM Base_User WHERE id = " + userid).Find(&users)

src/dashoo.cn/backend/api/business/limsreportbeampumpingunits/limsreportbeampumpingunitsService.go

@@ -407,11 +407,11 @@ func (s *LimsReportBeamPumpingUnitsService) DataToExcelReport(
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "G16", reportList[i].RetarderTemp)
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "G17", noise)
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "G18", radius)
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B33", reportmainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "E33", reportmainlist.JHBy) //校核人签名
-		if createreportlist.ConUserBy != ""{
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "H33", createreportlist.ConUserBy) //批准人签名
-		}
+		//xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B33", reportmainlist.CreateBy) //主检人签名
+		//xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "E33", reportmainlist.JHBy) //校核人签名
+		// if createreportlist.ConUserBy != ""{
+		// 	xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "H33", createreportlist.ConUserBy) //批准人签名
+		// }
 		//插入主检人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(i+sheetIdx), "B33", "./"+photo, `{"x_offset": 15, "y_offset": 6,"lock_aspect_ratio": false,"locked": false, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreporthuxf/limsreporthuxfService.go

@@ -380,11 +380,11 @@ func (s *LimsReportHuxfService) DataToExcelReport(entrustMainEntity limsentrust.
 		} else if qulify == 0 {
 			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B17", "    依据《"+DetectBasis+"》标准，检测数据不符合标准要求，检测结论：不合格。")
 		}
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B23", reportmainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "D23", reportmainlist.JHBy)     //校核人签名
-		if createreportlist.ConUserBy != "" {
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "G23", createreportlist.ConUserBy) //批准人签名
-		}
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B23", reportmainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "D23", reportmainlist.JHBy)     //校核人签名
+		// if createreportlist.ConUserBy != "" {
+		// 	xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "G23", createreportlist.ConUserBy) //批准人签名
+		// }
 		//插入主检人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(i+sheetIdx), "B23", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": false, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreportkqpm/LimsreportkqpmService.go

@@ -198,11 +198,11 @@ func (s *LimsReportkqpmService) DataToExcelReport(entrustMainEntity limsentrust.
 		} else if qulify == 0 {
 			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C14", "    依据《"+DetectBasis+"》标准，检测数据不符合标准要求，检测结论：不合格。")
 		}
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B35", reportmainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "D35", reportmainlist.JHBy)     //校核人签名
-		if createreportlist.ConUserBy != "" {
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "H35", createreportlist.ConUserBy) //批准人签名
-		}
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "B35", reportmainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "D35", reportmainlist.JHBy)     //校核人签名
+		// if createreportlist.ConUserBy != "" {
+		// 	xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "H35", createreportlist.ConUserBy) //批准人签名
+		// }
 		//插入主检人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(i+sheetIdx), "B35", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": false, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/limsreportnobeampumpingunits/limsreportnobeampumpingunitsService.go

@@ -410,11 +410,11 @@ func (s *LimsReportNoBeamPumpingUnitsService) DataToExcelReport(
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "I17", noise)
 		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "I18", radius)
 
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C35", reportmainlist.CreateBy) //主检人签名
-		xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "G35", reportmainlist.JHBy) //校核人签名
-		if createreportlist.ConUserBy != ""{
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "K35", createreportlist.ConUserBy) //批准人签名
-		}
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "C35", reportmainlist.CreateBy) //主检人签名
+		// xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "G35", reportmainlist.JHBy) //校核人签名
+		// if createreportlist.ConUserBy != ""{
+		// 	xlsx.SetCellValue("Sheet"+strconv.Itoa(i+sheetIdx), "K35", createreportlist.ConUserBy) //批准人签名
+		// }
 		//插入主检人签名
 		pictureerr := xlsx.AddPicture("Sheet"+strconv.Itoa(i+sheetIdx), "C35", "./"+photo, `{"x_offset": 2, "y_offset": 2,"lock_aspect_ratio": false,"locked": false, "positioning": "absolute "}`)
 		if pictureerr != nil {

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -35,9 +35,9 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	//s.BaseUrl = "http://192.168.0.165:8081/api/acti"
 	s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
 	//s.BaseUrl = "http://192.168.0.171:8081/api/acti"
-	s.AposeUrl = "http://192.168.0.171:8081/api/apose"
-	s.OriginUrl = "http://192.168.0.171:8081/api"
-	//s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
+	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
+	//s.OriginUrl = "http://192.168.0.171:8081/api"
+	s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
 	//s.AposeUrl = "http://localhost:8081/api/apose"
 	//s.AposeUrl = "http://192.168.0.171:8081/api/apose"
 	s.Username = "leader"

src/dashoo.cn/backend/api/controllers/lims/limsbalance.go

@@ -185,7 +185,7 @@ func (this *LimsBalanceController) GetUserList() {
 			userIds += strconv.FormatInt(tmpUser.Id,10) + ","
 		}
 		userIds = strings.Trim(userIds, ",")
-		where = where + " and Id like '%" + userIds + "%'"
+		where = where + " and Id in (" + userIds + ")"
 	}
 	total := svc.GetPagingEntitiesWithOrder(page.CurrentPage, page.Size, "Id", false, &users, where)
 	var datainfo DataInfo

src/dashoo.cn/backend/api/controllers/lims/limscreatereport.go

@@ -709,6 +709,7 @@ func (this *CreateReportController) ReportCreateThen(reportUrl string, UnHGRepor
 	var reportEntity limscreatereport.LimsCreateReport
 	reportEntity.ReportUrl = reportUrl
 	reportEntity.UnHGReportUrl = UnHGReportUrl
+	reportEntity.DocName = datalist[0].DocName
 	reportEntity.EId, _ = utils.StrTo(strconv.Itoa(datalist[0].Id)).Int()
 	reportEntity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 	reportEntity.CreateBy = this.User.Realname

src/dashoo.cn/frontend_web/src/pages/lims/createreport/allreport.vue

@@ -45,7 +45,7 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby"
-        @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" :span-method="objectSpanMethod">
+        @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
         <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">

src/dashoo.cn/frontend_web/src/pages/lims/createreport/docviewframe.vue

@@ -24,7 +24,7 @@
     mapGetters
   } from 'vuex'
   export default {
-    name: 'onlyofficesframe',
+    name: 'docviewframe',
     data() {
       return {
         key: '',
@@ -44,7 +44,8 @@
     created() {
       this.key = this.$route.query.key+''+Date.parse(new Date())
       this.docurl = this.$route.query.docurl
-      this.iframeSrc = "../dataentry/pdfshow?key=" + this.key + "&docurl=http://" + this.docurl
+      this.docname = this.$route.query.docname
+      this.iframeSrc = "../dataentry/pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
     },
     methods: {
       // 返回

src/dashoo.cn/frontend_web/src/pages/lims/createreport/index.vue

@@ -45,7 +45,7 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby"
-        @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" :span-method="objectSpanMethod">
+        @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
         <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">

src/dashoo.cn/frontend_web/src/pages/lims/createreport/onlyofficesframe.vue

@@ -75,15 +75,17 @@
         docurl:'',
         RealName:'',
         iframeSrc: '',
-        dialogMakeSure: false
+        dialogMakeSure: false,
+        docname: ''
       }
     },
     created() {
       this.key = this.$route.query.key+''+Date.parse(new Date())
       this.docurl = this.$route.query.docurl
       this.reportId = this.$route.query.reportId
+      this.docname = this.$route.query.docname
       //this.iframeSrc = "./onlyofficeshow?key=" + this.key + "&docurl=http://" + this.docurl
-      this.iframeSrc = "../dataentry/pdfshow?key=" + this.key + "&docurl=http://" + this.docurl
+      this.iframeSrc = "../dataentry/pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
     },
     methods: {
       // 返回

src/dashoo.cn/frontend_web/src/pages/lims/createreport/reporttodo.vue

@@ -45,7 +45,7 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby"
-        @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" :span-method="objectSpanMethod">
+        @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
         <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">
@@ -365,6 +365,7 @@
         //访问接口
         api.getTodoList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
+          console.log("------this.entityList----",this.entityList)
           //this.getSpanArr(this.entityList)
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -519,7 +520,8 @@
         let queryParams = {
           key: row.Id + '' + row.EId,
           docurl: this.reportaddress,
-          reportId: row.Id
+          reportId: row.Id,
+          docname : row.DocName
         }
         _this.$router.push({
           path: '/lims/createreport/shenheframe',
@@ -536,7 +538,8 @@
         let queryParams = {
           key: row.Id + '' + row.EId,
           docurl: this.reportaddress,
-          reportId: row.Id
+          reportId: row.Id,
+          docname : row.DocName
         }
         _this.$router.push({
           path: '/lims/createreport/onlyofficesframe',
@@ -653,7 +656,8 @@
         let queryParams = {
           key: row.Id + '' + row.EId,
           docurl: this.reportaddress,
-          reportId: row.Id
+          reportId: row.Id,
+          docname : row.DocName
         }
         _this.$router.push({
           path: '/lims/createreport/docviewframe',

src/dashoo.cn/frontend_web/src/pages/lims/createreport/shenheframe.vue

@@ -76,15 +76,17 @@
         docurl: '',
         RealName: '',
         iframeSrc: '',
-        dialogMakeSure: false
+        dialogMakeSure: false,
+        docname:''
       }
     },
     created() {
       this.key = this.$route.query.key + '' + Date.parse(new Date())
       this.docurl = this.$route.query.docurl
       this.reportId = this.$route.query.reportId
+      this.docname = this.$route.query.docname
       //this.iframeSrc = "./onlyofficeshow?key=" + this.key + "&docurl=http://" + this.docurl
-      this.iframeSrc = "../dataentry/pdfshow?key=" + this.key + "&docurl=http://" + this.docurl
+      this.iframeSrc = "../dataentry/pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
     },
     methods: {
       // 返回

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/docviewframe.vue

@@ -49,7 +49,7 @@
       this.key = this.$route.query.key+''+Date.parse(new Date())
       this.docurl = this.$route.query.docurl
       this.docname = this.$route.query.docname
-      console.log("-----this.docname----",this.docname)
+      console.log("-----this.docname1----",this.docname)
       this.iframeSrc = "./pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
 
     },

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/index.vue

@@ -703,7 +703,8 @@
         let queryParams = {
           key: row.DocKey,
           docurl: DocAddress,
-          dataentryId: row.Id
+          dataentryId: row.Id,
+          docname : row.DocName
         }
         _this.$router.push({
           path: '/lims/dataentry/docviewframe',

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/onlyofficesframe.vue

@@ -78,15 +78,17 @@
         docurl:'',
         RealName:'',
         iframeSrc: '',
-        dialogMakeSure: false
+        dialogMakeSure: false,
+        docname: ''
       }
     },
     created() {
       this.key = this.$route.query.key+''+Date.parse(new Date())
       this.docurl = this.$route.query.docurl
       this.dataentryId = this.$route.query.dataentryId
+      this.docname = this.$route.query.docname
       //this.iframeSrc = "./onlyofficeshow?key=" + this.key + "&docurl=http://" + this.docurl
-      this.iframeSrc = "./pdfshow?key=" + this.key + "&docurl=http://" + this.docurl
+      this.iframeSrc = "./pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
       //this.iframeSrc = "http://" + this.docurl
       console.log("------ifane===",this.iframeSrc)
 

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/pdfshow.vue

@@ -18,7 +18,7 @@
         baseurl: process.env.baseURL,
         docurl: '',
         docname: '',
-        docnamear: ''
+        docnamear: []
       }
     },
     created() {

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/showreportframe.vue

@@ -56,15 +56,17 @@
         docurl:'',
         RealName:'',
         iframeSrc: '',
-        dialogMakeSure: false
+        dialogMakeSure: false,
+        docname: ''
       }
     },
     created() {
       this.key = this.$route.query.key+''+Date.parse(new Date())
       this.docurl = this.$route.query.docurl
       this.dataentryId = this.$route.query.dataentryId
+      this.docname = this.$route.query.docname
       //this.iframeSrc = "./onlyofficeshow?key=" + this.key + "&docurl=http://" + this.docurl
-      this.iframeSrc = "./pdfshow?key=" + this.key + "&docurl=http://" + this.docurl
+      this.iframeSrc = "./pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
       console.log("------ifane===",this.iframeSrc)
 
     },

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/tacktodo.vue

@@ -569,7 +569,8 @@
         let queryParams = {
           key: row.DocKey,
           docurl: DocAddress,
-          dataentryId: row.Id
+          dataentryId: row.Id,
+          docname : row.DocName
         }
         _this.$router.push({
           path: '/lims/dataentry/onlyofficesframe',

src/dashoo.cn/frontend_web/src/pages/lims/tasksentrust/_opera/operation.vue

@@ -1402,6 +1402,7 @@
             docTempType = this.docTemplateDictList[idx].TemplateCode;
           }
         }
+        console.log("-----docTempType------",docTempType)
         if (val != "") {
           if (docTempType === "DAYT.LightProtect.Report" || docTempType === "DAYT.Equipotent.Report") {
             this.lightpermission = true
@@ -1414,6 +1415,7 @@
           .then(res => {
             // response
             _this.partuserlist = res.data.items
+            console.log("---_this.partuserlist----",_this.partuserlist)
           })
           .catch(err => {
             // handle error