safecheck-client 3.0.35-5 → 3.0.35-51

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

@@ -96,55 +96,55 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">气表类型:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.meter_classify"
-                      v-model="model.meter_classify"
-                      :options='$parent.$parent.meter_classifys'
-                      placeholder='请选择'
-                      condition="uf.F_METER_CLASSIFY='{}'"
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">街&emsp;&emsp;道:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_street"
-                      v-model="model.f_street"
-                      :options='$parent.$parent.streets'
-                      placeholder='请选择'
-                      condition="ua.f_street_id='{}'"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">气表类型:</label>-->
+<!--                    <v-select-->
+<!--                      class="select select_list"-->
+<!--                      :value.sync="model.meter_classify"-->
+<!--                      v-model="model.meter_classify"-->
+<!--                      :options='$parent.$parent.meter_classifys'-->
+<!--                      placeholder='请选择'-->
+<!--                      condition="uf.F_METER_CLASSIFY='{}'"-->
+<!--                      :search="false"-->
+<!--                      close-on-select-->
+<!--                      value-single-->
+<!--                    >-->
+<!--                    </v-select>-->
+<!--                  </div>-->
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">街&emsp;&emsp;道:</label>-->
+<!--                    <v-select-->
+<!--                      class="select select_list"-->
+<!--                      :value.sync="model.f_street"-->
+<!--                      v-model="model.f_street"-->
+<!--                      :options='$parent.$parent.streets'-->
+<!--                      placeholder='请选择'-->
+<!--                      condition="ua.f_street_id='{}'"-->
+<!--                      close-on-select-->
+<!--                      value-single-->
+<!--                    >-->
+<!--                    </v-select>-->
+<!--                  </div>-->
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">小区名称:</label>
                     <input type="text" class="input_search" v-model="model.f_userinfo_code"
                            style="width: 60%" placeholder="请选择" condition="ua.f_residential_area = '{}'">
                   </div>-->
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">楼&ensp;栋&ensp;号:</label>
-                    <input type="text" class="input_search" v-model="model.f_building"
-                           style="width: 60%" placeholder="请选择" condition="ua.f_building='{}'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">单&ensp;元&ensp;号:</label>
-                    <input type="text" class="input_search" v-model="model.f_unit"
-                           style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">楼&ensp;层&ensp;号:</label>
-                    <input type="text" class="input_search" v-model="model.f_floor"
-                           style="width: 60%" placeholder="请选择" condition="ua.f_floor='{}'">
-                  </div>
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">楼&ensp;栋&ensp;号:</label>-->
+<!--                    <input type="text" class="input_search" v-model="model.f_building"-->
+<!--                           style="width: 60%" placeholder="请选择" condition="ua.f_building='{}'">-->
+<!--                  </div>-->
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">单&ensp;元&ensp;号:</label>-->
+<!--                    <input type="text" class="input_search" v-model="model.f_unit"-->
+<!--                           style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">-->
+<!--                  </div>-->
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">楼&ensp;层&ensp;号:</label>-->
+<!--                    <input type="text" class="input_search" v-model="model.f_floor"-->
+<!--                           style="width: 60%" placeholder="请选择" condition="ua.f_floor='{}'">-->
+<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">开户起始:</label>
                     <datepicker
@@ -171,45 +171,45 @@
                       condition="ui.f_createfile_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">表&ensp;箱&ensp;号:</label>
-                    <input type="text" class="input_search" v-model="model.f_metertitles"
-                           style="width: 60%" placeholder="请输入" condition="uf.f_metertitles='{}'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">用户电话:</label>
-                    <input type="text" class="input_search" v-model="model.f_user_phone"
-                           style="width: 60%" placeholder="请输入" condition="ui.f_user_phone='{}'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">片&ensp;&ensp;&ensp;&ensp;区:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_book_slice_area"
-                      v-model="model.f_book_slice_area"
-                      :options='$parent.$parent.sliceArea'
-                      @change="$parent.$parent.slice_areaChange(model.f_book_slice_area)"
-                      placeholder='请选择'
-                      condition="ua.f_slice_area  ='{}'"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_meter_book_num"
-                      v-model="model.f_meter_book_num"
-                      :options='$parent.$parent.cbc'
-                      placeholder='请选择'
-                      condition="uf.f_meter_book_num='{}'"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">表&ensp;箱&ensp;号:</label>-->
+<!--                    <input type="text" class="input_search" v-model="model.f_metertitles"-->
+<!--                           style="width: 60%" placeholder="请输入" condition="uf.f_metertitles='{}'">-->
+<!--                  </div>-->
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">用户电话:</label>-->
+<!--                    <input type="text" class="input_search" v-model="model.f_user_phone"-->
+<!--                           style="width: 60%" placeholder="请输入" condition="ui.f_user_phone='{}'">-->
+<!--                  </div>-->
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">片&ensp;&ensp;&ensp;&ensp;区:</label>-->
+<!--                    <v-select-->
+<!--                      class="select select_list"-->
+<!--                      :value.sync="model.f_book_slice_area"-->
+<!--                      v-model="model.f_book_slice_area"-->
+<!--                      :options='$parent.$parent.sliceArea'-->
+<!--                      @change="$parent.$parent.slice_areaChange(model.f_book_slice_area)"-->
+<!--                      placeholder='请选择'-->
+<!--                      condition="ua.f_slice_area  ='{}'"-->
+<!--                      close-on-select-->
+<!--                      value-single-->
+<!--                    >-->
+<!--                    </v-select>-->
+<!--                  </div>-->
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>-->
+<!--                    <v-select-->
+<!--                      class="select select_list"-->
+<!--                      :value.sync="model.f_meter_book_num"-->
+<!--                      v-model="model.f_meter_book_num"-->
+<!--                      :options='$parent.$parent.cbc'-->
+<!--                      placeholder='请选择'-->
+<!--                      condition="uf.f_meter_book_num='{}'"-->
+<!--                      close-on-select-->
+<!--                      value-single-->
+<!--                    >-->
+<!--                    </v-select>-->
+<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
                     <v-select
