节能审核

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

@@ -34,7 +34,7 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	//s.BaseUrl = "http://123.56.168.26:8080/activiti-rest/service"
 	s.BaseUrl = "http://192.168.0.166: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.BaseUrl = "http://localhost:8081/api/acti"
 	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
 	//s.OriginUrl = "http://192.168.0.166:8081/api"
 	s.OriginUrl = "http://47.92.212.59:8080/acti-api/api"

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

@@ -11,33 +11,43 @@
         <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/reportnobeampumpingunit'">-->
-            <!--<el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>-->
-          <!--</router-link>-->
+        <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>
       </div>
       <el-form label-width="110px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="6">
             <el-form-item label="被测单位">
-              <el-input v-model.trim="formData.TestDepart" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.TestDepart" 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.trim="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.PositionCheck" 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.trim="formData.WellNumber" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.WellNumber" 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-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期">
+              <el-date-picker style="width: 100%" v-model="formData.CheckDate" type="date" placeholder="请选择检测日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -49,13 +59,13 @@
             </div>
             <el-col :span="6">
               <el-form-item label="型号">
-                <el-input v-model.trim="formData.PumpModel" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.PumpModel" 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="RatedVoltage">
-                <el-input type="number" step="0.01" v-model.number="formData.RatedVoltage" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.RatedVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">V</template>
                 </el-input>
               </el-form-item>
@@ -63,7 +73,7 @@
             <el-col :span="6">
               <el-form-item label="额定功率"
                             prop="RatedPower">
-                <el-input type="number" step="0.01" v-model.number="formData.RatedPower" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.RatedPower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">kW</template>
                 </el-input>
               </el-form-item>
@@ -71,7 +81,7 @@
             <el-col :span="6">
               <el-form-item label="额定电流"
                             prop="RatedCurrent">
-                <el-input type="number" step="0.01" v-model.number="formData.RatedCurrent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.RatedCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">V</template>
                 </el-input>
               </el-form-item>
@@ -79,7 +89,7 @@
             <el-col :span="6">
               <el-form-item label="额定排量"
                             prop="RatedDischarge">
-                <el-input type="number" step="0.01" v-model.number="formData.RatedDischarge" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.RatedDischarge" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">m3/d</template>
                 </el-input>
               </el-form-item>
@@ -87,7 +97,7 @@
             <el-col :span="6">
               <el-form-item label="泵深"
                             prop="PumpDepth">
-                <el-input type="number" step="0.01" v-model.number="formData.PumpDepth" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.PumpDepth" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">m</template>
                 </el-input>
               </el-form-item>
@@ -95,14 +105,14 @@
             <el-col :span="6">
               <el-form-item label="额定扬程"
                             prop="RatedLift">
-                <el-input type="number" step="0.01" v-model.number="formData.RatedLift" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.RatedLift" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">m</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="生产厂家">
-                <el-input v-model.trim="formData.Manufacturer" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.Manufacturer" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
               </el-form-item>
             </el-col>
           </el-card>
@@ -110,7 +120,7 @@
             <el-col :span="6">
               <el-form-item label="平均运行电压"
                             prop="AvgVoltage">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgVoltage" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">V</template>
                 </el-input>
               </el-form-item>
@@ -118,7 +128,7 @@
             <el-col :span="6">
               <el-form-item label="平均运行电流"
                             prop="AvgCurrent">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgCurrent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">A</template>
                 </el-input>
               </el-form-item>
@@ -126,7 +136,7 @@
             <el-col :span="6">
               <el-form-item label="平均有功功率"
                             prop="AvgActivePower">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgActivePower" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgActivePower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">kW</template>
                 </el-input>
               </el-form-item>
@@ -134,7 +144,7 @@
             <el-col :span="6">
               <el-form-item label="平均无功功率"
                             prop="AvgReactivePower">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgReactivePower" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgReactivePower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">kvar</template>
                 </el-input>
               </el-form-item>
@@ -142,14 +152,14 @@
             <el-col :span="6">
               <el-form-item label="平均功率因数"
                             prop="AvgPowerFactor">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgPowerFactor" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgPowerFactor" 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="BackPressure">
-                <el-input type="number" step="0.01" v-model.number="formData.BackPressure" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.BackPressure" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">MPa</template>
                 </el-input>
               </el-form-item>
@@ -157,7 +167,7 @@
             <el-col :span="6">
               <el-form-item label="油压"
                             prop="OilPressure">
-                <el-input type="number" step="0.01" v-model.number="formData.OilPressure" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.OilPressure" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">MPa</template>
                 </el-input>
               </el-form-item>
@@ -165,7 +175,7 @@
             <el-col :span="6">
               <el-form-item label="套压"
                             prop="CasingPressure">
-                <el-input type="number" step="0.01" v-model.number="formData.CasingPressure" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.CasingPressure" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">MPa</template>
                 </el-input>
               </el-form-item>
@@ -173,7 +183,7 @@
             <el-col :span="6">
               <el-form-item label="产液量"
                             prop="ProducedFluidVolume">
-                <el-input type="number" step="0.01" v-model.number="formData.ProducedFluidVolume" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.ProducedFluidVolume" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">t/d</template>
                 </el-input>
               </el-form-item>
@@ -181,7 +191,7 @@
             <el-col :span="6">
               <el-form-item label="含水率"
                             prop="WaterContent">
-                <el-input type="number" step="0.01" v-model.number="formData.WaterContent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.WaterContent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">%</template>
                 </el-input>
               </el-form-item>
@@ -189,7 +199,7 @@
             <el-col :span="6">
               <el-form-item label="原油密度"
                             prop="CrudeOilDensity">
-                <el-input type="number" step="0.01" v-model.number="formData.CrudeOilDensity" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.CrudeOilDensity" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">kg/m3</template>
                 </el-input>
               </el-form-item>
@@ -197,7 +207,7 @@
             <el-col :span="6">
               <el-form-item label="动液面"
                             prop="WorkingFluidLevel">
