离心泵校核

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

@@ -3,6 +3,7 @@ package limsdataentry
 import (
 	"fmt"
 	"strconv"
+	"strings"
 
 	"dashoo.cn/business2/userRole"
 
@@ -245,8 +246,13 @@ 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)
-	s.DBE.Sql(` select a.UserId Id, b.Realname RealName FROM Base_UserRole a ` +
-		" left join Base_User b on a.UserId=b.Id " +
-		`where a.RoleId =` + roleid + ` and b.Realname is not null and b.AccCode = '` + acccode + `' `).Find(&users)
+	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)
+	}
+	//s.DBE.Sql(` select a.UserId Id, b.Realname RealName FROM Base_UserRole a ` +
+	//	" left join Base_User b on a.UserId=b.Id " +
+	//	`where a.RoleId =` + roleid + ` and b.Realname is not null and b.AccCode = '` + acccode + `' `).Find(&users)
 	return users
 }

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

@@ -69,6 +69,11 @@ type LimsHeatingFurnaceItems struct {
 	CarbonDioxide      float64   `xorm:"comment('二氧化碳') DECIMAL(10,2)"`
 }
 
+type LimsHeatingFurnaceItemsView struct {
+	LimsHeatingFurnaceItems `xorm:"extends"`
+	TestTimeStr             string `xorm:"-"`
+}
+
 type HeatingFurnaceData struct {
 	TableData []LimsHeatingFurnaceItems
 	FormData  LimsReportHeatingFurnace

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

@@ -1463,11 +1463,12 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 		session := utils.DBE.NewSession()
 		var model limsreportheatingfurnace.LimsReportHeatingFurnace
 		svc := limsreportheatingfurnace.GetLimsReportHeatingFurnaceSessionService(session)
-		var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItems
+		var tabledata []limsreportheatingfurnace.LimsHeatingFurnaceItemsView
 		where1 := "DataEntryId=" + strconv.Itoa(dataentrylist.Id)
 		has := svc.GetEntityByWhere(this.User.AccCode+LimsReportHeatingFurnaceName, where1, &model)
 		wheretable := "MId=" + strconv.Itoa(model.Id)
-		svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		//svc.GetEntitysByWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable, &tabledata)
+		svc.GetEntitysByOrderbyWhere(this.User.AccCode+LimsHeatingFurnaceItemsName, wheretable,"OrderNo desc" ,&tabledata)
 		datamap := StructToMapDemo(model)
 		datamap["HFProDate"] = model.HFProDate.Format("2006年01月02日")
 		datamap["CheckDate"] = model.CheckDate.Format("2006年01月02日")
@@ -1475,6 +1476,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 
 		var interfaceSlice []interface{} = make([]interface{}, len(tabledata))
 		for i, d := range tabledata {
+			d.TestTimeStr = d.TestTime.Format("2006-01-02")
 			interfaceSlice[i] = d
 		}
 		datamap["TableData"] = workflow.TableDetailData{
@@ -1482,7 +1484,7 @@ func (this *LimsDataEntryController) exportdatatoexcel(fileurl string, dataentry
 			StartRow: 9,
 			NeedDelRow: 5,
 			ReverseRow: 0,
-			Cols: []string{"OrderNo","TestTime","LeftTemperature1","LeftTemperature2","LeftTemperature3","LeftTemperature4",
+			Cols: []string{"OrderNo","TestTimeStr","LeftTemperature1","LeftTemperature2","LeftTemperature3","LeftTemperature4",
 			"RichtTemperature1","RichtTemperature2","RichtTemperature3","RichtTemperature4","ExhaustTemperature","Oxygen","SulfurDioxide","CarbonMonoxide","CarbonDioxide"},
 			Merge: []string{"2,3","3,4","5,6","6,7","7,8","8,9","9,10","10,12","11,12","12,13"},
 			ColsNum: 26,
@@ -2594,8 +2596,12 @@ func (this *LimsDataEntryController) GetUserListByJHRole() {
 		users = svc.GetUserByRole("10000177", this.User.AccCode)
 	case "100000151":
 		users = svc.GetUserByRole("10000181", this.User.AccCode)
+	case "100000169":
+		users = svc.GetUserByRole("10000195", this.User.AccCode)
 	}
 
+
+
 	this.Data["json"] = users
 	this.ServeJSON()
 }

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

@@ -878,7 +878,55 @@
               query: queryParams
             })
             break
-
+          // 离心泵机组液体输送系统节能监测原始记录
+          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.ReportHeatingFurnace.Detail':
+            this.$router.push({
+              path: '/lims/reportheatingfurnace/operation',
+              query: queryParams
+            })
+            break
           default:
             this.$message.warning('无模板类型相匹配，请重试')
         }

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

