safecheck-client 3.0.30-9 → 3.0.30-90

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -481,6 +481,14 @@ export default {
         return '未使用天然气则必须拍照'
       if(Vue.android && this.data.f_entry_status == '到访不遇' && this.data.f_noanswer_path == Vue.nopic)
         return  '到访不遇必须拍照'
+
+      if(Vue.android && this.data.f_entry_status == '激光检漏' && this.data.f_detection_path == Vue.nopic)
+        return  '激光检漏必须拍照'
+      if(Vue.android && this.data.f_entry_status == '立杠保压' && this.data.f_pressure_path == Vue.nopic)
+        return  '立杠保压必须拍照'
+      if(Vue.android && this.data.f_entry_status == '室外关阀' && this.data.f_outdoor_path == Vue.nopic)
+        return  '室外关阀必须拍照'
+
     },
     verifyUser() {
       let prefix = '用户基本信息：'

package/src/components/rongcheng/SafecheckUserInfo.vue

@@ -69,6 +69,9 @@
         <div class="form-group" :class="style__">
           <span class="col-md-3 col-sm-4 col-xs-4  text-left"><img src="../../assets/housestyle.png" style="width: 20px;margin-bottom: 5px;text-align: left" alt="">入户状态:</span>
           <div :class="style__" class="col-md-9 col-sm-8 col-xs-8 text-center">
+            <input type="radio" name="enterstatus" v-model="f_entry_status" id="new1" value="激光检漏">激光检漏
+            <input type="radio" name="enterstatus" v-model="f_entry_status" id="new2" value="立杠保压">立杠保压
+            <input type="radio" name="enterstatus" v-model="f_entry_status" id="new3" value="室外关阀">室外关阀
             <input type="radio" name="enterstatus" v-model="f_entry_status" id="nopeople" value="到访不遇">到访不遇
             <input type="radio" name="enterstatus" v-model="f_entry_status" id="rejectchecck" value="拒检">拒检
             <input type="radio" name="enterstatus" v-model="f_entry_status" id="enterhouse" value="入户">入户
@@ -223,6 +226,407 @@
             </div>
 
           </div>
+          <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='激光检漏'">
+            <label class="text-left font">激光检漏照片：</label>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_detection_path" alt="激光检漏照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_detection_path', '激光检漏照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_detection_path', this.f_detection_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_detection2_path" alt="激光检漏照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_detection2_path', '激光检漏照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_detection2_path', this.f_detection2_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_detection3_path" alt="激光检漏照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_detection3_path', '激光检漏照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_detection3_path', this.f_detection3_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_detection4_path" alt="激光检漏照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_detection4_path', '激光检漏照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_detection4_path', this.f_detection4_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_detection5_path" alt="激光检漏照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_detection5_path', '激光检漏照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_detection5_path', this.f_detection5_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_detection6_path" alt="激光检漏照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_detection6_path', '激光检漏照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_detection6_path', this.f_detection6_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_detection7_path" alt="激光检漏照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_detection7_path', '激光检漏照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_detection7_path', this.f_detection7_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_detection8_path" alt="激光检漏照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_detection8_path', '激光检漏照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_detection8_path', this.f_detection8_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+          </div>
+          <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='立杠保压'">
+            <label class="text-left font">立杠保压照片：</label>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_pressure_path" alt="立杠保压照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_pressure_path', '立杠保压照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_pressure_path', this.f_pressure_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_pressure2_path" alt="立杠保压照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_pressure2_path', '立杠保压照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_pressure2_path', this.f_pressure2_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_pressure3_path" alt="立杠保压照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_pressure3_path', '立杠保压照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_pressure3_path', this.f_pressure3_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_pressure4_path" alt="立杠保压照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_pressure4_path', '立杠保压照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_pressure4_path', this.f_pressure4_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_pressure5_path" alt="立杠保压照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_pressure5_path', '立杠保压照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_pressure5_path', this.f_pressure5_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_pressure6_path" alt="立杠保压照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_pressure6_path', '立杠保压照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_pressure6_path', this.f_pressure6_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_pressure7_path" alt="立杠保压照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_pressure7_path', '立杠保压照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_pressure7_path', this.f_pressure7_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_pressure8_path" alt="立杠保压照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_pressure8_path', '立杠保压照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_pressure8_path', this.f_pressure8_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+          </div>
+          <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='室外关阀'">
+            <label class="text-left font">室外关阀照片：</label>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_outdoor_path" alt="室外关阀照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_outdoor_path', '室外关阀照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_outdoor_path', this.f_outdoor_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_outdoor2_path" alt="室外关阀照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_outdoor2_path', '室外关阀照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_outdoor2_path', this.f_outdoor2_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_outdoor3_path" alt="室外关阀照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_outdoor3_path', '室外关阀照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_outdoor3_path', this.f_outdoor3_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_outdoor4_path" alt="室外关阀照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_outdoor4_path', '室外关阀照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_outdoor4_path', this.f_outdoor4_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_outdoor5_path" alt="室外关阀照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_outdoor5_path', '室外关阀照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_outdoor5_path', this.f_outdoor5_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_outdoor6_path" alt="室外关阀照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_outdoor6_path', '室外关阀照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_outdoor6_path', this.f_outdoor6_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_outdoor7_path" alt="室外关阀照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_outdoor7_path', '室外关阀照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_outdoor7_path', this.f_outdoor7_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_outdoor8_path" alt="室外关阀照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo" :class="style__">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_outdoor8_path', '室外关阀照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_outdoor8_path', this.f_outdoor8_path)"
+                                                 style="width: 25%;"/>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+          </div>
+
+
           <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='拒检'">
             <div class="col-xs-12" style="padding: 2px 0;margin-top: 5px;">
               <label class="text-left font">拒检原因：</label>