-                <el-input type="number" step="0.01" v-model.number="formData.WorkingFluidLevel" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.WorkingFluidLevel" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">m</template>
                 </el-input>
               </el-form-item>
@@ -205,20 +215,20 @@
             <el-col :span="6">
               <el-form-item label="吸入口深度"
                             prop="SuctionDepth">
-                <el-input type="number" step="0.01" v-model.number="formData.SuctionDepth" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.SuctionDepth" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">m</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="直/斜井">
-                <el-input v-model.trim="formData.StraightOrslope" placeholder="请输入" style="width: 100%">
+                <el-input v-model.trim="formData.StraightOrslope" 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.trim="formData.OilFieldType" placeholder="请输入" style="width: 100%">
+                <el-input v-model.trim="formData.OilFieldType" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                 </el-input>
               </el-form-item>
             </el-col>
@@ -226,18 +236,18 @@
           <el-card>
             <el-col :span="12">
               <el-form-item label="依据标准">
-                <el-input v-model.trim="formData.Standard" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.Standard" 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="监测使用仪器">
-                <el-input v-model.trim="formData.MonitoringInstrument" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.MonitoringInstrument" 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="Temperature">
-                <el-input type="number" step="0.01" v-model.number="formData.Temperature" placeholder="请输入" style="width: 100%">
+                <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>
@@ -245,29 +255,29 @@
             <el-col :span="6">
               <el-form-item label="现场相对湿度"
                             prop="Humidity">
-                <el-input type="number" step="0.01" v-model.number="formData.Humidity" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.Humidity" 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="测试前仪器状态" label-width="120px">
-                <el-input v-model.trim="formData.BeforeCheck" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.BeforeCheck" 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="120px">
-                <el-input v-model.trim="formData.AfterCheck" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.AfterCheck" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
               </el-form-item>
             </el-col>
             <el-col>
               <el-form-item label="备注">
-                <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item :span="24" style="text-align: center;">
-                  <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+                  <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-circle-check"></i>
                     保存
                   </el-button>
                 </el-form-item>
@@ -276,6 +286,44 @@
         </el-row>
       </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>
 
@@ -298,6 +346,12 @@
         EId: '',
         TaskBalanceId: '',
         DataEntryId: '',
+        ProoFreadShow: false,
+        jiaoheshow: false,
+        sign: '2',
+        ischeck: 0,
+        DataStatus: '0',
+        acceptUsers: [],
         formData: {
           Id: '',
           EId: '',
@@ -346,10 +400,17 @@
           ModifiedUserId: '',
           ModifiedBy: ''
         },
-        rules: {
-          TrafficTest1: [
-            {type: 'number', message: '请选择日期', trigger: 'blur'}
-          ]
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
+        jiaoheForm: {
+          SuccessStatus: 2,
+          AuditorRemark: '',
+          DataEntryId: 0
         }
       }
     },
@@ -357,8 +418,12 @@
       this.EId = this.$route.query.eid
       this.TaskBalanceId = this.$route.query.tbid
       this.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      this.ischeck = this.$route.query.ischeck
       this.formData.DataEntryId = parseInt(this.DataEntryId)
       this.initData()
+      this.getUsersByRole()
     },
     methods: {
       saveEntity () {
@@ -420,6 +485,113 @@
         }).catch(err => {
           console.error(err)
         })
+      },
+
+      // 获取校核人列表
+      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.DataEntryId
+        this.jiaoheshow = true
+      },
+      checkstatus () {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.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)
+          })
+      },
+      // 提交校核
+      makesure () {
+        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(() => {})
+      },
+      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(() => {})
       }
 
     }

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

@@ -11,24 +11,33 @@
         <span>
           <i class="icon icon-table2"></i> 编辑
         </span>
-        <span style="float: right;">
-          <el-button type="primary" size="mini" @click="exportWord">导出</el-button>
-          <!--<el-button type="primary" size="mini" @click="saveEntity"></el-button>-->
-          <!--<router-link :to="'/lims/reportnobeampumpingunit'">-->
-            <!--<el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>-->
-          <!--</router-link>-->
+        <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>
       </div>
       <el-form label-width="110px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="被测单位">
-              <el-input v-model.trim="formData.TestDepart" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.TestDepart" 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.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -39,22 +48,22 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="被测单位联系人">
-              <el-input placeholder="请输入" style="width: 100%"></el-input>
+              <el-input 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 placeholder="请输入" style="width: 100%"></el-input>
+              <el-input 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="150px">
-              <el-input v-model.trim="formData.Number" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.Number" 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.HFModel" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.HFModel" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -268,7 +277,7 @@
                   min-width="80"
                   align="center">
                   <template slot-scope="scope">
-                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.LeftTemperature1" style="width: 100%"></el-input>
+                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.LeftTemperature1" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -277,7 +286,7 @@
                   min-width="80"
                   align="center">
                   <template slot-scope="scope">
-                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.LeftTemperature2" style="width: 100%"></el-input>
+                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.LeftTemperature2" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -286,7 +295,7 @@
                   min-width="80"
                   align="center">
                   <template slot-scope="scope">
-                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.LeftTemperature3" style="width: 100%"></el-input>
+                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.LeftTemperature3" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -295,7 +304,7 @@
                   min-width="80"
                   align="center">
                   <template slot-scope="scope">
-                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.LeftTemperature4" style="width: 100%"></el-input>
+                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.LeftTemperature4" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </template>
                 </el-table-column>
               </el-table-column>
@@ -306,7 +315,7 @@
                   min-width="80"
                   align="center">
                   <template slot-scope="scope">
-                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.RichtTemperature1" style="width: 100%"></el-input>
+                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.RichtTemperature1" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -315,7 +324,7 @@
                   min-width="80"
                   align="center">
                   <template slot-scope="scope">
-                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.RichtTemperature2" style="width: 100%"></el-input>
+                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.RichtTemperature2" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -324,7 +333,7 @@
                   min-width="80"
                   align="center">
                   <template slot-scope="scope">
