safecheck-client 4.0.2-47 → 4.0.2-49

package/src/filiale/jinhong/android.js

@@ -1,11 +1,12 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-// 手机特殊目录注册到该文件中
-let specialComp = {
-  'phone-insurance-record-list': (resolve) => { require(['./android/PhoneInsuranceRecordList.vue'], resolve) },
-  'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) },
-  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) }
-}
-exports.specialComp = specialComp
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'phone-insurance-record-list': (resolve) => { require(['./android/PhoneInsuranceRecordList.vue'], resolve) },
+  'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) },
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) }
+}
+exports.specialComp = specialComp
+

package/src/filiale/jinhong/pc/CheckSearchUser.vue

@@ -180,9 +180,14 @@
               </v-select>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">两年未入户</label>
+              <label class="font_normal_body">年份</label>
+              <input type="number" class="input_search" v-model="$parent.$parent.f_year"
+                     style="width: 60%" placeholder="年份">
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">{{$parent.$parent.f_year}}年未入户</label>
               <v-select class="select_list select"
-                        placeholder='两年未入户' style="width: 60%"
+                        :placeholder="$parent.$parent.f_year + '年未入户'" style="width: 60%"
                         :value.sync="model.is_no_ruhu" v-model="model.is_no_ruhu"
                         :options='$parent.$parent.SafeCheckSXs'
                         close-on-select clear-button
@@ -508,6 +513,7 @@ export default {
       orgstrs: [{label: '全部', value: ''}],
       checkersid: [],
       checkStates:[],
+      f_year:2,
       SafeCheckXZ: '',
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
@@ -823,11 +829,19 @@ export default {
       con += args.model.f_checker_id ? ` and f_checker_name in ${args.model.f_checker_id}` : ' and 1=1'
       let condition3 = `1=1`
       if (args.model.is_no_ruhu){
+        if (!this.f_year){
+          this.$showMessage('选择未入户时，需选择指定年限')
+          return
+        }
+        if (this.f_year <=0){
+          this.$showMessage('年份输入错误')
+          return
+        }
         if (args.model.is_no_ruhu == '否'){
-          condition3 += ` and f_entry_status = '入户' and f_offsite_time >= DATEADD(YEAR, -2, GETDATE()) AND f_offsite_time < GETDATE()`
+          condition3 += ` and f_entry_status = '入户' and f_offsite_time >= DATEADD(YEAR, -${this.f_year}, GETDATE()) AND f_offsite_time < GETDATE()`
           args.condition += ` and aj_count > 0`
         }else {
-          condition3 += ` and f_entry_status = '入户' and f_offsite_time >= DATEADD(YEAR, -2, GETDATE()) AND f_offsite_time < GETDATE()`
+          condition3 += ` and f_entry_status = '入户' and f_offsite_time >= DATEADD(YEAR, -${this.f_year}, GETDATE()) AND f_offsite_time < GETDATE()`
           args.condition += ` and aj_count is null`
         }
       }

package/src/filiale/xinkang/android/SafecheckDevices.vue

@@ -68,8 +68,8 @@
                 </datepicker>
               </div>
 
-              <div style="float: left;width:60%" class="form-group" v-if="!show && row.type == 'number'" v-show="row.isshow">
-                <input type="text" class="form-control" maxlength="100" v-model="row.f_item_value"  onkeyup="value=value.replace(/[^\d\.]/g,'')" :readonly="row.readonly">
+              <div style="float: left;width:60%" class="form-group" v-if="row.type == 'number'" v-show="row.isshow">
+                <input type="number" class="form-control" maxlength="100" v-model="row.f_item_value"  :readonly="row.readonly">
               </div>
               <!--<input type="text" class="form-control" v-model="row.f_content" v-if="!show && row.type == 'string' && row.f_project != '表号'" :disabled="(!(ischecked == '有')) || issee" :readonly="issee">-->
               <!--<input type="text" class="form-control" v-model="meternum" v-if="!show && row.type == 'string' && row.f_project == '表号' " :disabled="(!(ischecked == '有')) || issee" :readonly="issee" >-->
@@ -682,7 +682,7 @@ export default {
         return
       }
       this.f_items[this.f_total_lcd.index].f_is_defect = false
-      if (Number(this.f_items[this.f_table_base.index].f_item_value) !== Number(this.f_items[this.f_total_lcd.index].f_item_value)) {
+      if (this.f_items[this.f_table_base.index].f_item_value != this.f_items[this.f_total_lcd.index].f_item_value) {
         this.f_items[this.f_total_lcd.index].f_is_defect = true
         console.log('有异常')
       }else{

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('yunchengminsheng')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('jinhong')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})