徐明浩

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

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

@@ -114,8 +114,8 @@ public class TSpecdevCc extends BaseEntity
     @Excel(name = "初检日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date firstWarnDate;
 
-    /** 检测单位 */
-    @Excel(name = "检测单位")
+    /** 检验单位 */
+    @Excel(name = "检验单位")
     private String checkUnit;
 
     /** 档案号 */

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

@@ -139,8 +139,8 @@ public class TSpecdevDt extends BaseEntity
     @Excel(name = "初检日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date firstWarnDate;
 
-    /** 检测单位 */
-    @Excel(name = "检测单位")
+    /** 检验单位 */
+    @Excel(name = "检验单位")
     private String checkUnit;
 
     /** 档案号 */

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

@@ -42,11 +42,11 @@ public class TSpecdevGl 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：删除 */
@@ -68,11 +68,11 @@ public class TSpecdevGl extends BaseEntity
     private Long deptId;
 
     /** 备注 */
-    @Excel(name = "备注")
+    //@Excel(name = "备注")
     private String remarks;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态", dictType = "spec_approve_status")
     private Long approveStatus;
 
     /** 注册代码 */
@@ -83,17 +83,17 @@ public class TSpecdevGl extends BaseEntity
     @Excel(name = "使用证编号")
     private String useno;
 
-    /** 上次年检时间 */
+    /** 本次内部检验日期 */
     @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 warnDate;
 
     /** 检测周期 */
     private Long warnCycle;
 
-    /** 下次年检时间 */
+    /** 下次内部检验日期 */
     @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 nextWarnDate;
 
     /** 预警标识 */
@@ -132,8 +132,8 @@ public class TSpecdevGl extends BaseEntity
     @Excel(name = "操作温度")
     private String optTemp;
 
-    /** 检测单位 */
-    @Excel(name = "检测单位")
+    /** 检验单位 */
+    @Excel(name = "检验单位")
     private String checkUnit;
 
     /** 检查结论 */

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

@@ -84,18 +84,18 @@ public class TSpecdevYlrq extends BaseEntity
     @Excel(name = "使用证编号")
     private String useno;
 
-    /** 上次年检时间 */
+    /** 定期检验日期 */
     @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 warnDate;
 
     /** 检测周期 */
     @Excel(name = "检测周期")
     private Long warnCycle;
 
-    /** 下次年检时间 */
+    /** 下次定期检验日期 */
     @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 nextWarnDate;
 
     /** 预警标识 */

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

@@ -119,8 +119,8 @@ public class TSpechiCc extends BaseEntity
     @Excel(name = "初检日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date firstWarnDate;
 
-    /** 检测单位 */
-    @Excel(name = "检测单位")
+    /** 检验单位 */
+    @Excel(name = "检验单位")
     private String checkUnit;
 
     /** 档案号 */

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

@@ -144,8 +144,8 @@ public class TSpechiDt extends BaseEntity
     @Excel(name = "初检日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date firstWarnDate;
 
-    /** 检测单位 */
-    @Excel(name = "检测单位")
+    /** 检验单位 */
+    @Excel(name = "检验单位")
     private String checkUnit;
 
     /** 档案号 */

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

@@ -138,8 +138,8 @@ public class TSpechiGl extends BaseEntity
     @Excel(name = "操作温度")
     private String optTemp;
 
-    /** 检测单位 */
-    @Excel(name = "检测单位")
+    /** 检验单位 */
+    @Excel(name = "检验单位")
     private String checkUnit;
 
     /** 检查结论 */

ui/src/views/sems/specDt/bf.vue

@@ -215,8 +215,8 @@
       </el-row>
       <el-row>
         <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-col :span="12">

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

@@ -274,8 +274,8 @@
       </el-row>
       <el-row>
         <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-col :span="12">

ui/src/views/sems/specDt/ty.vue

@@ -265,8 +265,8 @@
       </el-row>
       <el-row>
         <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-col :span="12">

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

@@ -215,8 +215,8 @@
       </el-row>
       <el-row>
         <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-col :span="12">

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

@@ -112,7 +112,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">
@@ -307,8 +307,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/specGl-hisReform.vue

@@ -27,7 +27,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">

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

@@ -149,7 +149,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">
@@ -350,8 +350,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

@@ -112,7 +112,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">
@@ -307,8 +307,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>