diff --git a/src/views/ysjl/2000/2100/fenxiang/aqfj.vue b/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
index 60c5543..5aca364 100644
--- a/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
+++ b/src/views/ysjl/2000/2100/fenxiang/aqfj.vue
@@ -1,6 +1,6 @@
 <!-- 安全附件分项页面 -->
 <template>
-  <div class="app-container">
+  <div class="app-container" style="margin-top: -15px;">
     <sticky style="margin-bottom: 10px;">
       <btn ref="btn" />
     </sticky>
@@ -15,30 +15,38 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型号" prop="aqfxinghao">
+              <el-input v-model="param.aqfxinghao" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="aqfshuliang">
-              <el-input v-model="param.aqfshuliang" :disabled="edit || editAqf" />
+              <el-input v-model="param.aqfshuliang" :disabled="edit"><template slot="append">台</template></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="校验日期" prop="aqfjianyanriqi">
+              <el-input v-model="param.aqfjianyanriqi" :disabled="edit"/>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item label="是否在校验有效期内" label-width="170px" prop="aqfyouxiaoqi">
-              <el-select v-model="param.aqfyouxiaoqi" filterable allow-create default-first-option placeholder="请选择" :disabled="edit || editAqf">
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-                <el-option label="无此项" value="无此项" />
-              </el-select>
+            <el-form-item label="校验报告编号" prop="aqfjiaoyanbaogaobianhao">
+              <el-input v-model="param.aqfjiaoyanbaogaobianhao" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item prop="aqfexist">
-              <el-checkbox v-model="param.aqfexist" label="设备本体无安全阀" true-label="设备本体无安全阀" border @change="changeAqf" />
+            <el-form-item label="整定压力" prop="aqfzhengdingyali">
+              <el-input v-model="param.aqfzhengdingyali" :disabled="edit"><template slot="append">MPa</template></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item label="检验日期" label-width="135px" prop="aqfjianyanriqi">
-              <el-input v-model="param.aqfjianyanriqi" :disabled="edit || editAqf" />
+            <el-form-item label="安装位置" prop="aqfanzhuangweizhi">
+              <el-input v-model="param.aqfanzhuangweizhi" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -46,75 +54,263 @@
       <fieldset>
         <legend>爆破片装置</legend>
         <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型号" prop="bppxinghao">
+              <el-input v-model="param.bppxinghao" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="9">
             <el-form-item label="数量" prop="bppshuliang">
-              <el-input v-model="param.bppshuliang" :disabled="edit || editBpp" />
+              <el-input v-model="param.bppshuliang" :disabled="edit"><template slot="append">个</template></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item label="是否按期更换" prop="bppgenghuanzhouqiyaoqiu">
-              <el-select v-model="param.bppgenghuanzhouqiyaoqiu" filterable allow-create default-first-option placeholder="请选择" :disabled="edit || editBpp">
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-                <el-option label="无此项" value="无此项" />
-              </el-select>
+            <el-form-item label="规格" prop="bppguige">
+              <el-input v-model="param.bppguige" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="更换周期要求" prop="bppgenghuanzhouqiyaoqiu">
+              <el-input v-model="param.bppgenghuanzhouqiyaoqiu" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item prop="bppexist">
-              <el-checkbox v-model="param.bppexist" label="设备本体无爆破片装置" true-label="设备本体无爆破片装置" border @change="changeBpp" />
+            <el-form-item label="更换日期" prop="bppgenghuariqi">
+              <el-input v-model="param.bppgenghuariqi" :disabled="edit"/>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item label="检验日期" label-width="135px" prop="bppjianyanriqi">
-              <el-input v-model="param.bppjianyanriqi" :disabled="edit || editBpp" />
+            <el-form-item label="安装位置" prop="bppanzhuangweizhi">
+              <el-input v-model="param.bppanzhuangweizhi" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
       </fieldset>
       <fieldset>