-                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.RichtTemperature3" style="width: 100%"></el-input>
+                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.RichtTemperature3" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -333,7 +342,7 @@
                   min-width="80"
                   align="center">
                   <template slot-scope="scope">
-                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.RichtTemperature4" style="width: 100%"></el-input>
+                    <el-input size="small" type="number" step="0.01" v-model.number="scope.row.RichtTemperature4" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                   </template>
                 </el-table-column>
               </el-table-column>
@@ -343,7 +352,7 @@
                 min-width="80"
                 align="center">
                 <template slot-scope="scope">
-                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.ExhaustTemperature" style="width: 100%"></el-input>
+                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.ExhaustTemperature" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                 </template>
               </el-table-column>
               <el-table-column
@@ -352,7 +361,7 @@
                 min-width="80"
                 align="center">
                 <template slot-scope="scope">
-                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.Oxygen" style="width: 100%"></el-input>
+                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.Oxygen" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                 </template>
               </el-table-column>
               <el-table-column
@@ -361,7 +370,7 @@
                 min-width="80"
                 align="center">
                 <template slot-scope="scope">
-                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.SulfurDioxide" style="width: 100%"></el-input>
+                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.SulfurDioxide" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                 </template>
               </el-table-column>
               <el-table-column
@@ -370,7 +379,7 @@
                 min-width="80"
                 align="center">
                 <template slot-scope="scope">
-                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.CarbonMonoxide" style="width: 100%"></el-input>
+                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.CarbonMonoxide" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                 </template>
               </el-table-column>
               <el-table-column
@@ -379,7 +388,7 @@
                 min-width="80"
                 align="center">
                 <template slot-scope="scope">
-                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.CarbonDioxide" style="width: 100%"></el-input>
+                  <el-input size="small" type="number" step="0.01" v-model.number="scope.row.CarbonDioxide" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                 </template>
               </el-table-column>
             </el-table>
@@ -388,33 +397,33 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="备注">
-                  <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input type="textarea" v-model.trim="formData.Remark" 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.trim="formData.CEMeter" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input v-model.trim="formData.CEMeter" 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="150px">
-                  <el-input v-model.trim="formData.INCTMeter" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input v-model.trim="formData.INCTMeter" 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.trim="formData.StandardTM" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input v-model.trim="formData.StandardTM" 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.trim="formData.OnlineMeter" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input v-model.trim="formData.OnlineMeter" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="24">
                   <el-form-item :span="24" style="text-align: center;">
-                    <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+                    <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-circle-check"></i>
                       保存
                     </el-button>
                   </el-form-item>
@@ -424,6 +433,44 @@
         </el-row>
       </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>
 
@@ -447,8 +494,12 @@
         TaskBalanceId: '',
         DataEntryId: '',
         TestDepartId: '',
-
-        currentOrderNo: 0,
+        ProoFreadShow: false,
+        jiaoheshow: false,
+        sign: '2',
+        ischeck: 0,
+        DataStatus: '0',
+        acceptUsers: [],
         BurnerIntelOptions: [
           {
             Label: '智能',
@@ -624,10 +675,17 @@
           ModifiedUserId: '',
           ModifiedBy: ''
         },
-        rules: {
-          TrafficTest1: [
-            {type: 'number', message: '请选择日期', trigger: 'blur'}
-          ]
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
+        jiaoheForm: {
+          SuccessStatus: 2,
+          AuditorRemark: '',
+          DataEntryId: 0
         }
       }
     },
@@ -636,25 +694,13 @@
       this.TaskBalanceId = this.$route.query.tbid
       this.DataEntryId = this.$route.query.deid
       this.formData.DataEntryId = parseInt(this.DataEntryId)
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      this.ischeck = this.$route.query.ischeck
       this.initData()
+      this.getUsersByRole()
     },
     methods: {
-      exportWord () {
-        this.$axios.post('/limsexportword/exportWord', this.formData)
-          .then(res => {
-            if (res.data.code === 0) {
-
-            } else {
-              this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
       paramsValidate (params) {
         let flag = false
         for (var key in params) {
@@ -692,7 +738,6 @@
           TableData: this.tableData,
           FormData: this.formData
         }
-        console.log(params, 'params')
         api.addEntity(params, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.formData.Id = res.data.item
@@ -736,7 +781,6 @@
       initData () {
         api.getEntityByDataEntryId(this.formData.DataEntryId, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log(res.data.item, '=========')
             this.formData = res.data.item['formData']
             this.tableData = res.data.item['tableData']
           } else {
@@ -745,8 +789,115 @@
           console.error(err)
         })
       },
+
+      // 获取校核人列表
+      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.DataEntryId
+        this.jiaoheshow = true
+      },
+      checkstatus () {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.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)
+          })
+      },
+      // 提交校核
+      makesure () {
+        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(() => {})
+      },
+      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(() => {})
+      },
+
       getSummaries (param) {
-        console.log(param)
         const { columns, data } = param
         const sums = []
         columns.forEach((column, index) => {
@@ -758,11 +909,9 @@
             return
           }
           const values = data.map(item => Number(item[column.property]))
-          console.log(values)
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr.toFixed(2))
-              console.log(prev, curr)
               if (!isNaN(value)) {
                 return prev + curr
               } else {
@@ -776,10 +925,8 @@
         for (let i = 2; i < sums.length; i++) {
           sums[i] = (sums[i] / 5).toFixed(2)
         }
-        console.log(sums)
         return sums
       }
-
     }
   }
 </script>

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

