safecheck-client 3.0.35-5 → 3.0.35-50

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 '}]
 
       }
     },