safecheck-client 3.0.35-gongyi-6 → 3.0.35-gongyi-7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. package/package.json +119 -119
  2. package/src/components/paper/PaperList.vue +41 -35
  3. package/src/components/pc/CheckBookList.vue +586 -586
  4. package/src/components/pc/CheckBookManage.vue +38 -1
  5. package/src/components/pc/RoleSelector.vue +125 -122
  6. package/src/components/planmanage/checkUserList.vue +37 -0
  7. package/src/components/report/CheckPlanUserList.vue +1 -1
package/package.json CHANGED
@@ -1,119 +1,119 @@
1
- {
2
- "name": "safecheck-client",
3
- "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
4
- "version": "3.0.35-gongyi-6",
5
- "description": "安检模块 前端组件",
6
- "author": "丁新 <417755458@qq.com>",
7
- "license": "ISC",
8
- "main": "src/index.js",
9
- "keywords": [
10
- "safecheck"
11
- ],
12
- "scripts": {
13
- "example": "node build/example-server.js",
14
- "dev": "node build/dev-server.js",
15
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
16
- "build": "rimraf dist && mkdirp dist && ncp static dist/safecheck && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
17
- "hanwei": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.hanwei.conf.js",
18
- "android": "node build/dev-android.js",
19
- "unit": "karma start test/unit/karma.conf.js --single-run",
20
- "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
21
- "e2e": "node test/e2e/runner.js",
22
- "release": "bash build/release.sh",
23
- "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
24
- },
25
- "repository": {
26
- "type": "git",
27
- "url": "https://gitee.com/aote/product-hujiao"
28
- },
29
- "dependencies": {
30
- "benz-amr-recorder": "^1.1.3",
31
- "less": "^2.7.1",
32
- "vue": "^1.0.17",
33
- "xlsx": "^0.17.3"
34
- },
35
- "devDependencies": {
36
- "babel-core": "^6.26.0",
37
- "babel-loader": "^6.0.0",
38
- "babel-plugin-transform-runtime": "^6.0.0",
39
- "babel-preset-es2015": "^6.0.0",
40
- "babel-preset-stage-2": "^6.0.0",
41
- "chai": "^3.5.0",
42
- "chromedriver": "^2.21.2",
43
- "connect-history-api-fallback": "^1.1.0",
44
- "cross-env": "^1.0.7",
45
- "cross-spawn": "^2.1.5",
46
- "css-loader": "^0.23.0",
47
- "echarts": "^4.1.0",
48
- "eslint": "^2.0.0",
49
- "eslint-config-standard": "^5.1.0",
50
- "eslint-friendly-formatter": "^1.2.2",
51
- "eslint-loader": "^1.3.0",
52
- "eslint-plugin-html": "^1.3.0",
53
- "eslint-plugin-promise": "^1.0.8",
54
- "eslint-plugin-standard": "^1.3.2",
55
- "eslint-plugin-vue": "^0.1.1",
56
- "eventsource-polyfill": "^0.9.6",
57
- "express": "^4.13.3",
58
- "extract-text-webpack-plugin": "^1.0.1",
59
- "file-loader": "^0.8.4",
60
- "function-bind": "^1.0.2",
61
- "html-webpack-plugin": "^2.30.1",
62
- "http-proxy-middleware": "^0.11.0",
63
- "increase-memory-limit": "^1.0.7",
64
- "inject-loader": "^2.0.1",
65
- "isparta-loader": "^2.0.0",
66
- "jasmine-core": "^2.4.1",
67
- "jquery": "^3.3.1",
68
- "jsencrypt": "3.0.0-rc.1",
69
- "json-loader": "^0.5.4",
70
- "karma": "^1.4.1",
71
- "karma-chrome-launcher": "^2.2.0",
72
- "karma-coverage": "^1.1.1",
73
- "karma-mocha": "^1.3.0",
74
- "karma-phantomjs-launcher": "^1.0.2",
75
- "karma-phantomjs-shim": "^1.4.0",
76
- "karma-sinon-chai": "^1.3.1",
77
- "karma-sourcemap-loader": "^0.3.7",
78
- "karma-spec-reporter": "0.0.31",
79
- "karma-webpack": "^2.0.2",
80
- "less-loader": "^2.2.3",
81
- "lolex": "^1.5.2",
82
- "mkdirp": "^0.5.1",
83
- "mocha": "^3.2.0",
84
- "ncp": "^2.0.0",
85
- "nightwatch": "^0.8.18",
86
- "ol": "^4.6.4",
87
- "phantomjs-prebuilt": "^2.1.3",
88
- "proj4": "^2.2.1",
89
- "rimraf": "^2.5.0",
90
- "selenium-server": "2.52.0",
91
- "sinon": "^2.1.0",
92
- "sinon-chai": "^2.8.0",
93
- "style": "0.0.3",
94
- "style-loader": "^0.20.3",
95
- "system-clients": "3.2.1-25",
96
- "system-phone": "1.2.80-35",
97
- "telephone-clients": "1.1.27",
98
- "url-loader": "^0.5.7",
99
- "vue-client": "1.24.28",
100
- "vue-hot-reload-api": "^1.2.0",
101
- "vue-html-loader": "^1.0.0",
102
- "vue-loader": "^8.2.1",
103
- "vue-resource": "^1.5.0",
104
- "vue-router": "^0.7.13",
105
- "vue-strap": "^1.0.9",
106
- "vue-style-loader": "^1.0.0",
107
- "vue-validator": "2.1.7",
108
- "webpack": "^1.12.2",
109
- "webpack-dev-middleware": "^1.4.0",
110
- "webpack-hot-middleware": "^2.6.0",
111
- "webpack-merge": "^0.8.3",
112
- "weixin-js-sdk": "^1.2.0"
113
- },
114
- "directories": {
115
- "doc": "docs",
116
- "example": "examples",
117
- "test": "test"
118
- }
119
- }
1
+ {
2
+ "name": "safecheck-client",
3
+ "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
4
+ "version": "3.0.35-gongyi-7",
5
+ "description": "安检模块 前端组件",
6
+ "author": "丁新 <417755458@qq.com>",
7
+ "license": "ISC",
8
+ "main": "src/index.js",
9
+ "keywords": [
10
+ "safecheck"
11
+ ],
12
+ "scripts": {
13
+ "example": "node build/example-server.js",
14
+ "dev": "node build/dev-server.js",
15
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
16
+ "build": "rimraf dist && mkdirp dist && ncp static dist/safecheck && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
17
+ "hanwei": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.hanwei.conf.js",
18
+ "android": "node build/dev-android.js",
19
+ "unit": "karma start test/unit/karma.conf.js --single-run",
20
+ "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
21
+ "e2e": "node test/e2e/runner.js",
22
+ "release": "bash build/release.sh",
23
+ "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
24
+ },
25
+ "repository": {
26
+ "type": "git",
27
+ "url": "https://gitee.com/aote/product-hujiao"
28
+ },
29
+ "dependencies": {
30
+ "benz-amr-recorder": "^1.1.3",
31
+ "less": "^2.7.1",
32
+ "vue": "^1.0.17",
33
+ "xlsx": "^0.17.3"
34
+ },
35
+ "devDependencies": {
36
+ "babel-core": "^6.26.0",
37
+ "babel-loader": "^6.0.0",
38
+ "babel-plugin-transform-runtime": "^6.0.0",
39
+ "babel-preset-es2015": "^6.0.0",
40
+ "babel-preset-stage-2": "^6.0.0",
41
+ "chai": "^3.5.0",
42
+ "chromedriver": "^2.21.2",
43
+ "connect-history-api-fallback": "^1.1.0",
44
+ "cross-env": "^1.0.7",
45
+ "cross-spawn": "^2.1.5",
46
+ "css-loader": "^0.23.0",
47
+ "echarts": "^4.1.0",
48
+ "eslint": "^2.0.0",
49
+ "eslint-config-standard": "^5.1.0",
50
+ "eslint-friendly-formatter": "^1.2.2",
51
+ "eslint-loader": "^1.3.0",
52
+ "eslint-plugin-html": "^1.3.0",
53
+ "eslint-plugin-promise": "^1.0.8",
54
+ "eslint-plugin-standard": "^1.3.2",
55
+ "eslint-plugin-vue": "^0.1.1",
56
+ "eventsource-polyfill": "^0.9.6",
57
+ "express": "^4.13.3",
58
+ "extract-text-webpack-plugin": "^1.0.1",
59
+ "file-loader": "^0.8.4",
60
+ "function-bind": "^1.0.2",
61
+ "html-webpack-plugin": "^2.30.1",
62
+ "http-proxy-middleware": "^0.11.0",
63
+ "increase-memory-limit": "^1.0.7",
64
+ "inject-loader": "^2.0.1",
65
+ "isparta-loader": "^2.0.0",
66
+ "jasmine-core": "^2.4.1",
67
+ "jquery": "^3.3.1",
68
+ "jsencrypt": "3.0.0-rc.1",
69
+ "json-loader": "^0.5.4",
70
+ "karma": "^1.4.1",
71
+ "karma-chrome-launcher": "^2.2.0",
72
+ "karma-coverage": "^1.1.1",
73
+ "karma-mocha": "^1.3.0",
74
+ "karma-phantomjs-launcher": "^1.0.2",
75
+ "karma-phantomjs-shim": "^1.4.0",
76
+ "karma-sinon-chai": "^1.3.1",
77
+ "karma-sourcemap-loader": "^0.3.7",
78
+ "karma-spec-reporter": "0.0.31",
79
+ "karma-webpack": "^2.0.2",
80
+ "less-loader": "^2.2.3",
81
+ "lolex": "^1.5.2",
82
+ "mkdirp": "^0.5.1",
83
+ "mocha": "^3.2.0",
84
+ "ncp": "^2.0.0",
85
+ "nightwatch": "^0.8.18",
86
+ "ol": "^4.6.4",
87
+ "phantomjs-prebuilt": "^2.1.3",
88
+ "proj4": "^2.2.1",
89
+ "rimraf": "^2.5.0",
90
+ "selenium-server": "2.52.0",
91
+ "sinon": "^2.1.0",
92
+ "sinon-chai": "^2.8.0",
93
+ "style": "0.0.3",
94
+ "style-loader": "^0.20.3",
95
+ "system-clients": "3.2.1-25",
96
+ "system-phone": "1.2.80-35",
97
+ "telephone-clients": "1.1.27",
98
+ "url-loader": "^0.5.7",
99
+ "vue-client": "1.24.28",
100
+ "vue-hot-reload-api": "^1.2.0",
101
+ "vue-html-loader": "^1.0.0",
102
+ "vue-loader": "^8.2.1",
103
+ "vue-resource": "^1.5.0",
104
+ "vue-router": "^0.7.13",
105
+ "vue-strap": "^1.0.9",
106
+ "vue-style-loader": "^1.0.0",
107
+ "vue-validator": "2.1.7",
108
+ "webpack": "^1.12.2",
109
+ "webpack-dev-middleware": "^1.4.0",
110
+ "webpack-hot-middleware": "^2.6.0",
111
+ "webpack-merge": "^0.8.3",
112
+ "weixin-js-sdk": "^1.2.0"
113
+ },
114
+ "directories": {
115
+ "doc": "docs",
116
+ "example": "examples",
117
+ "test": "test"
118
+ }
119
+ }
package/src/components/paper/PaperList.vue CHANGED
@@ -48,78 +48,84 @@
48
48
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
49
49
  @click="$parent.$parent.hidden()"></div>