@@ -636,7 +636,6 @@
     created () {
       this.EId = this.$route.query.eid
       this.TaskBalanceId = this.$route.query.tbid
-      this.sign = this.$route.query.sign
       this.DataEntryId = this.$route.query.deid
       this.DataStatus = this.$route.query.datastatus
       this.sign = this.$route.query.sign
@@ -735,11 +734,9 @@
         this.jiaoheshow = true
       },
       checkstatus () {
-        console.log('2')
         this.shenhesubmitForm.SuccessStatus = 1
         this.shenhesubmitForm.DataEntryId = parseInt(this.DataEntryId)
         let params = this.shenhesubmitForm
-        console.log('+-=-=-=-=-=')
         this.$axios.put('/limsdataentry/checksubmit/', params)
           .then(res => {
             // response

src/dashoo.cn/frontend_web/src/pages/lims/reportmotor/_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/reportnobeampumpingunit'">
+        <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>
@@ -21,33 +31,33 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="被测单位名称">
-              <el-input v-model.trim="formData.TestDepart" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.TestDepart" 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.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-col :span="6">
             <el-form-item label="安装地点" label-width="150px">
-              <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="6">
             <el-form-item label="设备名称" label-width="150px">
-              <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="6">
             <el-form-item label="电动机型号">
-              <el-input v-model.trim="formData.MotorType" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.MotorType" 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="RatedPower">
-              <el-input type="number" step="0.01" v-model.number="formData.RatedPower" placeholder="请输入" style="width: 100%">
+              <el-input type="number" step="0.01" v-model.number="formData.RatedPower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                 <template slot="append">kW</template>
               </el-input>
             </el-form-item>
@@ -55,7 +65,7 @@
           <el-col :span="6">
             <el-form-item label="额定电压"
                           prop="RatedVoltage">
-              <el-input type="number" step="0.01" v-model.number="formData.RatedVoltage" placeholder="请输入" style="width: 100%">
+              <el-input type="number" step="0.01" v-model.number="formData.RatedVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                 <template slot="append">V</template>
               </el-input>
             </el-form-item>
@@ -63,7 +73,7 @@
           <el-col :span="6">
             <el-form-item label="额定电流"
                           prop="RatedCurrent">
-              <el-input type="number" step="0.01" v-model.number="formData.RatedCurrent" placeholder="请输入" style="width: 100%">
+              <el-input type="number" step="0.01" v-model.number="formData.RatedCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                 <template slot="append">V</template>
               </el-input>
             </el-form-item>
@@ -71,7 +81,7 @@
           <el-col :span="6">
             <el-form-item label="额定转速"
                           prop="RatedSpeed">
-              <el-input type="number" step="0.01" v-model.number="formData.RatedSpeed" placeholder="请输入" style="width: 100%">
+              <el-input type="number" step="0.01" v-model.number="formData.RatedSpeed" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                 <template slot="append">r/min</template>
               </el-input>
             </el-form-item>
@@ -79,7 +89,7 @@
           <el-col :span="6">
             <el-form-item label="额定效率"
                           prop="RatedEfficiency">
-              <el-input type="number" step="0.01" v-model.number="formData.RatedEfficiency" placeholder="请输入" style="width: 100%">
+              <el-input type="number" step="0.01" v-model.number="formData.RatedEfficiency" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                 <template slot="append">%</template>
               </el-input>
             </el-form-item>
@@ -87,7 +97,7 @@
           <el-col :span="6">
             <el-form-item label="额定空载功率"
                           prop="RatedNoloadPower">
-              <el-input type="number" step="0.01" v-model.number="formData.RatedNoloadPower" placeholder="请输入" style="width: 100%">
+              <el-input type="number" step="0.01" v-model.number="formData.RatedNoloadPower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                 <template slot="append">kW</template>
               </el-input>
             </el-form-item>
@@ -95,46 +105,46 @@
           <el-col :span="6">
             <el-form-item label="额定功率因数"
                           prop="RatedPowerFactor">
-              <el-input type="number" step="0.01" v-model.number="formData.RatedPowerFactor" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input type="number" step="0.01" v-model.number="formData.RatedPowerFactor" 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="NoloadCurrent">
-              <el-input type="number" step="0.01" v-model.number="formData.NoloadCurrent" placeholder="请输入" style="width: 100%">
+              <el-input type="number" step="0.01" v-model.number="formData.NoloadCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                 <template slot="append">A</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="制造厂">
-              <el-input v-model.trim="formData.Insulation" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.Insulation" 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.trim="formData.Standard" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.Standard" 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="使用仪器">
-              <el-input v-model.trim="formData.UseInstrument" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.UseInstrument" 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.trim="formData.BeforeTesting" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.BeforeTesting" 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.trim="formData.AfterTesting" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.AfterTesting" 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="Temperature">
-              <el-input type="number" step="0.01" v-model.number="formData.Temperature" placeholder="请输入" style="width: 100%">
+              <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>
@@ -142,7 +152,7 @@
           <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%">
+              <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>
@@ -156,7 +166,7 @@
             <el-col :span="6">
               <el-form-item label="电压"
                             prop="Voltage">
-                <el-input type="number" step="0.01" v-model.number="formData.Voltage" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.Voltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">V</template>
                 </el-input>
               </el-form-item>
@@ -164,7 +174,7 @@
             <el-col :span="6">
               <el-form-item label="电流"
                             prop="Electric">
-                <el-input type="number" step="0.01" v-model.number="formData.Electric" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.Electric" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">A</template>
                 </el-input>
               </el-form-item>
@@ -172,7 +182,7 @@
             <el-col :span="6">
               <el-form-item label="有功功率"
                             prop="ActivePower">
-                <el-input type="number" step="0.01" v-model.number="formData.ActivePower" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.ActivePower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">kW</template>
                 </el-input>
               </el-form-item>
@@ -180,7 +190,7 @@
             <el-col :span="6">
               <el-form-item label="无功功率"
                             prop="ReactivePower">
-                <el-input type="number" step="0.01" v-model.number="formData.ReactivePower" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.ReactivePower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">kvar</template>
                 </el-input>
               </el-form-item>
@@ -188,7 +198,7 @@
             <el-col :span="6">
               <el-form-item label="视在功率"
                             prop="ApparentPower">
-                <el-input type="number" step="0.01" v-model.number="formData.ApparentPower" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.ApparentPower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">kVA</template>
                 </el-input>
               </el-form-item>
@@ -196,14 +206,14 @@
             <el-col :span="6">
               <el-form-item label="功率因数"
                             prop="PowerFactor">
-                <el-input type="number" step="0.01" v-model.number="formData.PowerFactor" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.PowerFactor" 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="OperatingEfficiency">
-                <el-input type="number" step="0.01" v-model.number="formData.OperatingEfficiency" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.OperatingEfficiency" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">Hz</template>
                 </el-input>
               </el-form-item>
@@ -211,11 +221,11 @@
           </el-row>
           <el-row style="margin-top: 3px">
             <el-form-item label="备注">
-              <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
             </el-form-item>
             <el-col :span="24">
               <el-form-item :span="24" style="text-align: center;">
-                <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+                <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-circle-check"></i>
                   保存
                 </el-button>
               </el-form-item>
@@ -224,6 +234,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>
 
@@ -246,6 +294,11 @@
         EId: '',
         TaskBalanceId: '',
         DataEntryId: '',
+        ProoFreadShow: false,
+        jiaoheshow: false,
+        sign: '2',
+        ischeck: 0,
+        DataStatus: '0',
         formData: {
           Id: '',
           EId: '',
@@ -289,10 +342,17 @@
           ModifiedUserId: '',
           ModifiedBy: ''
         },
-        rules: {
-          TrafficTest1: [
-            {type: 'number', message: '请选择日期', trigger: 'blur'}
-          ]
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
+        jiaoheForm: {
+          SuccessStatus: 2,
+          AuditorRemark: '',
+          DataEntryId: 0
         }
       }
     },
@@ -300,7 +360,12 @@
       this.EId = this.$route.query.eid
       this.TaskBalanceId = this.$route.query.tbid
       this.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      this.ischeck = this.$route.query.ischeck
+      this.formData.DataEntryId = parseInt(this.DataEntryId)
       this.initData()
+      this.getUsersByRole()
     },
     methods: {
       saveEntity () {
@@ -363,6 +428,113 @@
         }).catch(err => {
           console.error(err)
         })
+      },
+
+      // 获取校核人列表
+      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.DataEntryId
+        this.jiaoheshow = true
+      },
+      checkstatus () {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.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)
+          })
+      },
+      // 提交校核
+      makesure () {
+        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(() => {})
+      },
+      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(() => {})
       }
 
     }

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

