safecheck-client 3.0.39-7 → 3.0.39-70

package/src/filiale/baiyin/android.js

@@ -1,11 +1,12 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-// 手机特殊目录注册到该文件中
-let specialComp = {
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
-  'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
-}
-
-exports.specialComp = specialComp
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
+}
+
+exports.specialComp = specialComp
+

package/src/filiale/bayan/pc/NewCheckpaper.vue

@@ -219,9 +219,9 @@ div {
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
                   {{ paperdata.f_visit_number }}
                 </td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">备注:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">预约备注:</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
-                  {{ paperdata.f_remark }}
+                  {{ item.f_remark }}
                 </td>
               </tr>
               <tr>

package/src/filiale/bayan/pc/SelectAreaReport.vue

@@ -100,6 +100,7 @@
             <th>区域</th>
             <th>小区名称</th>
             <th>小区用户数</th>
+            <th>小区计划数</th>
             <th>计划内入户数</th>
             <th>无计划入户数</th>
             <th>计划内到访不遇数</th>

package/src/filiale/bayan/pc/SummaryOfSecurityInspectionProgress.vue

@@ -6,7 +6,7 @@
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">计划时间</label>
+                <label class="font_normal_body">安检时间</label>
                 <datepicker
                   :value.sync="model.f_start_time"
                   placeholder='开始时间' style="width: 60%"
@@ -18,7 +18,7 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">计划时间</label>
+                <label class="font_normal_body">安检时间</label>
                 <datepicker
                   :value.sync="model.f_end_time"
                   placeholder='结束时间' style="width: 60%"
@@ -85,7 +85,7 @@
                 <nobr>入户率</nobr>
               </th>
               <th>
-                <nobr>未安检</nobr>
+                <nobr>无计划安检数</nobr>
               </th>
               <th>
                 <nobr>完成率</nobr>
@@ -99,7 +99,7 @@
             <td style="text-align: center" >{{row.f_safe_name}}</td>
             <td style="text-align: center" >{{row.f_ruhu_name}}</td>
             <td style="text-align: center" >{{row.f_ruhu_bv}}</td>
-            <td style="text-align: center" >{{row.f_wj_num}}</td>
+            <td style="text-align: center" >{{row.f_nosafe_num}}</td>
             <td style="text-align: center" >{{row.f_wc_bv}}</td>
           </template>
         </data-grid>
@@ -132,7 +132,7 @@ export default {
         'f_safe_name': '已安检',
         'f_ruhu_name': '已入户',
         'f_ruhu_bv': '入户率',
-        'f_wj_num': '未安检',
+        'f_nosafe_num': '无计划安检数',
         'f_wc_bv': '完成率'
       }
     }
@@ -143,10 +143,10 @@ export default {
       let condition1 = tempStr
       let condition2 = ' 1=1 '
       if (this.da_starttime){
-        condition2 += ` and f_open_date >= '${this.da_starttime}' `
+        condition2 += ` and tu.f_open_date >= '${this.da_starttime}' `
       }
       if (this.da_endtime){
-        condition2 += ` and f_open_date <= '${this.da_endtime}' `
+        condition2 += ` and tu.f_open_date <= '${this.da_endtime}' `
       }
 
       this.model.condition1=condition1

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

@@ -509,7 +509,7 @@ export default {
         let startOrStopState = HostApp.startOrStopAudioClip(fileName,"开始录音")
         //tag
         if (startOrStopState.code == 200) {
-          this.data.f_recording1_path =  "file:///storage/emulated/0/safecheck/" + fileName
+          this.data.f_recording1_path =  "file:///storage/emulated/0/Download/safecheck/" + fileName
           //tag
           return true;
         }else {

package/src/filiale/dexin/android/SafecheckOrderVTemp.vue

@@ -159,7 +159,10 @@ export default {
             "表号":{"index":5,"type":"string","readonly":false,"checkmust": true},
             "用户姓名":{"index":6,"type":"string","readonly":false,"checkmust": false},
             "用户电话":{"index":7,"type":"string","readonly":false,"checkmust": false},
-            "表具照片":{"index":8,"type":"picture","readonly":false,"checkmust": true}
+            "表具照片":{"index":8,"type":"picture","readonly":false,"checkmust": true},
+            "安装日期":{"index":9,"type":"date","readonly":false,"checkmust": true},
+            "左右表":{"index":10,"multiple":false,"type":"selector","options":[{"data":"左表"},{"data":"右表"}],"checkmust":true},
+            "检验时间":{"index":11,"type":"date","readonly":false,"checkmust": true}
           }
         },
         "其他隐患":{