50
50
  </div>
51
- <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
52
- <label class="font_normal_body">安检计划</label>
53
- <input type="text" class="input_search" v-model="$parent.$parent.model.f_check_plan.f_plan_name"
54
- @click="$parent.$parent.showChooser"
55
- style="width: 60%" placeholder="安检计划" readonly="readonly">
56
- </div>
57
51
  <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
58
- <label class="font_normal_body">开始时间</label>
52
+ <label class="font_normal_body">安检开始时间</label>
59
53
  <datepicker
60
- class="select_list select"
61
- :value.sync="model.f_check_start"
62
- placeholder='开始时间' style="width: 60%"
54
+ :value.sync="model.f_check_onsite_start"
55
+ placeholder='安检开始时间' style="width: 60%"
63
56
  :disabled-days-of-week="[]"
64
57
  :format="'yyyy-MM-dd'"
65
58
  :show-rest-button="reset"
66
- v-model="model.f_check_start"
67
- condition="f_offsite_time > ='{} 00:00:00'">
59
+ v-model="model.f_check_onsite_start"
60
+ condition="f_onsite_time >= '{} 00:00:00'">
68
61
  </datepicker>
69
62
  </div>
70
63
  <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
71
- <label class="font_normal_body">结束时间</label>
64
+ <label class="font_normal_body">安检结束时间</label>
72
65
  <datepicker