@@ -327,7 +327,7 @@
           </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>
@@ -637,10 +637,10 @@
       this.ischeck = this.$route.query.ischeck
       this.formData.DataEntryId = parseInt(this.$route.query.deid)
       this.initData()
+      this.getUsersByRole()
     },
     methods: {
       saveEntity () {
-        console.log(this.formData, 'formData')
         this.$refs['formData'].validate((valid) => {
           if (valid) {
             this.formData.DataEntryId = parseInt(this.DataEntryId)
@@ -703,6 +703,20 @@
         })
       },
 
+      // 获取校核人列表
+      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)
+          })
+      },
       // 打开校核弹窗
       jiaoheshowdialog () {
         this.jiaoheForm.DataEntryId = this.DataEntryId
@@ -713,7 +727,6 @@
       },
       // 提交校核
       makesure () {
-        console.log(this.formData.Id, '====')
         if (!this.formData.Id || this.formData.Id < 0) {
           this.$message.warning('没有保存，不能提交！')
           return
@@ -725,17 +738,14 @@
         })
           .then(() => {
             this.ProoFreadShow = false
-            console.log('1')
             this.checkstatus()
           })
           .catch(() => {})
       },
       checkstatus () {
-        console.log('2')
         this.shenhesubmitForm.SuccessStatus = 1
         this.shenhesubmitForm.DataEntryId = parseInt(this.DataEntryId)
         let params = this.shenhesubmitForm
-        console.log('+-=-=-=-=-=')
         this.$axios.put('/limsdataentry/checksubmit/', params)
           .then(res => {
             // response

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

@@ -11,28 +11,38 @@
         <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/reportnobeampumpingunit'">-->
-            <!--<el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>-->
-          <!--</router-link>-->
+        <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>
       </div>
       <el-form label-width="110px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="6">
             <el-form-item label="被测单位">
-              <el-input v-model.trim="formData.TestDepart" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.TestDepart" 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.trim="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.PositionCheck" 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.trim="formData.WellNumber" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.WellNumber" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -50,13 +60,13 @@
               </div>
               <el-col :span="12">
                 <el-form-item label="型号">
-                  <el-input v-model.trim="formData.MotorModel" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input v-model.trim="formData.MotorModel" 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="MotorRatedPower">
-                  <el-input v-model.number="formData.MotorRatedPower" placeholder="请输入" style="width: 100%">
+                  <el-input v-model.number="formData.MotorRatedPower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                     <template slot="append">kW</template>
                   </el-input>
                 </el-form-item>
@@ -64,7 +74,7 @@
               <el-col :span="12">
                 <el-form-item label="额定电流"
                               prop="MotorRatedCurrent">
-                  <el-input type="number" step="0.01" v-model.number="formData.MotorRatedCurrent" placeholder="请输入" style="width: 100%">
+                  <el-input type="number" step="0.01" v-model.number="formData.MotorRatedCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                     <template slot="append">A</template>
                   </el-input>
                 </el-form-item>
@@ -72,7 +82,7 @@
               <el-col :span="12">
                 <el-form-item label="额定电压"
                               prop="MotorRatedVoltage">
-                  <el-input type="number" step="0.01" v-model.number="formData.MotorRatedVoltage" placeholder="请输入" style="width: 100%">
+                  <el-input type="number" step="0.01" v-model.number="formData.MotorRatedVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                     <template slot="append">V</template>
                   </el-input>
                 </el-form-item>
@@ -80,14 +90,14 @@
               <el-col :span="12">
                 <el-form-item label="额定转速"
                               prop="MotorRatedSpeed">
-                  <el-input type="number" step="0.01" v-model.number="formData.MotorRatedSpeed" placeholder="请输入" style="width: 100%">
+                  <el-input type="number" step="0.01" v-model.number="formData.MotorRatedSpeed" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                     <template slot="append">r/min</template>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="生产厂家">
-                  <el-input v-model.trim="formData.MotorManufacturer" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input v-model.trim="formData.MotorManufacturer" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
                 </el-form-item>
               </el-col>
             </el-card>
@@ -99,13 +109,13 @@
               </div>
               <el-col :span="12">
                 <el-form-item label="型号">
-                  <el-input v-model.trim="formData.PumpModel" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input v-model.trim="formData.PumpModel" 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="PumpRatedCurrent">
-                  <el-input type="number" step="0.01" v-model.number="formData.PumpRatedCurrent" placeholder="请输入" style="width: 100%">
+                  <el-input type="number" step="0.01" v-model.number="formData.PumpRatedCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                     <template slot="append">A</template>
                   </el-input>
                 </el-form-item>
@@ -113,7 +123,7 @@
               <el-col :span="12">
                 <el-form-item label="额定电压"
                               prop="PumpRatedVoltage">
-                  <el-input type="number" step="0.01" v-model.number="formData.PumpRatedVoltage" placeholder="请输入" style="width: 100%">
+                  <el-input type="number" step="0.01" v-model.number="formData.PumpRatedVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                     <template slot="append">V</template>
                   </el-input>
                 </el-form-item>
@@ -121,7 +131,7 @@
               <el-col :span="12">
                 <el-form-item label="泵深"
                               prop="PumpDepth">
-                  <el-input type="number" step="0.01" v-model.number="formData.PumpDepth" placeholder="请输入" style="width: 100%">
+                  <el-input type="number" step="0.01" v-model.number="formData.PumpDepth" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                     <template slot="append">m</template>
                   </el-input>
                 </el-form-item>
@@ -129,14 +139,14 @@
               <el-col :span="12">
                 <el-form-item label="螺杆转数"
                               prop="PumpRatedSpeed">
-                  <el-input type="number" step="0.01" v-model.number="formData.PumpRatedSpeed" placeholder="请输入" style="width: 100%">
+                  <el-input type="number" step="0.01" v-model.number="formData.PumpRatedSpeed" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                     <template slot="append">r/min</template>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="生产厂家">
-                  <el-input v-model.trim="formData.PumpManufacturer" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-input v-model.trim="formData.PumpManufacturer" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
                 </el-form-item>
               </el-col>
             </el-card>
@@ -147,7 +157,7 @@
             <el-col :span="6">
               <el-form-item label="平均运行电压"
                             prop="AvgVoltage">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgVoltage" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">V</template>
                 </el-input>
               </el-form-item>
@@ -155,7 +165,7 @@
             <el-col :span="6">
               <el-form-item label="平均运行电流"
                             prop="AvgCurrent">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgCurrent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">A</template>
                 </el-input>
               </el-form-item>
@@ -163,7 +173,7 @@
             <el-col :span="6">
               <el-form-item label="平均有功功率"
                             prop="AvgActivePower">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgActivePower" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgActivePower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kW</template>
                 </el-input>
               </el-form-item>
@@ -171,7 +181,7 @@
             <el-col :span="6">
               <el-form-item label="平均无功功率"
                             prop="AvgReactivePower">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgReactivePower" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgReactivePower" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kvar</template>
                 </el-input>
               </el-form-item>
@@ -179,14 +189,14 @@
             <el-col :span="6">
               <el-form-item label="平均功率因数"
                             prop="AvgPowerFactor">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgPowerFactor" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgPowerFactor" 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="OilPressure">
-                <el-input type="number" step="0.01" v-model.number="formData.OilPressure" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.OilPressure" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">MPa</template>
                 </el-input>
               </el-form-item>
@@ -194,7 +204,7 @@
             <el-col :span="6">
               <el-form-item label="套压"
                             prop="CasingPressure">
-                <el-input type="number" step="0.01" v-model.number="formData.CasingPressure" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.CasingPressure" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">MPa</template>
                 </el-input>
               </el-form-item>
@@ -202,7 +212,7 @@
             <el-col :span="6">
               <el-form-item label="产液量"
                             prop="ProducedFluidVolume">
-                <el-input type="number" step="0.01" v-model.number="formData.ProducedFluidVolume" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.ProducedFluidVolume" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">t/d</template>
                 </el-input>
               </el-form-item>
@@ -210,7 +220,7 @@
             <el-col :span="6">
               <el-form-item label="含水率"
                             prop="WaterContent">
-                <el-input type="number" step="0.01" v-model.number="formData.WaterContent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.WaterContent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">%</template>
                 </el-input>
               </el-form-item>
@@ -218,7 +228,7 @@
             <el-col :span="6">
               <el-form-item label="原油密度"
                             prop="CrudeOilDensity">
-                <el-input type="number" step="0.01" v-model.number="formData.CrudeOilDensity" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.CrudeOilDensity" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kg/m3</template>
                 </el-input>
               </el-form-item>
@@ -226,7 +236,7 @@
             <el-col :span="6">
               <el-form-item label="动液面"
                             prop="WorkingFluidLevel">
-                <el-input type="number" step="0.01" v-model.number="formData.WorkingFluidLevel" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.WorkingFluidLevel" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">m</template>
                 </el-input>
               </el-form-item>
@@ -234,20 +244,20 @@
             <el-col :span="6">
               <el-form-item label="吸入口深度"
                             prop="SuctionDepth">
-                <el-input type="number" step="0.01" v-model.number="formData.SuctionDepth" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.SuctionDepth" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">m</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="直/斜井">
-                <el-input v-model.trim="formData.StraightOrslope" placeholder="请输入" style="width: 100%">
+                <el-input v-model.trim="formData.StraightOrslope" 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.trim="formData.OilFieldType" placeholder="请输入" style="width: 100%">
+                <el-input v-model.trim="formData.OilFieldType" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -255,18 +265,18 @@
           <el-card>
             <el-col :span="12">
               <el-form-item label="依据标准">
-                <el-input v-model.trim="formData.Standard" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.Standard" 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="监测使用仪器">
-                <el-input v-model.trim="formData.MonitoringInstrument" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.MonitoringInstrument" 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="Temperature">
-                <el-input type="number" step="0.01" v-model.number="formData.Temperature" placeholder="请输入" style="width: 100%">
+                <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>
@@ -274,29 +284,29 @@
             <el-col :span="6">
               <el-form-item label="现场相对湿度"
                             prop="Humidity">
-                <el-input type="number" step="0.01" v-model.number="formData.Humidity" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.Humidity" 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="测试前仪器状态" label-width="120px">
-                <el-input v-model.trim="formData.BeforeCheck" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.BeforeCheck" 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="120px">
-                <el-input v-model.trim="formData.AfterCheck" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input v-model.trim="formData.AfterCheck" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
               </el-form-item>
             </el-col>
             <el-col>
               <el-form-item label="备注">
-                <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item :span="24" style="text-align: center;">
-                  <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+                  <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-circle-check"></i>
                     保存
                   </el-button>
                 </el-form-item>
@@ -305,6 +315,44 @@
         </el-row>
       </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>
 
@@ -327,6 +375,12 @@
         EId: '',
         TaskBalanceId: '',
         DataEntryId: '',
+        ProoFreadShow: false,
+        jiaoheshow: false,
+        sign: '2',
+        ischeck: 0,
+        DataStatus: '0',
+        acceptUsers: [],
         formData: {
           Id: '',
           EId: '',
@@ -379,10 +433,17 @@
           ModifiedUserId: '',
           ModifiedBy: ''
         },
-        rules: {
-          TrafficTest1: [
-            {type: 'number', message: '请选择日期', trigger: 'blur'}
-          ]
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
+        jiaoheForm: {
+          SuccessStatus: 2,
+          AuditorRemark: '',
+          DataEntryId: 0
         }
       }
     },
@@ -390,8 +451,12 @@
       this.EId = this.$route.query.eid
       this.TaskBalanceId = this.$route.query.tbid
       this.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      this.ischeck = this.$route.query.ischeck
       this.formData.DataEntryId = parseInt(this.DataEntryId)
       this.initData()
+      this.getUsersByRole()
     },
     methods: {
       saveEntity () {
@@ -453,6 +518,113 @@
         }).catch(err => {
           console.error(err)
         })
+      },
+
+      // 获取校核人列表
+      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.DataEntryId
+        this.jiaoheshow = true
+      },
+      checkstatus () {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.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)
+          })
+      },
+      // 提交校核
+      makesure () {
+        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(() => {})
+      },
+      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(() => {})
       }
     }
   }

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