@@ -244,6 +648,21 @@
                 </div>
               </div>
             </div>
+            <div class="auto">
+              <div class="panel" style="padding: 10px 10px 5px 10px;">
+                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
+                    <div class="col-sm-4">
+                      <img-self :src="f_rejectcheck2_path" alt="拒检照片" width="150" height="200"></img-self>
+                    </div>
+                  </div>
+                  <div class="row text-right div-photo">
+                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_rejectcheck2_path', '拒检照片')">拍照</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_rejectcheck2_path', this.f_rejectcheck2_path)" style="width: 25%;"></img>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
         <div :class="style__" class="form-group" v-show="f_usegas == '未使用'">

package/src/components/rongcheng/report/CheckPlanAreaList.vue

@@ -122,6 +122,15 @@
             <th>
               <nobr>到访不遇</nobr>
             </th>
+            <th>
+              <nobr>激光检漏</nobr>
+            </th>
+            <th>
+              <nobr>立杠保压</nobr>
+            </th>
+            <th>
+              <nobr>室外关阀</nobr>
+            </th>
             <th>
               <nobr>拒检</nobr>
             </th>
@@ -143,10 +152,13 @@
             <td style="text-align:center" :class="{'defectfront':row.f_plan_total==row.f_user_number,'td-0':row.f_checker_name==undefined,'td-1':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
             <td style="text-align:center" :class="{'defectfront':row.f_plan_total==row.f_user_number}" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_plan_total}}</td>
-            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_weijian+row.f_buyu+row.f_jujian}}</td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_weijian+row.f_buyu+row.f_jujian+row.f_jiguangjianlou+row.f_liganbaoya+row.f_shiwaiguanfa}}</td>
             <!--<td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_yijian}}</td>-->
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_ruhu}}</nobr></td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_buyu}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_jiguangjianlou}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_liganbaoya}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_shiwaiguanfa}}</nobr></td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_jujian}}</td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
             <!--<td style="text-align: center;">-->
@@ -159,10 +171,13 @@
           <td  style="text-align:center"><strong>合计：</strong></td>
           <td  style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
           <td  style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
-          <td  style="text-align:center"><strong>{{model.sums.f_weijian+model.sums.f_buyu+model.sums.f_jujian}}</strong></td>
+          <td  style="text-align:center"><strong>{{model.sums.f_weijian+model.sums.f_buyu+model.sums.f_jujian+model.sums.f_jiguangjianlou+model.sums.f_liganbaoya+model.sums.f_shiwaiguanfa}}</strong></td>
           <!--<td  style="text-align:center"><strong>{{model.sums.f_yijian}}</strong></td>-->
           <td  style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
           <td  style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_jiguangjianlou}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_liganbaoya}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_shiwaiguanfa}}</strong></nobr></td>
           <td  style="text-align:center"><strong>{{model.sums.f_jujian}}</strong></td>
           <td  style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_ruhu/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
           </tr >
@@ -183,7 +198,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
+        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jiguangjianlou:'',f_liganbaoya:'',f_shiwaiguanfa:'',f_jujian:''}),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -375,6 +390,9 @@
           this.model.sums.f_yijian = 0
           this.model.sums.f_ruhu = 0
           this.model.sums.f_buyu = 0
+          this.model.sums.f_jiguangjianlou= 0
+          this.model.sums.f_liganbaoya = 0
+          this.model.sums.f_shiwaiguanfa = 0
           this.model.sums.f_jujian = 0
         }
       }

package/src/filiale/ankangyihua/pc/checkUserList.vue

@@ -27,6 +27,7 @@
                 :options='$parent.$parent.areaList'
                 :timeout="500"
                 @select-search="$parent.$parent.select_search"
+                :search="true"
                 placeholder='小区选择'
                 condition="ua.f_residential_area = '{}'"
                 close-on-select

package/src/filiale/bayan/android/CurrentCreate.vue

@@ -820,7 +820,7 @@
                 }
                 _this.$dispatch('gotoson',pardate)
                 //tag
-                _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self', _this.reload)
+                _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate',openpaper:true}, 'self', _this.reload)
               }).catch ((msg)=>{
                 this.$showMessage("网络异常,请检查网络后再试！")
               })