-        <legend>安全联锁装置</legend>
+        <legend>压力表</legend>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item label="是否满足设计文件规定的使用技术要求" label-width="270px" prop="shifoumanzu">
-              <el-select v-model="param.shifoumanzu" filterable allow-create default-first-option placeholder="请选择" :disabled="edit || editAqls">
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
-                <el-option label="无此项" value="无此项" />
-              </el-select>
+            <el-form-item label="量程" prop="ylbliangcheng">
+              <el-input v-model="param.ylbliangcheng" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="数量" prop="ylbshuliang">
+              <el-input v-model="param.ylbshuliang" :disabled="edit"><template slot="append">个</template></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="精度" prop="ylbjingdu">
+              <el-input v-model="param.ylbjingdu" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="检定日期" prop="ylbjiandingriqi">
+              <el-input v-model="param.ylbjiandingriqi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="检定记录编号" prop="ylbjiandingbaogaobianhao">
+              <el-input v-model="param.ylbjiandingbaogaobianhao" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="安装位置" prop="ylbanzhuangweizhi">
+              <el-input v-model="param.ylbanzhuangweizhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>紧急切断装置</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型式及规格" prop="jjqdzzxingshiguige">
+              <el-input v-model="param.jjqdzzxingshiguige" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="数量" prop="jjqdzzshuliang">
+              <el-input v-model="param.jjqdzzshuliang" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="耐压试验压力" prop="jjqdzznaiyashiyanyali">
+              <el-input v-model="param.jjqdzznaiyashiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="密闭试验压力" prop="jjqdzzmibishiyanyali">
+              <el-input v-model="param.jjqdzzmibishiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="切断时间" prop="jjqdzzqieduanshijian">
+              <el-input v-model="param.jjqdzzqieduanshijian" :disabled="edit"><template slot="append">S</template></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="aqlsexist">
-              <el-checkbox v-model="param.aqlsexist" label="设备本体无安全联锁装置" true-label="设备本体无安全联锁装置" border @change="changeAqls" />
+            <el-form-item label="检修记录" prop="jjqdzzjianxiujilu">
+              <el-input v-model="param.jjqdzzjianxiujilu" :disabled="edit"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item label="检验日期" label-width="135px" prop="aqlsjianyanriqi">
-              <el-input v-model="param.aqlsjianyanriqi" :disabled="edit || editAqls" />
+            <el-form-item label="安装位置" prop="jjqdzzanzhuangweizhi">
+              <el-input v-model="param.jjqdzzanzhuangweizhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="外观" prop="jjqdzzwaiguan">
+              <el-input v-model="param.jjqdzzwaiguan" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>液位（面）计</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型式" prop="ywjxingshi">
+              <el-input v-model="param.ywjxingshi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="数量" prop="ywjshuliang">
+              <el-input v-model="param.ywjshuliang" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="容器充装量" prop="ywjrongqichongzhuangliang">
+              <el-input v-model="param.ywjrongqichongzhuangliang" :disabled="edit"><template slot="append">m³</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="安装位置" prop="ywjanzhuangweizhi">
+              <el-input v-model="param.ywjanzhuangweizhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="外观" prop="ywjwaiguan">
+              <el-input v-model="param.ywjwaiguan" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="误差" prop="ywjwucha">
+              <el-input v-model="param.ywjwucha" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>测温仪表</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="型号" prop="cwybxinghao">
+              <el-input v-model="param.cwybxinghao" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="有效期" prop="cwybyouxiaoqi">
+              <el-input v-model="param.cwybyouxiaoqi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="外观" prop="cwybwaiguan">
+              <el-input v-model="param.cwybwaiguan" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>气相软管</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="试验压力" prop="qxrgshiyanyali">
+              <el-input v-model="param.qxrgshiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="试验介质" prop="qxrgshiyanjiezhi">
+              <el-input v-model="param.qxrgshiyanjiezhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="保压时间" prop="qxrgbaoyashijian">
+              <el-input v-model="param.qxrgbaoyashijian" :disabled="edit"><template slot="append">min</template></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
+      <fieldset>
+        <legend>液相软管</legend>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="试验压力" prop="yxrgshiyanyali">
+              <el-input v-model="param.yxrgshiyanyali" :disabled="edit"><template slot="append">MPa</template></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="试验介质" prop="yxrgshiyanjiezhi">
+              <el-input v-model="param.yxrgshiyanjiezhi" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="9">
+            <el-form-item label="保压时间" prop="yxrgshiyanyali">
+              <el-input v-model="param.yxrgbaoyashijian" :disabled="edit"><template slot="append">min</template></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </fieldset>
       <fieldset>
         <legend>检验信息</legend>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="其它阀门、附件检验" prop="qitajianyan" label-width="150px">
+              <el-input v-model="param.qitajianyan" :disabled="edit"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="检验结果" prop="jianyanjielun">
+              <el-select v-model="ysjl.jianyanjielun" :disabled="edit" type="text" placeholder="请选择" value="合格">
+                <el-option label="合格" value="合格"/>
+                <el-option label="不合格" value="不合格"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="9">
-            <el-form-item label="检验日期" label-width="135px" prop="jianyanjieshuriqi">
-              <el-date-picker v-model="ysjl.jianyanjieshuriqi" :disabled="edit" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" />
+            <el-form-item label="检验日期" prop="jianyanjieshuriqi">
+              <el-date-picker v-model="ysjl.jianyanjieshuriqi" :disabled="edit" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="检验结果" prop="jiancejieguo">
-          <el-input v-model="param.jiancejieguo" :disabled="edit" type="textarea" rows="4" style="width: 800px;" />
-        </el-form-item>
-        <el-form-item label="" prop="jianyanrenyuan" style="display: none;">
-          <el-input v-model="ysjl.jianyanrenyuan" type="text" />
-        </el-form-item>
       </fieldset>
     </el-form>
   </div>