@@ -11,43 +11,53 @@
         <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/reportnobeampumpingunit'">-->
-            <!--<el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>-->
-          <!--</router-link>-->
+        <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>
       </div>
       <el-form label-width="110px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="单位名称">
-              <el-input v-model.trim="formData.TestDepart" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.TestDepart" 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.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="变压器编号">
-              <el-input v-model.trim="formData.Number" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.Number" 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.Type" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.Type" 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="130px">
-              <el-input v-model.trim="formData.Manufacturer" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.Manufacturer" 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="130px">
-              <el-date-picker style="width: 100%" v-model="formData.ProductionDate" type="date" placeholder="请选择日期">
+              <el-date-picker style="width: 100%" v-model="formData.ProductionDate" type="date" placeholder="请选择日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -57,7 +67,7 @@
             <el-col :span="8">
               <el-form-item label="额定容量"
                             prop="Capacity">
-                <el-input type="number" step="0.01" v-model.number="formData.Capacity" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.Capacity" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">Se(kVA)</template>
                 </el-input>
               </el-form-item>
@@ -65,7 +75,7 @@
             <el-col :span="8">
               <el-form-item label="额定电压"
                             prop="RatedVoltage">
-                <el-input type="number" step="0.01" v-model.number="formData.RatedVoltage" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.RatedVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">U1e/U2e</template>
                 </el-input>
               </el-form-item>