73
- :value.sync="model.f_check_end"
74
- placeholder='结束时间' style="width: 60%"
66
+ :value.sync="model.f_check_onsite_end"
67
+ placeholder='安检结束时间' style="width: 60%"
75
68
  :disabled-days-of-week="[]"
76
69
  :format="'yyyy-MM-dd'"
77
70
  :show-rest-button="reset"
78
- v-model="model.f_check_end"
79
- condition="f_offsite_time <= '{} 23:59:59'">
71
+ v-model="model.f_check_onsite_end"
72
+ condition="f_onsite_time <= '{} 23:59:59'">
80
73
  </datepicker>
81
74
  </div>
82
-
83
-
84
-
85
-
86
75
  <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
87
- <label class="font_normal_body">安检时间</label>
76
+ <label class="font_normal_body">上传开始时间</label>
88
77
  <datepicker
89
- :value.sync="model.f_check_onsite"
90
- placeholder='安检时间' style="width: 60%"
78
+ :value.sync="model.f_check_upload_start"
79
+ placeholder='上传开始时间' style="width: 60%"
91
80
  :disabled-days-of-week="[]"
92
81
  :format="'yyyy-MM-dd'"
93
82
  :show-rest-button="reset"
94
- v-model="model.f_check_onsite"
95
- condition="f_onsite_time <= '{} 00:00:00'">
83
+ v-model="model.f_check_upload_start"
84
+ condition="f_upload_date>= '{} 00:00:00'">
96
85
  </datepicker>
