LY sems

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

@@ -146,17 +146,12 @@
         </template>
       </u-table-column>
       <u-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
-      <u-table-column :label="$t('下次定期检验日期')" align="center" prop="yearWarnDate" width="100">
+      <u-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.yearWarnDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </u-table-column>
-      <u-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.isEdit" v-model="scope.row.yearReportNo" :placeholder="$t('请输入')+$t('年检报告编号')"/>
-          <span v-else>{{ scope.row.yearReportNo }}</span>
+          <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </u-table-column>
+
       <u-table-column label="1" align="center" prop="pj1" :render-header="renderHeader">
         <template slot-scope="scope">
           <el-select v-if="scope.row.isEdit" v-model="scope.row.pj1" :placeholder="$t('请选择')">
@@ -429,6 +424,12 @@
           <span v-if="scope.row.isEdit === false && scope.row.con != null">{{ conFormat(scope.row) }}</span>
         </template>
       </u-table-column>
+      <u-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input v-if="scope.row.isEdit" v-model="scope.row.yearReportNo" :placeholder="$t('请输入')+$t('年检报告编号')"/>
+          <span v-else>{{ scope.row.yearReportNo }}</span>
+        </template>
+      </u-table-column>
       <u-table-column :label="$t('操作')" align="center" fixed="right" width="200"
                       class-name="small-padding">
         <template slot-scope="scope">

ui/src/views/sems/reportYlgd/yearapprove.vue

@@ -33,12 +33,10 @@
 
           </u-table-column>
           <u-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
-          <u-table-column :label="$t('下次定期检验日期')" align="center" prop="yearWarnDate" width="100">
+          <u-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
 
           </u-table-column>
-          <u-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true">
 
-          </u-table-column>
           <u-table-column label="1" align="center" prop="pj1" :render-header="renderHeader">
 
           </u-table-column>
@@ -105,6 +103,9 @@
           </u-table-column>
           <u-table-column :label="$t('检查结论')" align="center" prop="con" :formatter="conFormat">
 
+          </u-table-column>
+          <u-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true">
+
           </u-table-column>
         </u-table>
       </el-form-item>

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

@@ -632,6 +632,12 @@
           <span v-if="scope.row.isEdit === false && scope.row.con != null">{{ conFormat(scope.row) }}</span>
         </template>
       </u-table-column>
+      <u-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input v-if="scope.row.isEdit" v-model="scope.row.yearReportNo" :placeholder="$t('请输入')+$t('年检报告编号')"/>
+          <span v-else>{{ scope.row.yearReportNo }}</span>
+        </template>
+      </u-table-column>
       <u-table-column :label="$t('操作')" align="center" fixed="right" width="200"
                        class-name="small-padding">
         <template slot-scope="scope">

ui/src/views/sems/reportYlrq/yearapprove.vue

@@ -395,6 +395,9 @@
             :label="$t('结论')"
             :formatter="conFormat">
           </el-table-column>
+          <el-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true">
+
+          </el-table-column>
         </el-table>
       </el-form-item>
       <el-form-item :label="$t('CTM检查人')" label-width="140" prop="inspectorOne">