徐明浩

特种设备-起重机械、叉车、电梯台账中点击“检验记录”弹出的页面中的“安全等级”修改为“定期检验结论”，并移动到“定期检验日期”那一列和“下次定期检验日期”那一列之间

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

@@ -9,6 +9,7 @@
           <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" />
       <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
@@ -39,7 +40,6 @@
       </el-table-column>
       <el-table-column v-if="this.devType == 4" :label="$t('外部检验结论')" align="center" prop="outCheckConclusion" />
       <el-table-column v-if="this.devType == 4" :label="$t('外部检验编号')" align="center" prop="outReportNo" />
-      <el-table-column :label="$t('安全等级')" align="center" prop="safeClass" />
       <el-table-column :label="$t('录入时间')" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>

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

@@ -108,7 +108,7 @@
       <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.approveTime != null" type="text" size="small" @click="hisApprove(scope.row,devType)">
@@ -322,8 +322,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -153,7 +153,7 @@
       <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -368,8 +368,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
             </el-form-item>
           </el-col>
 <!--          <el-col :span="12">

ui/src/views/sems/specCc/specCc-hisReform.vue

@@ -41,7 +41,7 @@
       <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('创建时间')" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>

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

@@ -153,7 +153,7 @@
       <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -373,8 +373,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -108,7 +108,7 @@
       <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.approveTime != null" type="text" size="small" @click="hisApprove(scope.row,devType)">
@@ -323,8 +323,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -100,7 +100,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.approveTime != null" type="text" size="small" @click="hisApprove(scope.row,devType)">

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

@@ -146,7 +146,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -304,8 +304,8 @@
       </el-row>
         <el-row>
         <el-col :span="12">
-          <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-            <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+          <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+            <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
           </el-form-item>
         </el-col>
       </el-row>

ui/src/views/sems/specDt/specDt-hisReform.vue

@@ -33,7 +33,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('创建时间')" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>

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

@@ -145,7 +145,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -300,8 +300,8 @@
           </el-form-item>
           </el-col>
             <el-col :span="12">
-            <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -100,7 +100,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.approveTime != null" type="text" size="small" @click="hisApprove(scope.row,devType)">

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

@@ -229,7 +229,7 @@
 
       <el-table-column :label="$t('检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
        <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
                <template slot-scope="scope">
                  <el-button v-if="scope.row.approveTime != null" type="text" size="small" @click="hisApprove(scope.row,devType)">
@@ -410,8 +410,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -274,7 +274,7 @@
       </el-table-column>
       <el-table-column :label="$t('检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -456,8 +456,8 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-          <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+        <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+          <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
         </el-form-item>
           </el-col>
 

ui/src/views/sems/specDzsb/specDzsb-hisReform.vue

@@ -38,7 +38,7 @@
 
       <el-table-column :label="$t('检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('创建日期')" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>

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

@@ -274,7 +274,7 @@
 
       <el-table-column :label="$t('检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -461,8 +461,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -230,7 +230,7 @@
 
       <el-table-column :label="$t('检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验记录')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.approveTime != null" type="text" size="small" @click="hisApprove(scope.row,devType)">
@@ -412,8 +412,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('定期检验记录')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验记录')" />
+            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
+              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
             </el-form-item>
           </el-col>
         </el-row>