97
86
  </div>
98
87
  <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
99
- <label class="font_normal_body">上传时间</label>
88
+ <label class="font_normal_body">上传结束时间</label>
100
89
  <datepicker
101
- :value.sync="model.f_check_upload"
102
- placeholder='上传时间' style="width: 60%"
90
+ :value.sync="model.f_check_upload_end"
91
+ placeholder='上传结束时间' style="width: 60%"
103
92
  :disabled-days-of-week="[]"
104
93
  :format="'yyyy-MM-dd'"
105
94
  :show-rest-button="reset"
106
- v-model="model.f_check_upload"
95
+ v-model="model.f_check_upload_end"
107
96
  condition="f_upload_date<= '{} 23:59:59'">
108
97
  </datepicker>
109
98
  </div>
110
99
  <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
111
- <label class="font_normal_body">下发时间</label>
100
+ <label class="font_normal_body">下发开始时间</label>
101
+ <datepicker
102
+ :value.sync="model.f_check_issue_start"
103
+ placeholder='下发开始时间' style="width: 60%"
104
+ :disabled-days-of-week="[]"
105
+ :format="'yyyy-MM-dd'"
106
+ :show-rest-button="reset"
107
+ v-model="model.f_check_issue_start"
108
+ condition="f_issue_time >= '{} 00:00:00'">
109
+ </datepicker>
110
+ </div>
111
+ <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
112
+ <label class="font_normal_body">下发结束时间</label>
112
113
  <datepicker
113
- :value.sync="model.f_check_issue"
114
- placeholder='下发时间' style="width: 60%"
114
+ :value.sync="model.f_check_issue_end"
115
+ placeholder='下发结束时间' style="width: 60%"
115
116
  :disabled-days-of-week="[]"
116
117
  :format="'yyyy-MM-dd'"
117
118
  :show-rest-button="reset"
118
- v-model="model.f_check_issue"
119
+ v-model="model.f_check_issue_end"
119
120
  condition="f_issue_time <= '{} 23:59:59'">
120
121
  </datepicker>
121
122
  </div>
122
-
123
+ <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
124
+ <label class="font_normal_body">安检计划</label>
125
+ <input type="text" class="input_search" v-model="$parent.$parent.model.f_check_plan.f_plan_name"
126
+ @click="$parent.$parent.showChooser"
127
+ style="width: 60%" placeholder="安检计划" readonly="readonly">
128
+ </div>
123
129
 
124
130
  <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
125
131