@@ -265,76 +265,51 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">通气起始:</label>
-                    <datepicker
-                      placeholder='通气开始时间'
-                      style="width:60%"
-                      :disabled-days-of-week="[]"
-                      :format="'yyyy-MM-dd'"
-                      :show-rest-button="reset"
-                      :value.sync="model.f_startgas_time"
-                      v-model="model.f_startgas_time"
-                      condition="ui.f_uservent_date >= '{} 00:00:00'">
-                    </datepicker>
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">通气截止:</label>
-                    <datepicker
-                      placeholder='通气结束时间'
-                      :disabled-days-of-week="[]"
-                      style="width:60%"
-                      :format="'yyyy-MM-dd'"
-                      :show-rest-button="reset"
-                      :value.sync="model.f_endgas_time"
-                      v-model="model.f_endgas_time"
-                      condition="ui.f_uservent_date <= '{} 23:59:59'">
-                    </datepicker>
-                  </div>
-                  <div class="form-group col-sm-4">
-                    <label class="font_normal_body">安检册:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.checkBook"
-                      v-model="model.checkBook"
-                      :options='$parent.$parent.checkBooks'
-                      placeholder='请选择'
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">通气起始:</label>-->
+<!--                    <datepicker-->
+<!--                      placeholder='通气开始时间'-->
+<!--                      style="width:60%"-->
+<!--                      :disabled-days-of-week="[]"-->
+<!--                      :format="'yyyy-MM-dd'"-->
+<!--                      :show-rest-button="reset"-->
+<!--                      :value.sync="model.f_startgas_time"-->
+<!--                      v-model="model.f_startgas_time"-->
+<!--                      condition="ui.f_uservent_date >= '{} 00:00:00'">-->
+<!--                    </datepicker>-->
+<!--                  </div>-->
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">通气截止:</label>-->
+<!--                    <datepicker-->
+<!--                      placeholder='通气结束时间'-->
+<!--                      :disabled-days-of-week="[]"-->
+<!--                      style="width:60%"-->
+<!--                      :format="'yyyy-MM-dd'"-->
+<!--                      :show-rest-button="reset"-->
+<!--                      :value.sync="model.f_endgas_time"-->
+<!--                      v-model="model.f_endgas_time"-->
+<!--                      condition="ui.f_uservent_date <= '{} 23:59:59'">-->
+<!--                    </datepicker>-->
+<!--                  </div>-->
+<!--                  <div class="form-group col-sm-4">-->
+<!--                    <label class="font_normal_body">安检册:</label>-->
+<!--                    <v-select-->
+<!--                      class="select select_list"-->
+<!--                      :value.sync="model.checkBook"-->
+<!--                      v-model="model.checkBook"-->
+<!--                      :options='$parent.$parent.checkBooks'-->
+<!--                      placeholder='请选择'-->
+<!--                      :search="false"-->
+<!--                      close-on-select-->
+<!--                      value-single-->
+<!--                    >-->
+<!--                    </v-select>-->
+<!--                  </div>-->
                   <div class="form-group col-sm-4">
                     <label class="font_normal_body">安检时间:</label>
                     <input type="number" class="input_search" v-model="model.month"
                            style="width: 60%" placeholder="距上次安检时间(月)">
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">入户情况:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_hasHousehold"
-                      v-model="model.f_hasHousehold"
-                      :options='$parent.$parent.hasHousehold'
-                      placeholder='请选择'
-                      close-on-select
-                      :search="false"
-                      value-single
-                    >
-                    </v-select>
-                  </div>-->
-                      <!--先注掉，-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">年龄起始:</label>-->
-<!--                    <input type="text" class="input_search" v-model="model.f_yearstart_time"-->
-<!--                           style="width: 60%" placeholder="请输入">-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">年龄截止:</label>-->
-<!--                    <input type="text" class="input_search" v-model="model.f_yearend_time"-->
-<!--                           style="width: 60%" placeholder="请输入">-->
-<!--                  </div>-->
                 </div>
               </div>
               <div slot="modal-footer" class="modal-footer" style="text-align: center">