@@ -10,9 +10,19 @@
         <span>
           <i class="icon icon-table2"></i> 编辑
         </span>
-        <span style="float: right;">
-          <!--<el-button type="primary" size="mini" @click="saveEntity">保存</el-button>-->
-          <router-link :to="'/lims/dataentry'">
+        <span style="float: right">
+          <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0 || this.DataStatus==5 || this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
+          <router-link v-if="this.sign == '1'" :to="'/lims/dataentry/tacktodo'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+           <router-link v-else-if="this.sign == '2'" :to="'/lims/dataentry'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+           <router-link v-else-if="this.sign == '3'" :to="'/lims/dataentry/alltask'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+          <router-link v-else :to="'/lims/dataentry'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
@@ -26,22 +36,26 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="安装地点">
-              <el-input v-model.trim="formData.InstalPosition" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.InstalPosition" placeholder="请输入" style="width: 100%"
+                        :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备名称及编号" label-width="120px">
-              <el-input v-model.trim="formData.DeviceName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.DeviceName" placeholder="请输入" style="width: 100%"
+                        :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="液体类型">
-              <el-input v-model.trim="formData.LiquidType" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.LiquidType" placeholder="请输入" style="width: 100%"
+                        :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="节监通知号">
-              <el-input v-model.trim="formData.SectionMonitor" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.SectionMonitor" placeholder="请输入" style="width: 100%"
+                        :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -55,13 +69,15 @@
                 <el-row>
                   <el-col :span="12">
                     <el-form-item label="型号">
-                      <el-input v-model.trim="formData.Model1" placeholder="请输入" style="width: 100%"></el-input>
+                      <el-input v-model.trim="formData.Model1" placeholder="请输入" style="width: 100%"
+                                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="流量"
                                   prop="Flow1">
-                      <el-input type="number" step="0.01" v-model.number="formData.Flow1" placeholder="请输入" style="width: 100%">
+                      <el-input type="number" step="0.01" v-model.number="formData.Flow1" placeholder="请输入" style="width: 100%"
+                                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                         <template slot="append">m3/h</template>
                       </el-input>
                     </el-form-item>
@@ -69,7 +85,8 @@
                   <el-col :span="12">
                     <el-form-item label="扬程"
                                   prop="Lift1">
-                      <el-input type="number" step="0.01" v-model.number="formData.Lift1" placeholder="请输入" style="width: 100%">
+                      <el-input type="number" step="0.01" v-model.number="formData.Lift1" placeholder="请输入" style="width: 100%"
+                                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                       <template slot="append">m</template>
                       </el-input>
                     </el-form-item>
@@ -77,7 +94,8 @@
                   <el-col :span="12">
                     <el-form-item label="轴功率"
                                   prop="ShaftPower1">
-                      <el-input type="number" step="0.01" v-model.number="formData.ShaftPower1" placeholder="请输入" style="width: 100%">
+                      <el-input type="number" step="0.01" v-model.number="formData.ShaftPower1" placeholder="请输入" style="width: 100%"
+                                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                         <template slot="append">kW</template>
                       </el-input>
                     </el-form-item>
@@ -85,7 +103,8 @@
                   <el-col :span="12">
                     <el-form-item label="转速"
                                   prop="Speed1">
-                      <el-input type="number" step="0.01" v-model.number="formData.Speed1" placeholder="请输入" style="width: 100%">
+                      <el-input type="number" step="0.01" v-model.number="formData.Speed1" placeholder="请输入" style="width: 100%"
+                                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                         <template slot="append">r/min</template>
                       </el-input>
                     </el-form-item>
@@ -93,7 +112,8 @@
                   <el-col :span="12">
                     <el-form-item label="效率"
                                   prop="Efficiency1">
-                      <el-input type="number" step="0.01" v-model.number="formData.Efficiency1" placeholder="请输入" style="width: 100%">
+                      <el-input type="number" step="0.01" v-model.number="formData.Efficiency1" placeholder="请输入" style="width: 100%"
+                                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                         <template slot="append">%</template>
                       </el-input>
                     </el-form-item>
