safecheck-client 3.0.39-8 → 3.0.39-80

package/src/filiale/baiyin/android.js

@@ -5,6 +5,7 @@ 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}
           }
         },
         "其他隐患":{

package/src/filiale/hanzhong/pc/CheckHiddenDanger.vue

@@ -248,8 +248,8 @@
         },
         echartswidth: '95%',
         barshowid: '1',
-        model:new PagedList(),
-        model1:new PagedList(),
+        model:new PagedList('rs/sql/QueryCheckStatus', 20, {startDate: 'this.startDate',endDate: 'this.endDate', orgid: 'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'},{rh:'',dfby:'',wsy:'',jj:''}),
+        model1:new PagedList('rs/sql/QueryHiddenLevel', 20, {startDate: 'this.startDate',endDate: 'this.endDate', orgid: 'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'},{a:'',b:'',c:'',ac:'',bc:'',cc:''}),
         orgid: `('${this.$login.f.orgid}')`,
         f: this.$login.f,
         chosenOrg: {

package/src/filiale/hanzhong/pc/CheckNumberStatistics.vue

@@ -146,7 +146,7 @@
           countxq:0,
         },
 
-        model: new PagedList(),
+        model: new PagedList('rs/sql/CountPeople', 20, {endDate: 'this.endDate', orgid: 'this.orgid'}),
         orgid: `('${this.$login.f.orgid}')`,
         f: this.$login.f,
         chosenOrg: {

package/src/filiale/hanzhong/pc/CheckSafeDetail.vue

@@ -216,7 +216,12 @@ export default {
         wsy: 0,
         checkrate: '0.00%',
       },
-      model: new PagedList(),
+      model: new PagedList('rs/sql/YearCountRate', 20, {
+        year: 'this.year',
+        orgid: 'this.orgid',
+        plan_type: 'this.plan_type',
+        f_safecheck_type: 'this.f_safecheck_type'
+      }),
       orgid: `('${this.$login.f.orgid}')`,
       //测试
       // orgid:'2586252.6314787',

package/src/filiale/hanzhong/pc/CheckSafeStatus.vue

@@ -151,7 +151,7 @@
           yijian:0,
           checkrate:'0.00%',
         },
-        model:new PagedList(),
+        model:new PagedList('rs/sql/CheckComplete',20, {year:'this.year',orgid:'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'}),
         orgid: `('${this.$login.f.orgid}')`,
         startDate:(new Date()).getFullYear()+'-01-01',
         endDate: Util.toStandardDateString(),

package/src/filiale/hanzhong/pc/CheckerSafeDetail.vue

@@ -196,7 +196,7 @@
           wsy:0,
           checkrate:'0.00%',
         },
-        model:new PagedList(),
+        model:new PagedList('rs/sql/YearCheckerCountRate',20, {year:'this.year',orgid:'this.orgid',plan_type:'this.plan_type',f_start_time:'this.f_start_time',f_end_time:'this.f_end_time',f_safecheck_type: 'this.f_safecheck_type'}),
         orgid:`('${this.$login.f.orgid}')`,
         //测试
         // orgid:'2586252.6314787',

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

@@ -555,10 +555,10 @@ export default {
       let prefix = '用户基本信息：'
       if(Util.required(this.data.f_user_name))
         return prefix + '用户名必须输入'
-      if(!(/^\d{11}$/.test(this.data.f_user_phone))) {
+      /*if(!(/^\d{11}$/.test(this.data.f_user_phone))) {
 
         return '请输入正确的电话号码'
-      }
+      }*/
       // if(Util.required(this.data.f_residential_area))
       //   return prefix + '小区名称必须输入'
       if(Util.required(this.data.f_address))

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

@@ -355,6 +355,10 @@ div {
               </tr>
               </tbody>
             </table>
+            <div v-show="showButton">
+              <button class="button_spacing button_search" @click="auditSuccesss()">通过</button>
+              <button class="button_spacing button_search" @click="auditFail()">不通过</button>
+            </div>
           </div>
         </div>
 
@@ -422,12 +426,27 @@ div {
       <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
     </footer>
   </modal>
+  <modal :show.sync="showModel" :width="'50%'" :backdrop="false">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        安检审核备注
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row">
+        <div class="form-group col-sm-4">
+          <label class="font_normal_body">审核备注:</label>
+          <textarea v-model="message"></textarea>
+        </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer" style="text-align: center">
+      <button class="button_search" style="margin-right: 15px" @click="auditFailOK()">确定</button>
+      <button class="button_search" style="margin-right: 15px" @click="auditFailCancel()">取消</button>
+    </div>
+  </modal>
 </template>
 <script>
-// import PaperUserm from './PaperUserm'
-// import PaperStatem from './PaperStatem'
-// import Devicesm from './Devicesm'
-// import PaperFeedbackm from './PaperFeedbackm'
 import ObjConfig from '../../../utils/GerJsonObjectConfig'
 import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
 import Radio from 'vue-client/src/vue-strap/src/radioBtn'
@@ -507,6 +526,9 @@ export default {
   props: ['f_plan_id', 'item', 'role'],
   data() {
     return {
+      showModel:false,
+      showButton:false,
+      message:'',
       data: {
         f_devices: [],
         f_defect_content: ''
@@ -630,6 +652,43 @@ export default {
     }
   },
   methods: {
+    auditSuccesss() {
+      this.loading = true;
+      let sql = `update t_check_paper set f_approved_by='${this.$login.f.name}',f_approved_time='${Util.getNowDate()}',f_approved='不通过' where id='${this.item.id}'`
+      new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: sql}}, {
+        resolveMsg: '安检审核成功！',
+        rejectMsg: '安检审核出错！'
+      }).then((res) => {
+          this.loading = false;
+          this.$back()
+
+      })
+    },
+    auditFail() {
+      this.showModel = true;
+    },
+    showAudit() {
+      if (this.item.f_approved == '未审核' || !this.item.f_approved) {
+        this.showButton = true
+      }
+    },
+    auditFailOK() {
+      this.loading = true;
+      let sql = `update t_check_paper set f_approved_by='${this.$login.f.name}',f_approved_time='${Util.getNowDate()}',f_approved='通过' where id='${this.item.id}'`
+      new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: sql}}, {
+        resolveMsg: '安检审核成功！',
+        rejectMsg: '安检审核出错！'
+      }).then((res) => {
+          this.loading = false;
+          this.message = '';
+          this.showModel = false;
+          this.$back()
+      })
+    },
+    auditFailCancel() {
+      this.showModel = false;
+      this.message = '';
+    },
 // pdf生成
     reportPdf() {
       // 抓取要截图的div的class名
@@ -1291,6 +1350,7 @@ export default {
     }
   },
   ready() {
+    this.showAudit()
     // this.putDevices()
     this.newConfig = this.$appdata.getSingleValue('配置中心获取文件')?this.$appdata.getSingleValue('配置中心获取文件'):'否';
     if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {