加热炉

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

@@ -36,8 +36,8 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	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://47.92.212.59:8080/acti-api/api/apose"
-	//s.OriginUrl = "http://localhost:8081/api"
-	s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"
+	s.OriginUrl = "http://localhost: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/limsdataentry.go

@@ -2,6 +2,7 @@ package lims
 
 import (
 	"dashoo.cn/backend/api/business/limsreportelecpumpwell"
+	"dashoo.cn/backend/api/business/limsreportheatingfurnace"
 	"dashoo.cn/backend/api/business/limsreportliquidtransportation"
 	"dashoo.cn/backend/api/business/limsreportmotor"
 	"dashoo.cn/backend/api/business/limsreportpistonpumpunit"
@@ -150,10 +151,6 @@ func (this *LimsDataEntryController) GetToDoList() {
 		processInstanceId = svcActiviti.GetMyTasks(workflow.TJZ_DATA_KEY, this.User.Id)
 	case "100000151":
 		processInstanceId = svcActiviti.GetMyTasks(workflow.YX_DATA_KEY, this.User.Id)
-	case "100000168":
-		processInstanceId = svcActiviti.GetMyTasks(workflow.YX_DATA_KEY, this.User.Id)
-	case "100000169":
-		processInstanceId = svcActiviti.GetMyTasks(workflow.YX_DATA_KEY, this.User.Id)
 	}
 	EntrustNo := this.GetString("EntrustNo")
 	testDetailId := this.GetString("TestDetailId")
@@ -1448,13 +1445,21 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			DocUrl = ""
 			err = errors.New("")
 		}
-	case limsdoctemplate.DAYT_REPORTALERTORBENDETECT_DETAIL:
-		// 苯气检测报警器检定记录
-		var model limsreportpistonpumpunit.LimsReportPistonPumpUnit
-		svc := limsreportpistonpumpunit.GetLimsReportPistonPumpUnitService(utils.DBE)
+	case limsdoctemplate.DAYT_REPORTHEATINGFURNACE_DETAIL:
+		// 加热炉
+		session := utils.DBE.NewSession()
+		var model limsreportheatingfurnace.LimsReportHeatingFurnace
+		svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
+		var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
 		where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
-		has := svc.GetEntityByWhere(this.User.AccCode+LimsReportPistonPumpUnitName, where1, &model)
+		has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
+		wheretable := "MId=" + strconv.Itoa(model.Id)
+		svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
 		datamap := StructToMapDemo(model)
+		datamap["HFProDate"] = model.HFProDate.Format("2006年01月02日")
+		datamap["CheckDate"] = model.CheckDate.Format("2006年01月02日")
+		datamap["BurnerProDate"] = model.BurnerProDate.Format("2006年01月02日")
+		datamap["TableData"] = tabledata
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var template limsdoctemplate.LimsDocTemplate
 		wheretem := "Id=" + strconv.Itoa(entrustlist[0].DocId)

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

@@ -46,8 +46,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName"
-        @sort-change="orderby" @selection-change="handleSelectionChange">
+      <el-table :data="taskbalacelist" border height="calc(100vh - 243px)" :row-class-name="tableRowClassName" @sort-change="orderby" @selection-change="handleSelectionChange">
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
         <el-table-column label="操作" width="180" align="center" fixed>
           <template slot-scope="scope">
@@ -125,8 +124,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="EntrustNo" sortable min-width="100" label="委托单号" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center"
-          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="DataEntryCode" sortable min-width="130" label="录入编码" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="CustomerName" sortable min-width="100" label="委托方名称" align="center"
           show-overflow-tooltip></el-table-column>
         <el-table-column prop="TestDetail" sortable min-width="100" label="检测明细项" align="center" show-overflow-tooltip></el-table-column>
@@ -145,24 +143,30 @@
         </el-table-column> -->
         <el-table-column sortable min-width="110" align="center" prop="CheckStatus" label="审核状态">
           <template slot-scope="scope">
