3
2
Ver Fonte

计量提交校核修改

huahaiyan há 6 anos atrás
pai
commit
d50474b2da

+ 2 - 0
src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalercarbon.go

@@ -93,6 +93,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
+	dataentrymodel.Spec = model.BenMainform.Spec
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -103,6 +104,7 @@ func (this *LimsReportAlerCarbonController) AddCarbonEntity() {
 		"PositionCheck",
 		"Temperature",
 		"DetectBasis",
+		"Spec",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",

+ 2 - 0
src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalerfhgas.go

@@ -96,6 +96,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
+	dataentrymodel.Spec = model.BenMainform.Spec
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -106,6 +107,7 @@ func (this *LimsReportAlerFHController) AddFHEntity() {
 		"PositionCheck",
 		"Temperature",
 		"DetectBasis",
+		"Spec",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",

+ 2 - 0
src/dashoo.cn/backend/api/controllers/limsmetering/limsreportalerkrgas.go

@@ -96,6 +96,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
+	dataentrymodel.Spec = model.BenMainform.Spec
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -106,6 +107,7 @@ func (this *LimsReportAlerKRController) AddKREntity() {
 		"PositionCheck",
 		"Temperature",
 		"DetectBasis",
+		"Spec",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",

+ 2 - 0
src/dashoo.cn/backend/api/controllers/limsmetering/limsreportanal1carbonredgas.go

@@ -108,6 +108,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
+	dataentrymodel.Spec = model.BenMainform.Spec
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -118,6 +119,7 @@ func (this *LimsReportAnCarbon1Controller) AddCarbon1Entity() {
 		"PositionCheck",
 		"Temperature",
 		"DetectBasis",
+		"Spec",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",

+ 2 - 0
src/dashoo.cn/backend/api/controllers/limsmetering/limsreportanal2carbonredgas.go

@@ -97,6 +97,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
+	dataentrymodel.Spec = model.BenMainform.Spec
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -107,6 +108,7 @@ func (this *LimsReportAlerCarbon2Controller) AddCarbon2Entity() {
 		"PositionCheck",
 		"Temperature",
 		"DetectBasis",
+		"Spec",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",

+ 2 - 0
src/dashoo.cn/backend/api/controllers/limsmetering/limsreportben.go

@@ -156,6 +156,7 @@ func (this *LimsReportBenController) AddEntity() {
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
+	dataentrymodel.Spec = model.BenMainform.Spec
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -164,6 +165,7 @@ func (this *LimsReportBenController) AddEntity() {
 		"Instrument1",
 		"Temperature",
 		"DetectBasis",
+		"Spec",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",

+ 2 - 0
src/dashoo.cn/backend/api/controllers/limsmetering/limsreportdetHSgas.go

@@ -96,6 +96,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
+	dataentrymodel.Spec = model.BenMainform.Spec
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -106,6 +107,7 @@ func (this *LimsReportDeHSController) AddHSEntity() {
 		"PositionCheck",
 		"Temperature",
 		"DetectBasis",
+		"Spec",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",

+ 2 - 0
src/dashoo.cn/backend/api/controllers/limsmetering/limsreportdetelectoxygen.go

@@ -96,6 +96,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
+	dataentrymodel.Spec = model.BenMainform.Spec
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -106,6 +107,7 @@ func (this *LimsReportDeOxygenController) AddOxygenEntity() {
 		"PositionCheck",
 		"Temperature",
 		"DetectBasis",
+		"Spec",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",

+ 22 - 0
src/dashoo.cn/frontend_web/src/pages/lims/reportalertorcarbondetect/_opera/operation.vue

@@ -388,6 +388,28 @@
         </div>
       </template>
     </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>
   </div>
 </template>
 

+ 22 - 0
src/dashoo.cn/frontend_web/src/pages/lims/reportalertorfhgasdetect/_opera/operation.vue

@@ -419,6 +419,28 @@
         </div>
       </template>
     </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>
   </div>
 </template>
 

+ 22 - 0
src/dashoo.cn/frontend_web/src/pages/lims/reportalertorkrgasdetect/_opera/operation.vue

@@ -411,6 +411,28 @@
         </div>
       </template>
     </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>
   </div>
 </template>
 

+ 22 - 0
src/dashoo.cn/frontend_web/src/pages/lims/reportanalyzer1carbonredgas/_opera/operation.vue

@@ -397,6 +397,28 @@
         </div>
       </template>
     </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>
   </div>
 </template>
 

+ 22 - 0
src/dashoo.cn/frontend_web/src/pages/lims/reportanalyzer2carbonredgas/_opera/operation.vue

@@ -397,6 +397,28 @@
         </div>
       </template>
     </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>
   </div>
 </template>
 

+ 22 - 0
src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorHSgas/_opera/operation.vue

@@ -416,6 +416,28 @@
         </div>
       </template>
     </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>
   </div>
 </template>
 

+ 22 - 0
src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorelectoxygen/_opera/operation.vue

@@ -356,6 +356,28 @@
         </div>
       </template>
     </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>
   </div>
 </template>