safecheck-client 4.0.1-53 → 4.0.1-54

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": "4.0.1-53",
4
+ "version": "4.0.1-54",
5
5
  "description": "安检模块 前端组件",
6
6
  "author": "丁新 <417755458@qq.com>",
7
7
  "license": "ISC",
@@ -1,133 +1,132 @@
1
- <template>
2
- <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
3
- <div class="auto">
4
- <partial-view v-ref:pv>
5
- <div class="row text-left" style="padding-bottom: 10px">
6
- <label class="col-sm-3 control-label">用户编号:</label>
7
- <span class="col-sm-9">{{ rowdata.f_userinfo_code }}</span>
8
- </div>
9
- <div class="row text-left" style="padding-bottom: 10px">
10
- <label class="col-sm-3 control-label">用户姓名:</label>
11
- <span class="col-sm-9">{{ rowdata.f_user_name }}</span>
12
- </div>
13
- <div class="row text-left" style="padding-bottom: 10px">
14
- <label class="col-sm-3 control-label">用户类型:</label>
15
- <span class="col-sm-9">{{ rowdata.f_user_type }}</span>
16
- </div>
17
- <div class="row text-left" style="padding-bottom: 10px">
18
- <label class="col-sm-3 control-label">用户地址:</label>
19
- <span class="col-sm-9">{{ rowdata.f_address }}</span>
20
- </div>
21
- </partial-view>
22
- </div>
23
- <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
24
- <template partial='head'>
25
- <tr>
26
- <th>安检人</th>
27
- <!-- <th>安检开始时间</th>-->
28
- <th>安检结束时间</th>
29
- <th>安检上传时间</th>
30
- <th>安检状态</th>
31
- <!-- <th>隐患情况</th>-->
32
- <th>操作</th>
33
- </tr>
34
- </template>
35
- <template partial='body'>
36
- <tr style="text-align: center">
37
- <td style="text-align: center">{{ row.f_checker_name }}</td>
38
- <!-- <td>{{row.f_onsite_time}}</td>-->
39
- <td style="text-align: center">{{ row.f_offsite_time }}</td>
40
- <td style="text-align: center">{{ row.f_upload_date }}</td>
41
- <td style="text-align: center">{{ row.f_entry_status }}</td>
42
- <!-- <td>{{$parent.$parent.getDefect(row.f_defect_content)}}</td>-->
43
- <td style="text-align: center">
44
- <button class="button_spacing button_search-1" @click='$parent.$parent.goDetail(row)'>查看</button>
45
- </td>
46
- </tr>
47
- </template>
48
- </data-grid>
49
- </div>
50
- </template>
51
-
52
- <script>
53
- import {PagedList} from 'vue-client'
54
- import Vue from "vue";
55
- import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
56
- import {isEmpty} from "../Util";
57
-
58
- let asyncReady = async function (self) {
59
- // 获取配置信息
60
- try {
61
- let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
62
- self.delConfigKey(res.data)
63
- Vue.config.safecheck=res.data
64
- console.log('获取配置结果===', res.data)
65
- } catch (error) {
66
- // 忽略704,文件找不到异常R
67
- if (error.status !== 704) {
68
- throw error
69
- }
70
- }
71
- }
72
-
73
- export default {
74
- title: '安检记录列表',
75
- props: ['row'],
76
- data() {
77
- return {
78
- rowdata: this.row,
79
- model: new PagedList('api/af-safecheck/sql/查找安检单', 10, {
80
- f_filialeid: "''",
81
- f_plan_id: "''",
82
- f_approved: "''",
83
- f_entry_status: "''",
84
- f_no_checkplan: "''",
85
- orderitem: "'f_offsite_time desc'"
86
- })
87
- }
88
- },
89
- ready() {
90
- this.rowdata = this.row
91
- var condition =' 1=1 '
92
- if(!isEmpty(this.row.f_userinfo_id)){
93
- condition+= " and f_userinfoid = '" + this.row.f_userinfo_id + "'"
94
- }
95
- if (this.row.filialeCon){
96
- condition += ` and ${this.row.filialeCon}`
97
- }
98
- this.model.params.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
99
- this.model.search(condition)
100
- },
101
- watch: {
102
- 'row'(val) {
103
- if (val) {
104
- this.rowdata = val
105
- var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
106
- if (this.row.filialeCon){
107
- condition += ` and ${this.row.filialeCon}`
108
- }
109
- this.model.search(condition)
110
-
111
- }
112
- }
113
- },
114
- methods: {
115
- getDefect(val) {
116
- if (val) {
117
- try {
118
- var defect = JSON.parse(val)
119
- return defect.result
120
- } catch (e) {
121
- //tag
122
- return '正常'
123
- }
124
- }
125
- return '正常'
126
- },
127
- goDetail(row) {
128
- row.f_upload_state = '已传'
129
- this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
130
- }
131
- }
132
- }
133
- </script>
1
+ <template>
2
+ <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
3
+ <div class="auto">
4
+ <partial-view v-ref:pv>
5
+ <div class="row text-left" style="padding-bottom: 10px">
6
+ <label class="col-sm-3 control-label">用户编号:</label>
7
+ <span class="col-sm-9">{{ rowdata.f_userinfo_code }}</span>
8
+ </div>
9
+ <div class="row text-left" style="padding-bottom: 10px">
10
+ <label class="col-sm-3 control-label">用户姓名:</label>
11
+ <span class="col-sm-9">{{ rowdata.f_user_name }}</span>
12
+ </div>
13
+ <div class="row text-left" style="padding-bottom: 10px">
14
+ <label class="col-sm-3 control-label">用户类型:</label>
15
+ <span class="col-sm-9">{{ rowdata.f_user_type }}</span>
16
+ </div>
17
+ <div class="row text-left" style="padding-bottom: 10px">
18
+ <label class="col-sm-3 control-label">用户地址:</label>
19
+ <span class="col-sm-9">{{ rowdata.f_address }}</span>
20
+ </div>
21
+ </partial-view>
22
+ </div>
23
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
24
+ <template partial='head'>
25
+ <tr>
26
+ <th>安检人</th>
27
+ <!-- <th>安检开始时间</th>-->
28
+ <th>安检结束时间</th>
29
+ <th>安检上传时间</th>
30
+ <th>安检状态</th>
31
+ <!-- <th>隐患情况</th>-->
32
+ <th>操作</th>
33
+ </tr>
34
+ </template>
35
+ <template partial='body'>
36
+ <tr style="text-align: center">
37
+ <td style="text-align: center">{{ row.f_checker_name }}</td>
38
+ <!-- <td>{{row.f_onsite_time}}</td>-->
39
+ <td style="text-align: center">{{ row.f_offsite_time }}</td>
40
+ <td style="text-align: center">{{ row.f_upload_date }}</td>
41
+ <td style="text-align: center">{{ row.f_entry_status }}</td>
42
+ <!-- <td>{{$parent.$parent.getDefect(row.f_defect_content)}}</td>-->
43
+ <td style="text-align: center">
44
+ <button class="button_spacing button_search-1" @click='$parent.$parent.goDetail(row)'>查看</button>
45
+ </td>
46
+ </tr>
47
+ </template>
48
+ </data-grid>
49
+ </div>
50
+ </template>
51
+
52
+ <script>
53
+ import {PagedList} from 'vue-client'
54
+ import Vue from "vue";
55
+ import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
56
+ import {isEmpty} from "../Util";
57
+
58
+ let asyncReady = async function (self) {
59
+ // 获取配置信息
60
+ try {
61
+ let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
62
+ self.delConfigKey(res.data)
63
+ Vue.config.safecheck=res.data
64
+ console.log('获取配置结果===', res.data)
65
+ } catch (error) {
66
+ // 忽略704,文件找不到异常R
67
+ if (error.status !== 704) {
68
+ throw error
69
+ }
70
+ }
71
+ }
72
+
73
+ export default {
74
+ title: '安检记录列表',
75
+ props: ['row'],
76
+ data() {
77
+ return {
78
+ rowdata: this.row,
79
+ model: new PagedList('api/af-safecheck/sql/查找安检单', 10, {
80
+ f_filialeid: "''",
81
+ f_plan_id: "''",
82
+ f_approved: "''",
83
+ f_entry_status: "''",
84
+ f_no_checkplan: "''",
85
+ orderitem: "'f_offsite_time desc'"
86
+ })
87
+ }
88
+ },
89
+ ready() {
90
+ this.rowdata = this.row
91
+ var condition =' 1=1 '
92
+ if(!isEmpty(this.row.f_userinfo_id)){
93
+ condition+= " and f_userinfoid = '" + this.row.f_userinfo_id + "'"
94
+ }
95
+ if (this.row.filialeCon){
96
+ condition += ` and ${this.row.filialeCon}`
97
+ }
98
+ this.model.params.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
99
+ this.model.search(condition)
100
+ },
101
+ watch: {
102
+ 'row'(val) {
103
+ if (val) {
104
+ this.rowdata = val
105
+ var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
106
+ if (this.row.filialeCon){
107
+ condition += ` and ${this.row.filialeCon}`
108
+ }
109
+ this.model.search(condition)
110
+
111
+ }
112
+ }
113
+ },
114
+ methods: {
115
+ getDefect(val) {
116
+ if (val) {
117
+ try {
118
+ var defect = JSON.parse(val)
119
+ return defect.result
120
+ } catch (e) {
121
+ //tag
122
+ return '正常'
123
+ }
124
+ }
125
+ return '正常'
126
+ },
127
+ goDetail(row) {
128
+ this.$emit('showcheckpaper',row)
129
+ }
130
+ }
131
+ }
132
+ </script>
@@ -1,74 +1,100 @@
1
- <template>
2
- <!--安检综合查询主界面-->
3
- <div id="unit" class="flex-row" :class="{'binary':showItem}">
4
- <div :class="{'basic-main':!showItem,'binary-left':showItem}">
5
- <!--展示查询界面-->
6
- <check-search-user class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
7
- @filiale-change="filialeChange"
8
- @canel-main="close" v-ref:checksearch></check-search-user>
9
- </div>
10
- <div class="binary-right" v-show="showItem">
11
- <div class="flex">
12
- <check-paper-list style="height: 100%" :row="rowData"></check-paper-list>
13
- </div>
14
- </div>
15
- </div>
16
-
17
- </template>
18
-
19
- <script>
20
-
21
- export default {
22
- title: '用户安检情况',
23
- name: 'CheckPaperSearchUser',
24
- data() {
25
- return {
26
- style: 'col-sm-2 form-group',
27
- style2: 'col-sm-4 form-group',
28
- hidden: true,
29
- barwidth: '100%',
30
- showItem: false,
31
- rowData: {},
32
- filialeCon: ''
33
- }
34
- },
35
- methods: {
36
- show() {
37
- this.showItem = this.showItem ? false : true
38
- },
39
- selected(row) {
40
- if (row.val && this.filialeCon){
41
- row.val.filialeCon = this.filialeCon
42
- }
43
- this.showItem = true
44
- this.barwidth = '50%'
45
- this.rowData = row.val
46
- this.hidden = false
47
- //tag
48
- },
49
- filialeChange(filialeCon){
50
- this.filialeCon = filialeCon
51
- },
52
- close() {
53
- this.showItem = false
54
- this.barwidth = '100%'
55
- this.hidden = true
56
- }
57
- },
58
- watch: {
59
- 'showItem'(val) {
60
- //tag
61
- //tag
62
- if (val) {
63
- this.style = 'col-sm-3 form-group'
64
- this.style2 = 'col-sm-6 form-group'
65
- } else {
66
- this.style = 'col-sm-2 form-group'
67
- this.style2 = 'col-sm-4 form-group'
68
- }
69
- }
70
- }
71
- }
72
-
73
- </script>
74
-
1
+ <template>
2
+ <!--安检综合查询主界面-->
3
+ <div id="unit" class="flex-row" :class="{'binary':showItem}">
4
+ <div :class="{'basic-main':!showItem,'binary-left':showItem}">
5
+ <!--展示查询界面-->
6
+ <check-search-user class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
7
+ @filiale-change="filialeChange"
8
+ @canel-main="close" v-ref:checksearch></check-search-user>
9
+ </div>
10
+ <div class="binary-right" v-show="showItem">
11
+ <div class="flex">
12
+ <check-paper-list style="height: 100%" :row="rowData" v-on:showcheckpaper="checkpapershow"></check-paper-list>
13
+ </div>
14
+ </div>
15
+ </div>
16
+ <new-check-paper v-if="showinfo2" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback1"></new-check-paper>
17
+ <new-check-paper-temp v-if="showinfo3" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback2"></new-check-paper-temp>
18
+ </template>
19
+
20
+ <script>
21
+
22
+ export default {
23
+ title: '用户安检情况',
24
+ name: 'CheckPaperSearchUser',
25
+ data() {
26
+ return {
27
+ style: 'col-sm-2 form-group',
28
+ style2: 'col-sm-4 form-group',
29
+ hidden: true,
30
+ barwidth: '100%',
31
+ showItem: false,
32
+ rowData: {},
33
+ filialeCon: '',
34
+ shouinfodata:{},
35
+ showinfo1:true,
36
+ showinfo2: false,
37
+ showinfo3:false
38
+
39
+ }
40
+ },
41
+ methods: {
42
+ showback1(){
43
+ this.showinfo1 = true
44
+ this.showinfo2 = false
45
+ },
46
+ showback2(){
47
+ this.showinfo1 = true
48
+ this.showinfo3 = false
49
+ },
50
+ checkpapershow(val){
51
+ val.f_upload_state = '已传'
52
+ this.shouinfodata = JSON.parse(JSON.stringify(val))
53
+ this.showinfo1 = false
54
+ if (val.f_safe_type == '已挂表未办卡安检'){
55
+ this.showinfo2 = false
56
+ this.showinfo3 = true
57
+ return
58
+ }
59
+ this.showinfo2 = true
60
+ this.showinfo3 = false
61
+ },
62
+ show() {
63
+ this.showItem = this.showItem ? false : true
64
+ },
65
+ selected(row) {
66
+ if (row.val && this.filialeCon){
67
+ row.val.filialeCon = this.filialeCon
68
+ }
69
+ this.showItem = true
70
+ this.barwidth = '50%'
71
+ this.rowData = row.val
72
+ this.hidden = false
73
+ //tag
74
+ },
75
+ filialeChange(filialeCon){
76
+ this.filialeCon = filialeCon
77
+ },
78
+ close() {
79
+ this.showItem = false
80
+ this.barwidth = '100%'
81
+ this.hidden = true
82
+ }
83
+ },
84
+ watch: {
85
+ 'showItem'(val) {
86
+ //tag
87
+ //tag
88
+ if (val) {
89
+ this.style = 'col-sm-3 form-group'
90
+ this.style2 = 'col-sm-6 form-group'
91
+ } else {
92
+ this.style = 'col-sm-2 form-group'
93
+ this.style2 = 'col-sm-4 form-group'
94
+ }
95
+ }
96
+ }
97
+ }
98
+
99
+ </script>
100
+