-            <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="校核通过" type="success">
-            </el-alert>
-            <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核通过" type="success">
-            </el-alert>
-            <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="未校核" type="info">
-            </el-alert>
-            <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待校核" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.CheckStatus=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="校核未通过" type="error">
-            </el-alert>
+             <el-alert v-if="scope.row.CheckStatus=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+             title="校核通过"
+             type="success">
+             </el-alert>
+             <el-alert v-if="scope.row.CheckStatus=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+             title="审核通过"
+             type="success">
+             </el-alert>
+             <el-alert v-if="scope.row.CheckStatus=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+             title="未校核"
+             type="info">
+             </el-alert>
+              <el-alert v-if="scope.row.CheckStatus=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="待校核"
+              type="warning">
+               </el-alert>
+                <el-alert v-if="scope.row.CheckStatus=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过"
+              type="error">
+               </el-alert>
+               <el-alert v-if="scope.row.CheckStatus=='3'" :closable="false"  style="background:rgba(255,255,255,0.2)"
+               title="校核未通过"
+               type="error">
+                </el-alert>
           </template>
         </el-table-column>
         <el-table-column prop="Remark" sortable label="备注" align="center" show-overflow-tooltip></el-table-column>
@@ -259,7 +263,8 @@
       <el-form :model="dataentryForm" label-width="160px" ref="dataentryForm">
         <el-alert title="" description="请先访问网址 【weed1.labsop.cn:9390/3,0b86ca7a6f80】" type="warning" :closable="false">
         </el-alert>
-        <el-alert title="" description="解压到后,以管理员身份运行一下，即安装成功 " type="warning" :closable="false">
+        <el-alert title="" description="解压到后,以管理员身份运行一下，即安装成功 " type="warning"
+          :closable="false">
         </el-alert>
         <br />
         <el-alert title="文件保存修改注意！" description="请编辑完毕点击保存修改，不然您的修改将无效！" type="success" :closable="false">
@@ -338,7 +343,7 @@
         addsheetshow: false,
         dialogbuttonvisble: true,
         dialogTableVisible: false,
-        tooldownloaddialog: false,
+        tooldownloaddialog:false,
         CheckStatus: 0,
         EntryId: '',
         key: '',
@@ -469,6 +474,7 @@
         row,
         rowIndex
       }) {
+        console.log("-------wwwww",row)
         if (row.Recheck === 1) {
           return 'warning-row';
         }
@@ -486,27 +492,27 @@
       },
       //
       MoreCmdClick(cmd) {
-        if (cmd.Command == 'Open') {
+        if(cmd.Command == 'Open') {
           this.OpenOrignDataInput(cmd.row)
 
-        } else if (cmd.Command == 'JiaoHe') {
+        } else if(cmd.Command == 'JiaoHe') {
           this.jiaoheshowdialog(cmd.row)
 
-        } else if (cmd.Command == 'ShenHe') {
+        } else if(cmd.Command == 'ShenHe') {
           this.shenHeFunc(cmd.row)
 
-        } else if (cmd.Command == 'History') {
+        } else if(cmd.Command == 'History') {
           this.getvalues(cmd.row)
 
-        } else if (cmd.Command == 'OpenExcel') {
+        } else if(cmd.Command == 'OpenExcel') {
           this.docdownload(cmd.row)
 
-        } else if (cmd.Command == 'DownLoadExcel') {
+        } else if(cmd.Command == 'DownLoadExcel') {
           this.datadownload(cmd.row)
 
-        } else if (cmd.Command == 'Delete') {
+        } else if(cmd.Command == 'Delete') {
           this.deldataentry(cmd.row)
-        } else if (cmd.Command == 'DownloadTool') {
+        }else if(cmd.Command == 'DownloadTool') {
           this.tooldownload()
         }
 
@@ -520,11 +526,11 @@
       handleChange(value) {
         console.log(value);
       },
-      //工具下载
-      tooldownload() {
-        let url = "http://weed1.labsop.cn:9390/2,1080b2997d49"
-        window.open(url);
-        this.tooldownloaddialog = true
+       //工具下载
+      tooldownload(){
+          let url = "http://weed1.labsop.cn:9390/2,1080b2997d49"
+          window.open(url);
+          this.tooldownloaddialog = true
       },
       OpenOrignDataInput(row) {
 
@@ -589,7 +595,7 @@
               let fdocurl = docurl.DocUrl;
               let fname = docurl.DocName;
               console.log("---------docurl", res.data.item.DocUrl)
-              location.href = "http://" + fdocurl
+              location.href = "http://"+fdocurl
             }
           }).catch(err => {
             console.error(err)
@@ -633,7 +639,6 @@
           datastatus: this.CheckStatus,
           sign: '3'
         };
-        console.log("------doc", docTempType)
         switch (docTempType) {
           //漏电保护
           case "DAYT.LeakProtect.Detail":
@@ -712,101 +717,52 @@
               query: queryParams,
             });
             break
-            // 离心泵机组液体输送系统节能监测原始记录
-          case "DAYT.LiquidTransportation.Detail":
+          // 离心泵机组液体输送系统节能监测原始记录
+          case  "DAYT.LiquidTransportation.Detail":
             this.$router.push({
               path: '/lims/reportliquidtransportation/operation',
               query: queryParams
             })
             break
-            // 柱塞泵机组液体输送系统
+          // 柱塞泵机组液体输送系统
           case 'DAYT.ReportPistonPumpUnit.Detail':
             this.$router.push({
               path: '/lims/reportpistonpumpunit/operation',
               query: queryParams
             })
             break
-            // 电动机节能
+          // 电动机节能
           case 'DAYT.LimsReportMotor.Detail':
             this.$router.push({
               path: '/lims/reportmotor/operation',
               query: queryParams
             })
             break
-            // 电泵井节能
+          // 电泵井节能
           case 'DAYT.LimsReportElecPumpWell.Detail':
             this.$router.push({
               path: '/lims/reportelecpumpwell/operation',
               query: queryParams
             })
             break
-            // 螺杆泵
+          // 螺杆泵
           case 'DAYT.LimsReportScrewPump.Detail':
             this.$router.push({
               path: '/lims/reportscrewpump/operation',
               query: queryParams
             })
             break
-            // 油田专用变压器
+          // 油田专用变压器
           case 'DAYT.LimsReportSpecialField.Detail':
             this.$router.push({
               path: '/lims/reportspecialfield/operation',
               query: queryParams
             })
             break
-            //苯气检测报警器检定记录
-          case 'DAYT.ReportAlertorBenDetect.Detail':
-            this.$router.push({
-              path: '/lims/reportalertorbendetect/operation',
-              query: queryParams
-            })
-            break
-            //一氧化碳检测报警器检定记录
-          case 'DAYT.ReportAlertorCarbonDetect.Detail':
-            this.$router.push({
-              path: '/lims/reportalertorcarbondetect/operation',
-              query: queryParams
-            })
-            break
-            //复合气体检测报警器检定记录
-          case 'DAYT.ReportAlertorFHGasDetect.Detail':
-            this.$router.push({
-              path: '/lims/reportalertorfhgasdetect/operation',
-              query: queryParams
-            })
-            break
-            //可燃气体检测报警器检定记录
-          case 'DAYT.ReportAlertorKRGasDetect.Detail':
+          // 加热炉节能监测原始记录表
+          case 'DAYT.ReportHeatingFurnace.Detail':
             this.$router.push({
-              path: '/lims/reportalertorkrgasdetect/operation',
-              query: queryParams
-            })
-            break
-            //一氧化碳红外气体分析器检定记录
-          case 'DAYT.ReportAnalyzer1CarbonRedGas.Detail':
-            this.$router.push({
-              path: '/lims/reportanalyzer1carbonredgas/operation',
-              query: queryParams
-            })
-            break
-            //二氧化碳红外气体分析器检定记录
-          case 'DAYT.ReportAnalyzer2CarbonRedGas.Detail':
-            this.$router.push({
-              path: '/lims/reportanalyzer2carbonredgas/operation',
-              query: queryParams
-            })
-            break
-            //电化学氧测定仪检定记录
-          case 'DAYT.ReportDetectorElectOxygen.Detail':
-            this.$router.push({
-              path: '/lims/reportdetectorelectoxygen/operation',
-              query: queryParams
-            })
-            break
-            //硫化氢气体检测仪检定记录
-          case 'DAYT.ReportDetectorHSGas.Detail':
-            this.$router.push({
-              path: '/lims/reportdetectorHSgas/operation',
+              path: '/lims/reportheatingfurnace/operation',
               query: queryParams
             })
             break
@@ -1138,5 +1094,4 @@
     margin: 1rem 0 2rem;
     text-align: right;
   }
-
 </style>

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

@@ -632,9 +632,9 @@
       }
     },
     created () {
-      // this.EId = this.$route.query.eid
-      // this.TaskBalanceId = this.$route.query.tbid
-      this.DataEntryId = 17// this.$route.query.deid
+      this.EId = this.$route.query.eid
+      this.TaskBalanceId = this.$route.query.tbid
+      this.DataEntryId = this.$route.query.deid
       this.formData.DataEntryId = parseInt(this.DataEntryId)
       this.initData()
     },