@@ -123,23 +319,14 @@
 import Sticky from '@/components/Sticky'
 import btn from '@/views/common/FxButton'
 export default {
-  name: 'RqZbgAqfj2100',
+  name: 'RqAqfj',
   components: { Sticky, btn },
   data() {
     return {
       ysjl: {},
-      param: {
-        ywjwucha: '±',
-        ylbjiandingriqi: '年 月 日',
-        bppgenghuariqi: '年 月 日',
-        qitajianyan: '未见异常',
-        kuaikaimenjianyanjieguo: true
-      },
+      param: {},
       state: '',
       edit: false,
-      editAqf: false,
-      editBpp: false,
-      editAqls: false,
       ysjlId: this.$route.query.id,
       info: {
         ysjlId: this.$route.query.id,
@@ -169,26 +356,12 @@ export default {
           // 有无损原始记录参数
           this.state = 'update'
           this.param = data.param
-          this.changeAqf(this.param.aqfexist)
-          this.changeBpp(this.param.bppexist)
-          this.changeAqls(this.param.aqlsexist)
-        } else {
-          this.param = {
-            aqfjianyanriqi: this.ysjl.jianyanjieshuriqi,
-            bppjianyanriqi: this.ysjl.jianyanjieshuriqi,
-            aqlsjianyanriqi: this.ysjl.jianyanjieshuriqi
-          }
         }
         if (this.ysjl.flowstatus === 4) {
           this.state = 'finish'
           this.edit = true
         }
-        if (this.param.kuaikaimenjianyanjieguo === '☑满足设计文件规定的使用要求') {
-          this.param.kuaikaimenjianyanjieguo = true
-        } else {
-          this.param.kuaikaimenjianyanjieguo = false
-        }
-        this.$refs.btn.getParentInfo(this.ysjl, this.param, null, null, this.state, this.$route.query.jyxm, true, false)
+        this.$refs.btn.getParentInfo(this.ysjl, this.param, null, this.state, this.$route.query.jyxm)
       })
     },
     // 表格单击选中行
@@ -204,59 +377,6 @@ export default {
         this.delRowIndex.push(val[i].index)
       }
     },
-    changeAqf(val) {
-      if (val) {
-        this.editAqf = true
-        this.param.aqfshuliang = '无此项'
-        this.param.aqfyouxiaoqi = '无此项'
-        this.param.aqfjianyanriqi = '无此项'
-      } else {
-        this.editAqf = false
-        if (this.param.aqfshuliang === '无此项') {
-          this.param.aqfshuliang = ''
-        }
-        if (this.param.aqfyouxiaoqi === '无此项') {
-          this.param.aqfyouxiaoqi = ''
-        }
-        if (this.param.aqfjianyanriqi === '无此项') {
-          this.param.aqfjianyanriqi = this.ysjl.jianyanjieshuriqi
-        }
-      }
-    },
-    changeBpp(val) {
-      if (val) {
-        this.editBpp = true
-        this.param.bppshuliang = '无此项'
-        this.param.bppgenghuanzhouqiyaoqiu = '无此项'
-        this.param.bppjianyanriqi = '无此项'
-      } else {
-        this.editBpp = false
-        if (this.param.bppshuliang === '无此项') {
-          this.param.bppshuliang = ''
-        }
-        if (this.param.bppgenghuanzhouqiyaoqiu === '无此项') {
-          this.param.bppgenghuanzhouqiyaoqiu = ''
-        }
-        if (this.param.bppjianyanriqi === '无此项') {
-          this.param.bppjianyanriqi = this.ysjl.jianyanjieshuriqi
-        }
-      }
-    },
-    changeAqls(val) {
-      if (val) {
-        this.editAqls = true
-        this.param.shifoumanzu = '无此项'
-        this.param.aqlsjianyanriqi = '无此项'
-      } else {
-        this.editAqls = false
-        if (this.param.shifoumanzu === '无此项') {
-          this.param.shifoumanzu = ''
-        }
-        if (this.param.aqlsjianyanriqi === '无此项') {
-          this.param.aqlsjianyanriqi = this.ysjl.jianyanjieshuriqi
-        }
-      }
-    },
     beforeSaveBuildData() {
       // TODO
     }