safecheck-client 3.0.35-11 → 3.0.35-13

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "safecheck-client",
3
3
  "//": "主分支版本别乱升,测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包,不要频繁升级第三位版本号),别提交版本号。切了分支切记把主分支版本升了,保证主分支始终是最高版本!!!!!",
4
- "version": "3.0.35-11",
4
+ "version": "3.0.35-13",
5
5
  "description": "安检模块 前端组件",
6
6
  "author": "丁新 <417755458@qq.com>",
7
7
  "license": "ISC",
@@ -0,0 +1,113 @@
1
+ <template>
2
+ <div class="flex-row">
3
+ <div class="basic-main">
4
+ <criteria-paged :model="model" v-ref:paged>
5
+ <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
6
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
7
+ <div class="row">
8
+ <div class="form-group col-sm-2" >
9
+ <label class="font_normal_body">小区名称</label>
10
+ <input type="text" class="input_search" v-model="model.f_residential_area"
11
+ style="width: 60%" placeholder="小区名称" condition="ta.f_residential_area like '%{}%'">
12
+ </div>
13
+ <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
14
+ <export-excel-safe :data="$parent.$parent.searchData"
15
+ :field="$parent.$parent.excelHeaders"
16
+ :choose-col="true"
17
+ sqlurl="rs/logic/SafeExportExcel" sql-name="securityCheckLedger" template-name='安检台账'></export-excel-safe>
18
+ <button class="button_spacing button_search" @click="search()">查询</button>
19
+ </div>
20
+ </div>
21
+ </div>
22
+ </criteria>
23
+ <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
24
+ <template partial='head'>
25
+ <tr>
26
+ <th>
27
+ <nobr>小区名称</nobr>
28
+ </th>
29
+ <th>
30
+ <nobr>小区用户数</nobr>
31
+ </th>
32
+ <th>
33
+ <nobr>所属计划</nobr>
34
+ </th>
35
+ <th>
36
+ <nobr>计划内用户数</nobr>
37
+ </th>
38
+ <th>
39
+ <nobr>计划下发时间</nobr>
40
+ </th>
41
+ <th>
42
+ <nobr>执行时间</nobr>
43
+ </th>
44
+ <th>
45
+ <nobr>执行周期</nobr>
46
+ </th>
47
+ <th>
48
+ <nobr>周期单位</nobr>
49
+ </th>
50
+ <th>
51
+ <nobr>距离下周期时间(天)</nobr>
52
+ </th>
53
+ </tr>
54
+ </template>
55
+ <template partial='body'>
56
+ <td style="text-align: center">{{row.f_residential_area}}</td>
57
+ <td style="text-align: center">{{row.f_plan_name}}</td>
58
+ <td style="text-align: center">{{row.area_num}}</td>
59
+ <td style="text-align: center">{{row.plan_num}}</td>
60
+ <td style="text-align: center">{{row.f_issue_time}}</td>
61
+ <td style="text-align: center">{{row.first_check_date}}</td>
62
+ <td style="text-align: center">{{row.zq_value}}</td>
63
+ <td style="text-align: center">{{row.dw_value}}</td>
64
+ <td style="text-align: center">{{row.difference_day}}</td>
65
+ </template>
66
+ </data-grid>
67
+ </criteria-paged>
68
+ </div>
69
+ </div>
70
+ </template>
71
+
72
+ <script>
73
+ import {PagedList} from 'vue-client'
74
+
75
+ export default {
76
+ title: '安检台账',
77
+ data() {
78
+ return {
79
+ model: new PagedList('rs/sql/securityCheckLedger', 20),
80
+ searchData: {
81
+ condition: "1=1"
82
+ },
83
+ excelHeaders: {
84
+ 'f_residential_area': '小区名称',
85
+ 'f_plan_name': '小区用户数',
86
+ 'area_num': '所属计划',
87
+ 'plan_num': '计划内用户数',
88
+ 'f_issue_time': '计划下发时间',
89
+ 'first_check_date': '执行时间',
90
+ 'zq_value': '执行周期',
91
+ 'dw_value': '周期单位',
92
+ 'difference_day': '距离下周期时间(天)'
93
+ }
94
+ }
95
+ },
96
+ methods: {
97
+ selfSearch(args) {
98
+ this.model.search(args.condition, args.model, args.condValue)
99
+ }
100
+ },
101
+ ready() {
102
+
103
+ },
104
+ watch: {
105
+ 'model.condition'(val) {
106
+ if (val) {
107
+ this.searchData.condition = val
108
+ }
109
+ }
110
+ }
111
+
112
+ }
113
+ </script>
@@ -983,8 +983,8 @@
983
983
  //tag)
984
984
  if(Vue.android && (!this.data.f_overall_imgs || this.data.f_overall_imgs.length == 0) && this.data.f_entry_status == '入户')
985
985
  return prefix + '必须有安检总体照片'
986
- // if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
987
- // return prefix + '必须有用户签名'
986
+ if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
987
+ return prefix + '必须有用户签名'
988
988
  console.log("666666",Vue.android && this.data.f_issign_hetong=='是' && this.data.f_hetong_path == Vue.nopic)
989
989
  if(Vue.android && this.data.f_issign_hetong=='是' && this.data.f_hetong_path == Vue.nopic){
990
990
  return prefix + '签订合同必须拍照'
@@ -444,6 +444,9 @@
444
444
  <th>
445
445
  <nobr>安检员备注</nobr>
446
446
  </th>
447
+ <th>
448
+ <nobr>表具出厂日期</nobr>
449
+ </th>
447
450
  <th>
448
451
  <nobr>最后一次安检日期</nobr>
449
452
  </th>
@@ -468,6 +471,7 @@
468
471
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_address }}</td>
469
472
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_checker_name }}</td>
470
473
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_comments }}</td>
474
+ <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_factory_date }}</td>
471
475
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
472
476
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
473
477
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">
@@ -534,6 +538,7 @@
534
538
  'f_slice_area': '区域',
535
539
  'f_residential_area': '小区名称',
536
540
  'f_address': '地址',
541
+ 'f_factory_date': '表具出厂日期',
537
542
  'f_last_check_date': '最后一次安检日期',
538
543
  'f_last_check_state': '最后一次安检状态',
539
544
  'f_defect_content': '安检结果'
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('huaran')
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('siyang')
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
+ })