@@ -101,7 +121,7 @@
                   <el-col :span="24">
                     <el-form-item label="制造厂">
                       <el-input v-model.trim="formData.RatedNoloadPower1" placeholder="请输入"
-                                style="width: 100%"></el-input>
+                                style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -116,13 +136,15 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="型号">
-                    <el-input v-model.trim="formData.Model2" placeholder="请输入" style="width: 100%"></el-input>
+                    <el-input v-model.trim="formData.Model2" placeholder="请输入" style="width: 100%"
+                              :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="功率"
                                 prop="MotorPower">
-                    <el-input type="number" step="0.01" v-model.number="formData.MotorPower" placeholder="请输入" style="width: 100%">
+                    <el-input type="number" step="0.01" v-model.number="formData.MotorPower" placeholder="请输入" style="width: 100%"
+                              :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                       <template slot="append">kW</template>
                     </el-input>
                   </el-form-item>
@@ -130,7 +152,8 @@
                 <el-col :span="12">
                   <el-form-item label="电压"
                                 prop="MotorVoltage">
-                    <el-input type="number" step="0.01" v-model.number="formData.MotorVoltage" placeholder="请输入" style="width: 100%">
+                    <el-input type="number" step="0.01" v-model.number="formData.MotorVoltage" placeholder="请输入" style="width: 100%"
+                              :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                       <template slot="append">V</template>
                     </el-input>
                   </el-form-item>
@@ -138,7 +161,8 @@
                 <el-col :span="12">
                   <el-form-item label="电流"
                                 prop="MotorCurrent">
-                    <el-input type="number" step="0.01" v-model.number="formData.MotorCurrent" placeholder="请输入" style="width: 100%">
+                    <el-input type="number" step="0.01" v-model.number="formData.MotorCurrent" placeholder="请输入" style="width: 100%"
+                              :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                       <template slot="append">A</template>
                     </el-input>
                   </el-form-item>
@@ -146,7 +170,8 @@
                 <el-col :span="12">
                   <el-form-item label="转速"
                                 prop="Speed2">
-                    <el-input type="number" step="0.01" v-model.number="formData.Speed2" placeholder="请输入" style="width: 100%">
+                    <el-input type="number" step="0.01" v-model.number="formData.Speed2" placeholder="请输入" style="width: 100%"
+                              :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                       <template slot="append">r/min</template>
                     </el-input>
                   </el-form-item>
@@ -154,7 +179,8 @@
                 <el-col :span="12">
                   <el-form-item label="效率"
                                 prop="Efficiency2">
-                    <el-input type="number" step="0.01" v-model.number="formData.Efficiency2" placeholder="请输入" style="width: 100%">
+                    <el-input type="number" step="0.01" v-model.number="formData.Efficiency2" placeholder="请输入" style="width: 100%"
+                              :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                       <template slot="append">%</template>
                     </el-input>
                   </el-form-item>
@@ -162,7 +188,7 @@
                 <el-col :span="24">
                   <el-form-item label="制造厂">
                     <el-input v-model.trim="formData.RatedNoloadPower2" placeholder="请输入"