@@ -73,7 +83,7 @@
             <el-col :span="8">
               <el-form-item label="额定电流"
                             prop="RatedCurrent">
-                <el-input type="number" step="0.01" v-model.number="formData.RatedCurrent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.RatedCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">I1e/I2e</template>
                 </el-input>
               </el-form-item>
@@ -81,7 +91,7 @@
             <el-col :span="8">
               <el-form-item label="空载损耗"
                             prop="NoloadLoss">
-                <el-input type="number" step="0.01" v-model.number="formData.NoloadLoss" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.NoloadLoss" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">P<sub>O</sub>(kW)</template>
                 </el-input>
               </el-form-item>
@@ -89,7 +99,7 @@
             <el-col :span="8">
               <el-form-item label="负载损耗"
                             prop="LoadLoss">
-                <el-input type="number" step="0.01" v-model.number="formData.LoadLoss" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.LoadLoss" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">P<sub>k</sub>(kW)</template>
                 </el-input>
               </el-form-item>
@@ -97,7 +107,7 @@
             <el-col :span="8">
               <el-form-item label="空载电流"
                             prop="LoadCurrent">
-                <el-input type="number" step="0.01" v-model.number="formData.LoadCurrent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.LoadCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">I<sub>0</sub>(%)</template>
                 </el-input>
               </el-form-item>
@@ -105,20 +115,20 @@
             <el-col :span="8">
               <el-form-item label="阻抗电压"
                             prop="ImpedanceVoltage">
-                <el-input type="number" step="0.01" v-model.number="formData.ImpedanceVoltage" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.ImpedanceVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">U<sub>k</sub>(%)</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="联接组方式">
-                <el-input v-model.trim="formData.JoinGroupMode" placeholder="请输入" style="width: 100%">
+                <el-input v-model.trim="formData.JoinGroupMode" 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.Standard" placeholder="请输入" style="width: 100%">
+                <el-input v-model.trim="formData.Standard" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -133,7 +143,7 @@
             <el-col :span="6">
               <el-form-item label="平均电压"
                             prop="AvgVoltage">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgVoltage" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgVoltage" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">V</template>
                 </el-input>
               </el-form-item>