package/src/filiale/tianke/pc/DefectListNew.vue

@@ -182,14 +182,15 @@
             :value.sync="solveModal.uploadData.f_repair_date">
           </datepicker>
         </div>
-        <div v-if="solveModal.preData.type == 'solve'" class="col-sm-12" style="margin-bottom: 10px">
+        <div v-if="solveModal.preData.type === 'solve'" class="col-sm-12" style="margin-bottom: 10px">
           <label class="font_normal_body">处理后图片</label>
           <avatar-upload :width="200" :height="200" :img-src.sync="solveModal.uploadData.imgSrc"
                          :filename.sync="solveModal.uploadData.filename" v-ref:imginfo></avatar-upload>
         </div>
-        <div v-if="solveModal.preData.type == 'view'" class="col-sm-12" style="margin-bottom: 10px">
+        <div v-if="solveModal.preData.type === 'view'" class="col-sm-12" style="margin-bottom: 10px">
           <label class="font_normal_body">处理后图片</label>
-          <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg"></img-self>
+          <img-self  v-if="isRepair==='是'"  :width="200" :height="200" :src="solveModal.preData.repairedImg"></img-self>
+          <label     v-if="isRepair==='否'"  style="color: red"   class="font_normal_body">处理照片未拍！！！</label>
         </div>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -329,6 +330,7 @@
         model: new PagedList('rs/sql/GetDefectByPaperIdNew2', 100, {
           f_paper_id: 'this.f_paper_id', f_item_value: 'this.f_item_value'
         }),
+        isRepair: '否',
         showSolveModal: false,
         showToRepairModal: false,
         showDefectModal: false,
@@ -439,11 +441,16 @@
       })
     },
       solveDefect(row, type) {
+        this.isRepair='否'
         this.solveModal.preData.defectImg = '/rs/image/file/' + row.f_path
         this.solveModal.preData.repairedImg = '/rs/image/file/' + row.f_repair_path
         this.solveModal.uploadData.id = row.id
         this.solveModal.preData.type = type
         if (type == 'view') {
+          if(row.f_repair_path!=='' && row.f_repair_path!==null){
+            this.isRepair='是'
+            debugger
+          }
           this.solveModal.preData.f_repair_path = '/rs/image/file/' + row.f_repair_path
           this.solveModal.uploadData.f_repairman = row.f_repairman
           this.solveModal.uploadData.f_repair_date = row.f_repair_date

package/src/filiale/tongchuan/android/SafecheckOrderV.vue

@@ -983,8 +983,8 @@
         //tag)
         if(Vue.android && (!this.data.f_overall_imgs || this.data.f_overall_imgs.length == 0) && this.data.f_entry_status == '入户')
           return prefix + '必须有安检总体照片'
-        // if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
-        //   return prefix + '必须有用户签名'
+        if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
+          return prefix + '必须有用户签名'
         console.log("666666",Vue.android && this.data.f_issign_hetong=='是' && this.data.f_hetong_path == Vue.nopic)
         if(Vue.android && this.data.f_issign_hetong=='是' && this.data.f_hetong_path == Vue.nopic){
           return prefix + '签订合同必须拍照'
@@ -1849,7 +1849,7 @@
             //tag
             this.$dispatch('confirm')
           }else if(res.code == 710){
-            this.$showMessage('上传照片失败,请检查网络是否正常！'+res.msg)
+            this.$showMessage('上传照片失败,请检查本地图片是否损坏或者网络是否正常！')
             this.onlySave = true
             return
           }else if(res.code == 712){

package/src/filiale/tongchuan/pc/CheckSearchUser.vue

@@ -217,18 +217,6 @@
                 :value-single="true"
                 close-on-select clear-button></v-select>
             </div>
-            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">是否通气</label>
-              <v-select
-                class="select_list select"
-                placeholder='是否通气' style="width: 60%"
-                v-model='model.f_is_gas'
-                :value.sync="model.f_is_gas"
-                :options='$parent.$parent.isgas'
-                condition="uf.f_gas_data {}"
-                :value-single="true"
-                close-on-select clear-button></v-select>
-            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -444,6 +432,9 @@
             <th>
               <nobr>安检员备注</nobr>
             </th>
+            <th>
+              <nobr>表具出厂日期</nobr>
+            </th>
             <th>
               <nobr>最后一次安检日期</nobr>
             </th>
@@ -468,6 +459,7 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_address }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_checker_name }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_comments }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_factory_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">
@@ -534,6 +526,7 @@
           'f_slice_area': '区域',
           'f_residential_area': '小区名称',
           'f_address': '地址',
+          'f_factory_date': '表具出厂日期',
           'f_last_check_date': '最后一次安检日期',
           'f_last_check_state': '最后一次安检状态',
           'f_defect_content': '安检结果'
@@ -584,7 +577,6 @@
         cbcs: [],
         cbc: [],
         pcds: [],
-        isgas: [{label: '全部', value: ''},{label: '是', value: 'is not null '},{label: '否', value: ' is null '}]
 
       }
     },