safecheck-client 3.0.33-81 → 3.0.33-84
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/filiale/yangchunboneng/android/SafecheckDevices.vue +1332 -1332
- package/src/filiale/yangchunboneng/android/SafecheckOrderV.vue +10 -0
- package/src/filiale/yangchunboneng/android/SafecheckUserInfo.vue +869 -869
- package/src/filiale/yangchunboneng/pc/CheckSearchUser.vue +1168 -1168
- package/src/filiale/zhongsheng/android/CurrentCreate.vue +7 -2
- package/src/main.js +33 -33
|
@@ -809,8 +809,13 @@
|
|
|
809
809
|
condition += " and ti.f_address like '%"+this.$refs.paged.$refs.cri.model.f_keyword+"%'"
|
|
810
810
|
if(this.$refs.paged.$refs.cri.model.f_user_name)
|
|
811
811
|
condition += " and ti.f_user_name like '%"+this.$refs.paged.$refs.cri.model.f_user_name+"%'"
|
|
812
|
-
if(this.$refs.paged.$refs.cri.model.f_state[0])
|
|
812
|
+
if(this.$refs.paged.$refs.cri.model.f_state[0] == '未检' ){
|
|
813
|
+
condition += " and (ti.f_state='"+this.$refs.paged.$refs.cri.model.f_state[0]+"' or ti.f_last_check_state = '到访不遇' ) "
|
|
814
|
+
}
|
|
815
|
+
if(this.$refs.paged.$refs.cri.model.f_state[0] == '已检' ){
|
|
813
816
|
condition += " and ti.f_state='"+this.$refs.paged.$refs.cri.model.f_state[0]+"'"
|
|
817
|
+
}
|
|
818
|
+
|
|
814
819
|
// if(this.$refs.paged.$refs.cri.model.f_last_state[0])
|
|
815
820
|
// condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_state[0]+"'"
|
|
816
821
|
if(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
@@ -823,7 +828,7 @@
|
|
|
823
828
|
condition += " and ti.f_enter_number like '%"+this.$refs.paged.$refs.cri.model.f_enter_number+"%'"
|
|
824
829
|
|
|
825
830
|
//tag
|
|
826
|
-
this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检')) and ti.f_no_checkplan = '有计划安检'" + condition)
|
|
831
|
+
this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or ti.f_last_check_state = '到访不遇') and ti.f_no_checkplan = '有计划安检'" + condition)
|
|
827
832
|
},
|
|
828
833
|
getNewOrder(){
|
|
829
834
|
HostApp.__this__ = this
|
package/src/main.js
CHANGED
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
import Vue from 'vue'
|
|
2
|
-
import App from './App'
|
|
3
|
-
import { all } from 'vue-client'
|
|
4
|
-
import { system } from 'system-clients'
|
|
5
|
-
import safecheck from './safecheck'
|
|
6
|
-
import echarts from 'echarts'
|
|
7
|
-
// import safecheck from './rongcheng'
|
|
8
|
-
|
|
9
|
-
all()
|
|
10
|
-
// 验证码开关赋值
|
|
11
|
-
var Verificationfalg = false
|
|
12
|
-
system(Verificationfalg)
|
|
13
|
-
// system()
|
|
14
|
-
safecheck('
|
|
15
|
-
// safecheck('rizhao')
|
|
16
|
-
require('./bootstrap/less/bootstrap.less')
|
|
17
|
-
require('./expandcss.less')
|
|
18
|
-
|
|
19
|
-
Vue.prototype.$echarts = echarts
|
|
20
|
-
Vue.android = false
|
|
21
|
-
|
|
22
|
-
Vue.url = '/SafeCheck/rs/'
|
|
23
|
-
if(Vue.android)
|
|
24
|
-
Vue.url = Vue.staticUrl
|
|
25
|
-
Vue.interval = 1*60*1000
|
|
26
|
-
Vue.nopic = 'file:///android_asset/nopic.png'
|
|
27
|
-
Vue.mapSetup = false
|
|
28
|
-
|
|
29
|
-
/* eslint-disable no-new */
|
|
30
|
-
new Vue({
|
|
31
|
-
el: 'body',
|
|
32
|
-
components: { App }
|
|
33
|
-
})
|
|
1
|
+
import Vue from 'vue'
|
|
2
|
+
import App from './App'
|
|
3
|
+
import { all } from 'vue-client'
|
|
4
|
+
import { system } from 'system-clients'
|
|
5
|
+
import safecheck from './safecheck'
|
|
6
|
+
import echarts from 'echarts'
|
|
7
|
+
// import safecheck from './rongcheng'
|
|
8
|
+
|
|
9
|
+
all()
|
|
10
|
+
// 验证码开关赋值
|
|
11
|
+
var Verificationfalg = false
|
|
12
|
+
system(Verificationfalg)
|
|
13
|
+
// system()
|
|
14
|
+
safecheck('fugou')
|
|
15
|
+
// safecheck('rizhao')
|
|
16
|
+
require('./bootstrap/less/bootstrap.less')
|
|
17
|
+
require('./expandcss.less')
|
|
18
|
+
|
|
19
|
+
Vue.prototype.$echarts = echarts
|
|
20
|
+
Vue.android = false
|
|
21
|
+
|
|
22
|
+
Vue.url = '/SafeCheck/rs/'
|
|
23
|
+
if(Vue.android)
|
|
24
|
+
Vue.url = Vue.staticUrl
|
|
25
|
+
Vue.interval = 1*60*1000
|
|
26
|
+
Vue.nopic = 'file:///android_asset/nopic.png'
|
|
27
|
+
Vue.mapSetup = false
|
|
28
|
+
|
|
29
|
+
/* eslint-disable no-new */
|
|
30
|
+
new Vue({
|
|
31
|
+
el: 'body',
|
|
32
|
+
components: { App }
|
|
33
|
+
})
|