@@ -141,7 +151,7 @@
             <el-col :span="6">
               <el-form-item label="平均电流"
                             prop="AvgCurrent">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgCurrent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgCurrent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">V</template>
                 </el-input>
               </el-form-item>
@@ -149,7 +159,7 @@
             <el-col :span="6">
               <el-form-item label="平均有功"
                             prop="AvgActive">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgActive" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgActive" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kW</template>
                 </el-input>
               </el-form-item>
@@ -157,7 +167,7 @@
             <el-col :span="6">
               <el-form-item label="平均无功"
                             prop="AvgReactive">
-                <el-input type="number" step="0.01" v-model.number="formData.AvgReactive" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.AvgReactive" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kvar</template>
                 </el-input>
               </el-form-item>
@@ -165,7 +175,7 @@
             <el-col :span="6">
               <el-form-item label="平均视在"
                             prop="Apparent">
-                <el-input type="number" step="0.01" v-model.number="formData.Apparent" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.Apparent" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kVA</template>
                 </el-input>
               </el-form-item>
@@ -173,14 +183,14 @@
             <el-col :span="6">
               <el-form-item label="功率因数"
                             prop="PowerFactor">
-                <el-input type="number" step="0.01" v-model.number="formData.PowerFactor" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.PowerFactor" 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="Active">
-                <el-input type="number" step="0.01" v-model.number="formData.Active" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.Active" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kW</template>
                 </el-input>
               </el-form-item>
@@ -189,7 +199,7 @@
             <el-col :span="6">
               <el-form-item label="累计有功-"
                             prop="NegativeActive">
-                <el-input type="number" step="0.01" v-model.number="formData.NegativeActive" placeholder="请输入">
+                <el-input type="number" step="0.01" v-model.number="formData.NegativeActive" placeholder="请输入" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kW</template>
                 </el-input>
               </el-form-item>
@@ -198,7 +208,7 @@
             <el-row>
             <el-col :span="6">
               <el-form-item label="累计无功+">
-                <el-input type="number" step="0.01" v-model.number="formData.Reactive" placeholder="请输入" >
+                <el-input type="number" step="0.01" v-model.number="formData.Reactive" placeholder="请输入" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" >
                   <template slot="append">kvar</template>
                 </el-input>
               </el-form-item>
@@ -206,20 +216,20 @@
             <el-col :span="6">
               <el-form-item label="累计无功-"
                             prop="NegativeReactive">
-                <el-input type="number" step="0.01" v-model.number="formData.NegativeReactive" placeholder="请输入">
+                <el-input type="number" step="0.01" v-model.number="formData.NegativeReactive" placeholder="请输入" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                   <template slot="append">kvar</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="测试时间">
-                <el-date-picker style="width: 100%" v-model="formData.TestTime" type="date" placeholder="请选择检测日期">
+                <el-date-picker style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" v-model="formData.TestTime" type="date" placeholder="请选择检测日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="使用仪器">
-                <el-input v-model.trim="formData.EquipName" placeholder="请输入">
+                <el-input v-model.trim="formData.EquipName" placeholder="请输入" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -227,14 +237,14 @@
             <el-row>
             <el-col :span="6">
               <el-form-item label="仪器状态">
-                <el-input v-model.trim="formData.EquipStatus" placeholder="请输入">
+                <el-input v-model.trim="formData.EquipStatus" placeholder="请输入" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </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%">
+                <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>
@@ -242,19 +252,19 @@
             <el-col :span="6">
               <el-form-item label="相对湿度"
                             prop="Humidity">
-                <el-input type="number" step="0.01" v-model.number="formData.Humidity" placeholder="请输入" style="width: 100%">
+                <el-input type="number" step="0.01" v-model.number="formData.Humidity" 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="24">
               <el-form-item label="备注">
-                <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+                <el-input type="textarea" v-model.trim="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
                 <el-form-item :span="24" style="text-align: center;">
-                  <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+                  <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-circle-check"></i>
                     保存
                   </el-button>
                 </el-form-item>
@@ -264,6 +274,44 @@
 
       </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>
 
@@ -287,6 +335,12 @@
         TaskBalanceId: '',
         DataEntryId: '',
         TestDepartId: '',
+        ProoFreadShow: false,
+        jiaoheshow: false,
+        sign: '2',
+        ischeck: 0,
+        DataStatus: '0',
+        acceptUsers: [],
         formData: {
           Id: '',
           EId: '',
@@ -332,10 +386,17 @@
           ModifiedUserId: '',
           ModifiedBy: ''
         },
-        rules: {
-          TrafficTest1: [
-            {type: 'number', message: '请选择日期', trigger: 'blur'}
-          ]
+        // 校核提交
+        shenhesubmitForm: {
+          AuditorUserId: '',
+          DataEntryId: '',
+          SuccessStatus: 1,
+          AuditorRemark: ''
+        },
+        jiaoheForm: {
+          SuccessStatus: 2,
+          AuditorRemark: '',
+          DataEntryId: 0
         }
       }
     },
@@ -343,8 +404,12 @@
       this.EId = this.$route.query.eid
       this.TaskBalanceId = this.$route.query.tbid
       this.DataEntryId = this.$route.query.deid
+      this.DataStatus = this.$route.query.datastatus
+      this.sign = this.$route.query.sign
+      this.ischeck = this.$route.query.ischeck
       this.formData.DataEntryId = parseInt(this.DataEntryId)
       this.initData()
+      this.getUsersByRole()
     },
     methods: {
       saveEntity () {
@@ -406,6 +471,113 @@
         }).catch(err => {
           console.error(err)
         })
+      },
+
+      // 获取校核人列表
+      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.DataEntryId
+        this.jiaoheshow = true
+      },
+      checkstatus () {
+        this.shenhesubmitForm.SuccessStatus = 1
+        this.shenhesubmitForm.DataEntryId = parseInt(this.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)
+          })
+      },
+      // 提交校核
+      makesure () {
+        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(() => {})
+      },
+      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(() => {})
       }
 
     }