徐明浩

显示数据替换：
下次外部检测日期 → 下次外部检验日期
检测单位 → 检验单位

master/src/main/java/com/ruoyi/project/sems/domain/TSpecCheck.java

@@ -77,14 +77,14 @@ public class TSpecCheck extends BaseEntity
     @Excel(name = "年度检查报告编号")
     private String yearReportNo;
 
-    /** 本次外部检测日期 */
+    /** 本次外部检验日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "本次外部检测日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "本次外部检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outWarnDate;
 
-    /** 下次外部检测日期 */
+    /** 下次外部检验日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "下次外部检测日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "下次外部检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outNextWarnDate;
 
     /** 外部检验结论 */

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevGl.java

@@ -166,14 +166,14 @@ public class TSpecdevGl extends BaseEntity
     @Excel(name = "装置维修组")
     private String plantMaint;
 
-    /** 本次外部检测日期 */
+    /** 本次外部检验日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "本次外部检测日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "本次外部检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outWarnDate;
 
-    /** 下次外部检测日期 */
+    /** 下次外部检验日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "下次外部检测日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "下次外部检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outNextWarnDate;
 
     /** 外部检验结论 */

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevYlrq.java

@@ -42,11 +42,11 @@ public class TSpecdevYlrq extends BaseEntity
 
     /** 提交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "提交日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "投用日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date submitdate;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态", dictType = "spec_dev_status")
     private Long status;
 
     /** 状态 1 ：正常 ；0：删除 */
@@ -65,15 +65,15 @@ public class TSpecdevYlrq extends BaseEntity
     private Date updatedate;
 
     /** 部门编号 */
-    @Excel(name = "部门编号")
+    //@Excel(name = "部门编号")
     private Long deptId;
 
     /** 备注 */
-    @Excel(name = "备注")
+    //@Excel(name = "备注")
     private String remarks;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态", dictType = "spec_approve_status")
     private Long approveStatus;
 
     /** 注册代码 */

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiGl.java

@@ -172,14 +172,14 @@ public class TSpechiGl extends BaseEntity
     @Excel(name = "装置维修组")
     private String plantMaint;
 
-    /** 本次外部检测日期 */
+    /** 本次外部检验日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "本次外部检测日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "本次外部检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outWarnDate;
 
-    /** 下次外部检测日期 */
+    /** 下次外部检验日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "下次外部检测日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "下次外部检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outNextWarnDate;
 
     /** 外部检验结论 */

ui/src/views/sems/check/check.vue

@@ -27,12 +27,12 @@
         </template>
       </el-table-column>
       <el-table-column v-if="[1,2].includes(this.devType)" :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" />
-      <el-table-column v-if="this.devType == 4" :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+      <el-table-column v-if="this.devType == 4" :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="this.devType == 4" :label="$t('下次外部检测日期')" align="center" prop="outNextWarnDate" width="100">
+      <el-table-column v-if="this.devType == 4" :label="$t('下次外部检验日期')" align="center" prop="outNextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>

ui/src/views/sems/check/index.vue

@@ -103,20 +103,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('本次外部检测日期')" prop="outWarnDate">
+      <el-form-item :label="$t('本次外部检验日期')" prop="outWarnDate">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.outWarnDate"
           type="date"
           value-format="yyyy-MM-dd"
-          :placeholder="$t('请选择') + $t('本次外部检测日期')">
+          :placeholder="$t('请选择') + $t('本次外部检验日期')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('下次外部检测日期')" prop="outNextWarnDate">
+      <el-form-item :label="$t('下次外部检验日期')" prop="outNextWarnDate">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.outNextWarnDate"
                         type="date"
           value-format="yyyy-MM-dd"
-          :placeholder="$t('请选择') + $t('下次外部检测日期')">
+          :placeholder="$t('请选择') + $t('下次外部检验日期')">
         </el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('外部检验结论')" prop="outCheckConclusion">
@@ -256,12 +256,12 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+      <el-table-column :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('下次外部检测日期')" align="center" prop="outNextWarnDate" width="100">
+      <el-table-column :label="$t('下次外部检验日期')" align="center" prop="outNextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -371,20 +371,20 @@
         <el-form-item :label="$t('年度检查报告编号')" prop="yearReportNo">
           <el-input v-model="form.yearReportNo" :placeholder="$t('请输入') + $t('年度检查报告编号')" />
         </el-form-item>
-        <el-form-item :label="$t('本次外部检测日期')" prop="outWarnDate">
+        <el-form-item :label="$t('本次外部检验日期')" prop="outWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('本次外部检测日期')">
+            :placeholder="$t('请选择') + $t('本次外部检验日期')">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('下次外部检测日期')" prop="outNextWarnDate">
+        <el-form-item :label="$t('下次外部检验日期')" prop="outNextWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outNextWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('下次外部检测日期')">
+            :placeholder="$t('请选择') + $t('下次外部检验日期')">
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="$t('外部检验结论')" prop="outCheckConclusion">

ui/src/views/sems/specGl/index.vue

@@ -150,7 +150,7 @@
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('检测单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('本次内部检验日期')" align="center" prop="warnDate" width="100">
         <template slot-scope="scope">
@@ -353,8 +353,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('检测单位')" prop="checkUnit">
-          <el-input v-model="form.checkUnit" :placeholder="$t('请输入')+ $t('检测单位')" />
+        <el-form-item :label="$t('检验单位')" prop="checkUnit">
+          <el-input v-model="form.checkUnit" :placeholder="$t('请输入')+ $t('检验单位')" />
         </el-form-item>
           </el-col>
         </el-row>

ui/src/views/sems/specGl/zx.vue

@@ -358,12 +358,12 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('下次外部检测日期')" prop="outNextWarnDate">
+        <el-form-item :label="$t('下次外部检验日期')" prop="outNextWarnDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.outNextWarnDate"
             type="date"
             value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择')+ $t('下次外部检测日期')">
+            :placeholder="$t('请选择')+ $t('下次外部检验日期')">
           </el-date-picker>
         </el-form-item>
           </el-col>

ui/src/views/sems/specanalysis/BoilerChart.vue

@@ -33,7 +33,7 @@
             <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('检测单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
 
         <el-table-column :label="$t('本次内部检验日期')" align="center" prop="warnDate" width="100">
           <template slot-scope="scope">
@@ -47,14 +47,14 @@
             <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+        <el-table-column :label="$t('本次外部检验日期')" align="center" prop="outWarnDate" width="100">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('外部检验结论')" align="center" prop="outCheckConclusion" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('外部检验报告编号')" align="center" prop="outReportNo" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('下次外部检测日期')" align="center" prop="outNextWarnDate" width="100" sortable="custom">
+        <el-table-column :label="$t('下次外部检验日期')" align="center" prop="outNextWarnDate" width="100" sortable="custom">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
           </template>