-                              style="width: 100%"></el-input>
+                              style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -173,92 +199,95 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="检测依据">
-                <el-input v-model.trim="formData.Basis" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.Basis" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="使用仪器">
-                <el-input v-model="formData.Instruments" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model="formData.Instruments" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="仪器状态">
-                <el-input v-model="formData.State" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model="formData.State" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="液体密度"
-                            prop="LiquidDensity"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.LiquidDensity" placeholder="请输入" style="width: 100%">
+                            prop="LiquidDensity">
+                <el-input type="number" step="0.01" v-model.number="formData.LiquidDensity" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kg/m3</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="环境温度"
-                            prop="Temperature"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.Temperature" placeholder="请输入" style="width: 100%">
+                            prop="Temperature">
+                <el-input type="number" step="0.01" v-model.number="formData.Temperature" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">℃</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="相对湿度"
-                            prop="RelativeHumidity"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.RelativeHumidity" placeholder="请输入" style="width: 100%">
+                            prop="RelativeHumidity">
+                <el-input type="number" step="0.01" v-model.number="formData.RelativeHumidity" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">%</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="液体温度"
-                            prop="LiquidTemperature"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.LiquidTemperature" placeholder="请输入" style="width: 100%">
+                            prop="LiquidTemperature">
+                <el-input type="number" step="0.01" v-model.number="formData.LiquidTemperature" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">℃</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检查结果">
-                <el-input v-model="formData.Result" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model="formData.Result" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="泵吸入管周长"
-                            prop="Inhalation"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.Inhalation" placeholder="请输入" style="width: 100%">
+                            prop="Inhalation">
+                <el-input type="number" step="0.01" v-model.number="formData.Inhalation" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="吸入压力测点距基准面" label-width="200px"
-                            prop="InhalationPressure"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.InhalationPressure" placeholder="请输入" style="width: 100%">
+                            prop="InhalationPressure">
+                <el-input type="number" step="0.01" v-model.number="formData.InhalationPressure" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="进口壁厚"
-                            prop="Imported"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.Imported" placeholder="请输入" style="width: 100%">
+                            prop="Imported">
+                <el-input type="number" step="0.01" v-model.number="formData.Imported" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="泵排出管周长"
-                            prop="Discharge"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.Discharge" placeholder="请输入" style="width: 100%">
+                            prop="Discharge">
+                <el-input type="number" step="0.01" v-model.number="formData.Discharge" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
@@ -266,61 +295,64 @@
             <el-col :span="6">
               <el-form-item label="排出压力测点距基准面" label-width="170px"
                             prop="DischargePressure">
-                <el-input type="number" step="0.01" v-model.number="formData.DischargePressure" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.DischargePressure" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="出口壁厚"
-                            prop="Exit"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.Exit" placeholder="请输入" style="width: 100%">
+                            prop="Exit">
+                <el-input type="number" step="0.01" v-model.number="formData.Exit" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="节阀后管周长"
-                            prop="ThrottleValve"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.ThrottleValve" placeholder="请输入" style="width: 100%">
+                            prop="ThrottleValve">
+                <el-input type="number" step="0.01" v-model.number="formData.ThrottleValve" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="节阀后压力测点距基准面" label-width="180px"
-                            prop="ThrottlePressure"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.ThrottlePressure" placeholder="请输入" style="width: 100%">
+                            prop="ThrottlePressure">
+                <el-input type="number" step="0.01" v-model.number="formData.ThrottlePressure" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="阀后壁厚"
-                            prop="AfterValve"
-                            >
-                <el-input type="number" step="0.01" v-model.number="formData.AfterValve" placeholder="请输入" style="width: 100%">
+                            prop="AfterValve">
+                <el-input type="number" step="0.01" v-model.number="formData.AfterValve" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">mm</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="机组传动方式">
-                <el-input v-model.trim="formData.Transmission" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.Transmission" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="工况调节方式及监测时调节状态" label-width="220px">
-                <el-input v-model.trim="formData.Adjust" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.Adjust" placeholder="请输入" style="width: 100%"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-card>
       </el-form>
-      <el-form label-position="top" :rules="rules">
+      <el-form label-position="top">
         <el-card class="box-card">
           <div slot="header" class="clearfix" style="height: 12px">
             <span>测试数据</span>
@@ -329,9 +361,11 @@
             <el-col :span="8">
               <el-form-item label="测试流量(m3/h)">
                 <el-input type="number" step="0.01" v-model.number="formData.TrafficTest1" style="width: 25%"
-                          @blur="getTrafficRecord"></el-input>
-                <el-input type="number" step="0.01" v-model.number="formData.TrafficTest2" style="width: 25%" @blur="getTrafficRecord"></el-input>
-                <el-input type="number" step="0.01" v-model.number="formData.TrafficTest3" style="width: 25%" @blur="getTrafficRecord"></el-input>
+                          @blur="getTrafficRecord" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TrafficTest2" style="width: 25%" @blur="getTrafficRecord"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TrafficTest3" style="width: 25%" @blur="getTrafficRecord"
+                          :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                 <el-tooltip content="均值或合计" placement="top" effect="dark">
                   <el-input label="均值或合计" v-model.number="formData.TrafficRecord" placeholder="均值或合计" style="width: 25%"
                             readonly></el-input>
@@ -431,6 +465,44 @@
         </el-card>
       </el-form>
     </el-card>
