徐明浩

特种设备-起重机械、叉车、电梯的所有台账中增添一列填写定期检验结论

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

@@ -127,6 +127,10 @@ public class TSpecdevCc extends BaseEntity
     @Excel(name = "资产归属形式")
     private String assetOwner;
 
+    /** 定期检验结论 */
+    @Excel(name = "定期检验结论")
+    private String perTestConclusion;
+
     /** 备注 */
     //@Excel(name = "备注")
     private String remarks;
@@ -210,6 +214,14 @@ public class TSpecdevCc extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    public String getPerTestConclusion() {
+        return perTestConclusion;
+    }
+
+    public void setPerTestConclusion(String perTestConclusion) {
+        this.perTestConclusion = perTestConclusion;
+    }
+
     public Long getHiFlag() {
         return hiFlag;
     }

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

@@ -99,6 +99,10 @@ public class TSpecdevDt extends BaseEntity
     @Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date nextWarnDate;
 
+    /** 定期检验结论 */
+    @Excel(name = "定期检验结论")
+    private String perTestConclusion;
+
     /** 备注 */
     //@Excel(name = "备注")
     private String remarks;
@@ -182,6 +186,15 @@ public class TSpecdevDt extends BaseEntity
 
     @TableField(exist = false)
     private String checkYear;
+
+    public String getPerTestConclusion() {
+        return perTestConclusion;
+    }
+
+    public void setPerTestConclusion(String perTestConclusion) {
+        this.perTestConclusion = perTestConclusion;
+    }
+
     public Long getHiFlag() {
         return hiFlag;
     }

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

@@ -111,6 +111,10 @@ public class TSpecdevDzsb extends BaseEntity
     @Excel(name = "检验报告编号")
     private String reportNo;
 
+    /** 定期检验结论 */
+    @Excel(name = "定期检验结论")
+    private String perTestConclusion;
+
     /** 备注 */
     //@Excel(name = "备注")
     private String remarks;
@@ -184,6 +188,14 @@ public class TSpecdevDzsb extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    public String getPerTestConclusion() {
+        return perTestConclusion;
+    }
+
+    public void setPerTestConclusion(String perTestConclusion) {
+        this.perTestConclusion = perTestConclusion;
+    }
+
     public Long getHiFlag() {
         return hiFlag;
     }

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="productNo"    column="product_no"    />
         <result property="assetOwner"    column="asset_owner"    />
         <result property="hiFlag" column="hiFlag" />
+        <result property="perTestConclusion" column="per_test_conclusion" />
     </resultMap>
 
     <sql id="selectTSpecdevCcVo">
@@ -62,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                d.creater_code,
                d.createdate,
                d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.engine_no, d.color, d.capacity, d.model, d.engine_type, d.dev_class, d.ex_unit, d.use_dept, d.engineer, d.ex_grade, d.report_no, d.frame_no, d.product_no, d.asset_owner ,s.dept_name,
