safecheck-client 3.0.32-18 → 3.0.32-19

package/src/filiale/fugou/pc/CheckBookUser.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="auto select-overspread">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-3" >
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
+                     condition="f_userinfo_code = '{}'" @keyup.enter="search()">
+            </div>
+            <div class="form-group col-sm-2 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>用户编号</nobr></th>
+            <th><nobr>用户姓名</nobr></th>
+            <th><nobr>用户电话</nobr></th>
+            <th><nobr>用户地址</nobr></th>
+
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td style="text-align:center;">{{$index+1}}</td>
+             <td style="text-align:center">{{row.f_userinfo_code}}</td>
+            <td style="text-align:center">{{row.f_user_name}}</td>
+            <td style="text-align:center">{{row.f_user_phone}}</td>
+            <td style="text-align:center">{{row.f_address}}</td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  title: '安检记录列表',
+  props: ['row'],
+  data () {
+    return {
+      rowdata: this.row,
+      model: new PagedList('rs/sql/getUserByCheckBook', 50)
+    }
+  },
+  ready(){
+    if(this.row){
+      let condition=''
+      if(this.row.f_check_book_type1=='小区'){
+        this.model.url = 'rs/sql/getUserByCheckBook'
+        condition  = `ta.f_check_book_id =${this.row.f_check_book_id} and ta.id=${this.row.id}`
+      }else{
+        this.model.url = 'rs/sql/getUserByCheckBookCompany'
+        condition  = `tc.f_check_book_id =${this.row.f_check_book_id} and tc.id=${this.row.id}`
+      }
+      this.model.search(condition)
+      //只显示用户页面
+      this.row.f_check_book_type='用户'
+    }
+  },
+  watch: {
+    'row' (val) {
+      if (val) {
+        this.rowdata = val
+        let condition=''
+        if(this.row.f_check_book_type1=='小区'){
+          condition  = `ta.f_check_book_id =${val.f_check_book_id} and ta.id=${val.id}`
+        }else{
+          condition  = `tc.f_check_book_id =${val.f_check_book_id} and tc.id=${val.id}`
+        }
+        this.model.search(condition)
+      }
+    }
+  },
+  methods: {
+    selfSearch (args) {
+      if (this.rowdata.id) {
+        if(this.rowdata.f_check_book_type1=='小区'){
+          args.condition += `and ta.f_check_book_id =${this.rowdata.f_check_book_id} and ta.id=${this.rowdata.id}`
+        }else{
+          args.condition += `and tc.f_check_book_id =${this.rowdata.f_check_book_id} and tc.id=${this.rowdata.id}`
+        }
+        this.model.search(args.condition)
+      } else {
+        this.$showMessage('请选择片区')
+      }
+    }
+  }
+}
+</script>

package/src/filiale/fugou/pc.js

@@ -4,11 +4,54 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   // 安检汇总-列表
-  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
-  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
-  'safe-defect-paper-new': (resolve) => { require(['./pc/DefectPaperNew'], resolve) },
-  'defect-main-new2': (resolve) => { require(['./pc/DefectMainNew'], resolve) },
-  'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
+  'paper-main': (resolve) => {
+    require(['./pc/PaperList'], resolve)
+  },
+  'check-user-list': (resolve) => {
+    require(['./pc/checkUserList'], resolve)
+  },
+  'safe-defect-paper-new': (resolve) => {
+    require(['./pc/DefectPaperNew'], resolve)
+  },
+  'defect-main-new2': (resolve) => {
+    require(['./pc/DefectMainNew'], resolve)
+  },
+  'paper-defect-main': (resolve) => {
+    require(['./pc/PaperDefectMain'], resolve)
+  },
+  'check-book-all': (resolve) => {
+    require(['./pc/CheckBookAll'], resolve)
+  },
+  'check-book': (resolve) => {
+    require(['./pc/CheckBook'], resolve)
+  },
+  'check-book-user': (resolve) => {
+    require(['./pc/CheckBookUser'], resolve)
+  },
+  'check-book-area': (resolve) => {
+    require(['./pc/CheckBookArea'], resolve)
+  },
+  'check-book-company': (resolve) => {
+    require(['./pc/CheckBookCompany'], resolve)
+  },
+  'check-book-entry': (resolve) => {
+    require(['./pc/CheckBookEntry'], resolve)
+  },
+  'add-to-check-book': (resolve) => {
+    require(['./pc/AddToCheckBook'], resolve)
+  },
+  'check-book-search-user': (resolve) => {
+    require(['./pc/CheckBookSearchUser'], resolve)
+  },
+  'check-book-search-area': (resolve) => {
+    require(['./pc/CheckBookSearchArea'], resolve)
+  },
+  'check-book-search-unit': (resolve) => {
+    require(['./pc/CheckBookSearchUnit'], resolve)
+  },
+  'check-book-search-user-list': (resolve) => {
+    require(['./pc/CheckBookSearchUserList'], resolve)
+  }
 }
 exports.specialComp = specialComp
 

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

@@ -408,9 +408,10 @@
               args.condition +=` and ${this.uploadCodeCondition}`
             }
             if(args.model.f_last_check_state){
-              args.condition += ` and ua.f_last_check_state  = '${args.model.f_last_check_state}'`
               if (args.model.f_last_check_state == '未检'){
                 args.condition += ` and (ua.f_last_check_date  is null or ua.f_last_check_date  is null) `
+              }else {
+                args.condition += ` and ua.f_last_check_state  = '${args.model.f_last_check_state}'`
               }
             }
             if(args.model.f_start_time){

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

@@ -684,9 +684,9 @@ export default {
       hasError = this.verifyDevices()
       if (hasError)
         return hasError
-      hasError = this.verifyFeedback()
-      if (hasError)
-        return hasError
+      // hasError = this.verifyFeedback()
+      // if (hasError)
+      //   return hasError
     },
     verifyState() {
       if (Vue.android && this.data.f_entry_status == '未使用天然气' && this.data.f_nongasuser_path == Vue.nopic)

package/src/main.js

@@ -11,7 +11,7 @@ all()
 var Verificationfalg = false
 system(Verificationfalg)
 // system()
-safecheck(process.env.SAFE_CHECK);
+safecheck('fugou');
 // safecheck('rizhao')
 require('./bootstrap/less/bootstrap.less')
 require('./expandcss.less')