+    <el-dialog title="提交校核" :visible.sync="ProoFreadShow" top="5vh">
+      <el-form :model="shenhesubmitForm" label-width="130px" ref="shenhesubmitForm">
+        <el-row>
+          <el-form-item label="校核人" prop="AuthorUser">
+            <el-select ref="consigneeselect" v-model="shenhesubmitForm.AuditorUserId" placeholder="请选择校核人" style="width: 100%;">
+              <el-option v-for="item in acceptUsers" :key="item.id" :label="item.realname" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="说明">
+            <el-input type="textarea" v-model="shenhesubmitForm.AuditorRemark" placeholder="请输入说明"></el-input>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="ProoFreadShow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="makesure()">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="校核信息" :visible.sync="jiaoheshow" top="5vh">
+      <el-form :model="jiaoheForm" label-width="130px" ref="jiaoheForm">
+        <el-form-item label="校核状态">
+          <template>
+            <el-radio class="radio" v-model="jiaoheForm.SuccessStatus" :label="2">校核通过</el-radio>
+            <el-radio class="radio" v-model="jiaoheForm.SuccessStatus" :label="3">校核未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="说明">
+          <el-input type="textarea" v-model="jiaoheForm.AuditorRemark" placeholder="请输入校核说明"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="jiaoheshow = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="jiaohemakesure()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -453,6 +525,12 @@
         EId: '',
         TaskBalanceId: '',
         DataEntryId: '',
+        ProoFreadShow: false,
+        jiaoheshow: false,
+        sign: '2',
+        ischeck: 0,
+        DataStatus: '0',
+        acceptUsers: [],
         formData: {
           Id: '',
           EId: '',
@@ -540,19 +618,28 @@
           ModifiedUserId: '',
           ModifiedBy: ''
         },
-        rules: {
-          TrafficTest1: [
-            {type: 'number', message: '请选择日期', trigger: 'blur'}
-          ]
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
+        jiaoheForm: {
+          SuccessStatus: 2,
+          AuditorRemark: '',
+          DataEntryId: 0
         }
       }
     },
     created () {
       this.EId = this.$route.query.eid
       this.TaskBalanceId = this.$route.query.tbid
-      console.log(this.$route.query)
+      this.sign = this.$route.query.sign
       this.DataEntryId = this.$route.query.deid
+      this.formData.DataEntryId = parseInt(this.$route.query.deid)
       this.initData()
+      this.getUsersByRole()
     },
     methods: {
       saveEntity () {
@@ -607,7 +694,7 @@
         })
       },
       initData () {
-        api.getEntity(this.DataEntryId, this.$axios).then(res => { // this.formData.Id
+        api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.formData = res.data.item
           } else {
@@ -617,6 +704,114 @@
         })
       },
 
+      // 获取校核人列表
+      getUsersByRole () {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      setProoFreadShow () {
+        // if (this.formData.PositionCheckId === '') {
+        //   this.$message.warning('检测地点为空，不允许提交！')
+        //   return
+        // }
+        this.ProoFreadShow = true
+      },
+      // 打开校核弹窗
+      jiaoheshowdialog () {
+        this.jiaoheForm.DataEntryId = this.queryParams.DataEntryId
+        this.jiaoheshow = true
+      },
+      // 提交校核
+      makesure () {
+        console.log(this.formData.Id, '====')
+        if (!this.formData.Id || this.formData.Id < 0) {
+          this.$message.warning('没有保存，不能提交！')
+          return
+        }
+        this.$confirm('确定提交校核！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.ProoFreadShow = false
+            this.checkstatus()
+          })
+          .catch(() => {})
+      },
+      checkstatus () {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.queryParams.DataEntryId)
+        let params = this.shenhesubmitForm
+        this.$axios.put('/limsdataentry/checksubmit/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: res.data.message
+
+              })
+              this.DataStatus = 1
+              // this.initDatas()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核提交错误!'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      jiaohecheckstatus () {
+        let params = this.jiaoheForm
+        this.$axios.put('/limsdataentry/jiaohe/', params)
+          .then(res => {
+            // response
+            if (res.data.code === 0) {
+              this.ischeck = '0'
+              this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+              // this.initdata2()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: '校核错误，请先确定您已经录入内容并且录入的内容已经保存'
+              })
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      jiaohemakesure () {
+        this.$confirm('确认校核！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.jiaoheshow = false
+            this.jiaohecheckstatus()
+          })
+          .catch(() => {})
+      },
+
       getTrafficRecord () {
         this.formData.TrafficRecord = Number((Number(this.formData.TrafficTest1) + Number(this.formData.TrafficTest2) + Number(this.formData.TrafficTest3)).toFixed(2))
       },