safecheck-client 3.0.35-6 → 3.0.35-61

package/src/components/rongcheng/AspiratedPaperFeedbackm.vue

@@ -456,6 +456,10 @@
             let temp = getFile.data[i].f_downloadpath
             if (temp) {
               let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+              if (temp.startsWith('E:')){
+                URL = `rs/image/file/${getFile.data[i].f_filename}`
+              }
+              console.log(URL)
               getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
             }
           }

package/src/components/rongcheng/AspiratedUserInfo.vue

@@ -32,7 +32,7 @@
           <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_address }}</p>
         </div>
         <div class="col-xs-12" style="margin-left: 20px">
-          <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a></p>
+          <p class="panel-title col-xs-7 text-left input-font"><a @click="upuserinfo(userinfo.f_userinfoid)">设备信息维护</a></p>
         </div>
         <!--<div class="col-xs-12">
           <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
@@ -157,13 +157,21 @@
         })
         this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
       },
-      searchDevices(f_userinfo_id) {
+      // searchDevices(f_userinfo_id) {
+      //   this.$dispatch('gotoson', {
+      //     _this: this.$parent.$parent,
+      //     title: '设备查看',
+      //     safe: false
+      //   })
+      //   this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
+      // },
+      upuserinfo (f_userinfo_id) {
         this.$dispatch('gotoson', {
           _this: this.$parent.$parent,
-          title: '设备查看',
+          title: '档案信息变更',
           safe: false
         })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
+        this.$parent.$parent.$goto('PhoneUpUserinfo', {f_userinfo_id: f_userinfo_id, f_source: '安检'})
       },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())

package/src/components/rongcheng/CheckSearchUser.vue

@@ -644,7 +644,7 @@ export default {
         //args.condition += " and ( f_last_check_date > '"+ args.model.f_check_end + " 23:59:00' or  f_last_check_date < '"+ args.model.f_check_start + " 00:00:00' or f_last_check_date is null)"
       } else if(this.SafeCheckXZ == '未入户') {
         args.condition += " and r < 1"
-        args.condition += " and f_last_check_state != '入户'"
+        // args.condition += " and f_last_check_state != '入户'"
         con1 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         con2 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         if(args.model.f_check_state=='到访不遇'){