-        (SELECT COUNT(1) from T_SPECHI_CC h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag
+        (SELECT COUNT(1) from T_SPECHI_CC h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
         from t_specdev_cc d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -165,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="frameNo != null">frame_no,</if>
             <if test="productNo != null">product_no,</if>
             <if test="assetOwner != null">asset_owner,</if>
+            <if test="perTestConclusion != null">per_test_conclusion,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -209,6 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="frameNo != null">#{frameNo},</if>
             <if test="productNo != null">#{productNo},</if>
             <if test="assetOwner != null">#{assetOwner},</if>
+            <if test="perTestConclusion != null">#{perTestConclusion},</if>
          </trim>
     </insert>
 
@@ -256,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="frameNo != null">frame_no = #{frameNo},</if>
             <if test="productNo != null">product_no = #{productNo},</if>
             <if test="assetOwner != null">asset_owner = #{assetOwner},</if>
+            <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
         </trim>
         where id = #{id}
     </update>
@@ -304,6 +308,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="frameNo != null">frame_no = #{frameNo},</if>
             <if test="productNo != null">product_no = #{productNo},</if>
             <if test="assetOwner != null">asset_owner = #{assetOwner},</if>
+            <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
         </trim>
         where id = #{devId}
     </update>

master/src/main/resources/mybatis/sems/TSpecdevDtMapper.xml

@@ -41,11 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="changeTime"    column="change_time"    />
         <result property="reportNo"    column="report_no"    />
         <result property="hiFlag" column="hiFlag" />
+        <result property="perTestConclusion" column="per_test_conclusion" />
     </resultMap>
 
     <sql id="selectTSpecdevDtVo">
         select d.id, d.plant_code, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no ,s.dept_name,
-        (SELECT COUNT(1) from T_SPECHI_DT h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag
+        (SELECT COUNT(1) from T_SPECHI_DT h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
         from t_specdev_dt d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -147,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveTime != null">approve_time,</if>
             <if test="changeTime != null">change_time,</if>
             <if test="reportNo != null">report_no,</if>
+            <if test="perTestConclusion != null">per_test_conclusion,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -184,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveTime != null">#{approveTime},</if>
             <if test="changeTime != null">#{changeTime},</if>
             <if test="reportNo != null">#{reportNo},</if>
+            <if test="perTestConclusion != null">#{perTestConclusion},</if>
          </trim>
     </insert>
 
@@ -224,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveTime != null">approve_time = #{approveTime},</if>
             <if test="changeTime != null">change_time = #{changeTime},</if>
             <if test="reportNo != null">report_no = #{reportNo},</if>
+            <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
         </trim>
         where id = #{id}
     </update>
@@ -265,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveTime != null">approve_time = #{approveTime},</if>
             <if test="changeTime != null">change_time = #{changeTime},</if>
             <if test="reportNo != null">report_no = #{reportNo},</if>
+            <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
         </trim>
         where id = #{devId}
     </update>

master/src/main/resources/mybatis/sems/TSpecdevDzsbMapper.xml

@@ -41,11 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="engineer"    column="engineer"    />
         <result property="isEx"    column="is_ex"    />
         <result property="hiFlag" column="hiFlag" />
+        <result property="perTestConclusion" column="per_test_conclusion" />
     </resultMap>
 
     <sql id="selectTSpecdevDzsbVo">
         select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex  ,s.dept_name,
-        (SELECT COUNT(1) from T_SPECHI_DZSB h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag
+        (SELECT COUNT(1) from T_SPECHI_DZSB h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
         from t_specdev_dzsb d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -129,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkUnit != null">check_unit,</if>
             <if test="engineer != null">engineer,</if>
             <if test="isEx != null">is_ex,</if>
+            <if test="perTestConclusion != null">per_test_conclusion,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -166,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkUnit != null">#{checkUnit},</if>
             <if test="engineer != null">#{engineer},</if>
             <if test="isEx != null">#{isEx},</if>
+            <if test="perTestConclusion != null">#{perTestConclusion},</if>
          </trim>
     </insert>
 
@@ -206,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkUnit != null">check_unit = #{checkUnit},</if>
             <if test="engineer != null">engineer = #{engineer},</if>
             <if test="isEx != null">is_ex = #{isEx},</if>
+            <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
         </trim>
         where id = #{id}
     </update>
@@ -247,6 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkUnit != null">check_unit = #{checkUnit},</if>
             <if test="engineer != null">engineer = #{engineer},</if>
             <if test="isEx != null">is_ex = #{isEx},</if>
+            <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
         </trim>
         where id = #{devId}
     </update>

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

@@ -108,6 +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" 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)">
@@ -319,6 +320,13 @@
           </el-form-item>
           </el-col>
         </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>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -596,6 +604,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,

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" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -367,6 +367,11 @@
           <el-input v-model="form.remarks" :placeholder="$t('请输入')+ $t('备注')" />
         </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>
+          </el-col>
 <!--          <el-col :span="12">
           <el-form-item :label="$t('归属部门')" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择')+ $t('归属部门')" />
@@ -657,6 +662,7 @@
         updatedate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,

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="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" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -371,6 +371,13 @@
           </el-form-item>
           </el-col>
         </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>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -648,6 +655,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion: null,
         approveStatus: 0,
         regno: null,
         useno: null,

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

@@ -108,6 +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" 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)">
@@ -320,6 +321,13 @@
           </el-form-item>
           </el-col>
         </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>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -597,6 +605,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,

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

@@ -100,6 +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" 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)">
@@ -519,6 +520,7 @@ export default {
         updaterDate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,

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

@@ -146,6 +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" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -301,6 +302,13 @@
         </el-form-item>
         </el-col>
       </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>
+        </el-col>
+      </el-row>
 <!--          <el-form-item :label="$t('归属部门')" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
           </el-form-item>-->
@@ -585,6 +593,7 @@
         updaterDate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,

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="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>

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

@@ -145,6 +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" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -292,9 +293,18 @@
         </el-form-item>
         </el-col>
       </el-row>
+        <el-row>
+          <el-col  :span="12">
           <el-form-item :label="$t('归属部门')" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
           </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>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -569,6 +579,7 @@ export default {
         updaterDate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,

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

@@ -100,6 +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" 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)">
@@ -519,6 +520,7 @@ export default {
         updaterDate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,

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

@@ -229,6 +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" 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)">
@@ -407,6 +408,13 @@
           </el-form-item>
           </el-col>
         </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>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -589,6 +597,7 @@ export default {
         devno: null,
         submitdate: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: null,
         regno: null,
         useno: null,

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" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -455,6 +455,12 @@
           <el-input v-model="form.remarks" :placeholder="$t('请输入')+ $t('备注')" />
         </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>
+          </el-col>
+
 <!--          <el-col :span="12">
           <el-form-item :label="$t('归属部门')" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择')+ $t('归属部门')" />
@@ -768,6 +774,7 @@
         updatedate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,

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="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" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -459,6 +459,13 @@
           </el-form-item>
           </el-col>
         </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>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -641,6 +648,7 @@ export default {
         devno: null,
         submitdate: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: null,
         regno: null,
         useno: null,

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

@@ -230,6 +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" 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)">
@@ -409,6 +410,13 @@
           </el-form-item>
           </el-col>
         </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>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -702,6 +710,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,