Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
25 changed files
with
307 additions
and
297 deletions
... | @@ -30,7 +30,7 @@ | ... | @@ -30,7 +30,7 @@ |
30 | "babel-plugin-dynamic-import-node": "2.3.3", | 30 | "babel-plugin-dynamic-import-node": "2.3.3", |
31 | "chalk": "2.4.2", | 31 | "chalk": "2.4.2", |
32 | "connect": "3.6.6", | 32 | "connect": "3.6.6", |
33 | "element-ui": "^2.15.6", | 33 | "element-ui": "^2.15.8", |
34 | "html-webpack-plugin": "3.2.0", | 34 | "html-webpack-plugin": "3.2.0", |
35 | "runjs": "4.3.2", | 35 | "runjs": "4.3.2", |
36 | "sass-loader": "8.0.2", | 36 | "sass-loader": "8.0.2", | ... | ... |
... | @@ -46,3 +46,14 @@ export function logoutReg (data) { | ... | @@ -46,3 +46,14 @@ export function logoutReg (data) { |
46 | data | 46 | data |
47 | }) | 47 | }) |
48 | } | 48 | } |
49 | // 流程图 | ||
50 | export function getWorkFlowImage (bsmSlsq) { | ||
51 | return request({ | ||
52 | url: '/business/workFlow/getWorkFlowImage', | ||
53 | method: 'get', | ||
54 | responseType: 'blob', | ||
55 | params: { | ||
56 | bsmSlsq: bsmSlsq | ||
57 | } | ||
58 | }) | ||
59 | } | ||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -16,7 +16,8 @@ export function getZsglrkList (data) { | ... | @@ -16,7 +16,8 @@ export function getZsglrkList (data) { |
16 | return request({ | 16 | return request({ |
17 | url: '/sys/zsgl/getZsglrkList', | 17 | url: '/sys/zsgl/getZsglrkList', |
18 | method: 'post', | 18 | method: 'post', |
19 | data | 19 | data, |
20 | showLoading: true | ||
20 | }) | 21 | }) |
21 | } | 22 | } |
22 | /* | 23 | /* |
... | @@ -26,7 +27,9 @@ export function zsrk (data) { | ... | @@ -26,7 +27,9 @@ export function zsrk (data) { |
26 | return request({ | 27 | return request({ |
27 | url: '/sys/zsgl/zsrk', | 28 | url: '/sys/zsgl/zsrk', |
28 | method: 'post', | 29 | method: 'post', |
29 | data | 30 | data, |
31 | showLoading: true, | ||
32 | loadingTarget: '正在保存中...' | ||
30 | }) | 33 | }) |
31 | } | 34 | } |
32 | /* | 35 | /* |
... | @@ -56,7 +59,8 @@ export function getZsglffList (data) { | ... | @@ -56,7 +59,8 @@ export function getZsglffList (data) { |
56 | return request({ | 59 | return request({ |
57 | url: '/sys/zsgl/getZsglffList', | 60 | url: '/sys/zsgl/getZsglffList', |
58 | method: 'post', | 61 | method: 'post', |
59 | data | 62 | data, |
63 | showLoading: true | ||
60 | }) | 64 | }) |
61 | } | 65 | } |
62 | /* | 66 | /* |
... | @@ -85,7 +89,9 @@ export function zsff (data) { | ... | @@ -85,7 +89,9 @@ export function zsff (data) { |
85 | return request({ | 89 | return request({ |
86 | url: '/sys/zsgl/zsff', | 90 | url: '/sys/zsgl/zsff', |
87 | method: 'post', | 91 | method: 'post', |
88 | data | 92 | data, |
93 | showLoading: true, | ||
94 | loadingTarget: '正在保存中...' | ||
89 | }) | 95 | }) |
90 | } | 96 | } |
91 | /* | 97 | /* |
... | @@ -105,6 +111,17 @@ export function getZssyqkList (data) { | ... | @@ -105,6 +111,17 @@ export function getZssyqkList (data) { |
105 | return request({ | 111 | return request({ |
106 | url: '/sys/zsgl/getZssyqkList', | 112 | url: '/sys/zsgl/getZssyqkList', |
107 | method: 'post', | 113 | method: 'post', |
108 | data | 114 | data, |
115 | showLoading: true | ||
116 | }) | ||
117 | } | ||
118 | /* | ||
119 | 证书管理-证书使用情况详情 | ||
120 | */ | ||
121 | export function getZssyqkInfo (params) { | ||
122 | return request({ | ||
123 | url: '/sys/zsgl/getZssyqkInfo', | ||
124 | method: 'get', | ||
125 | params | ||
109 | }) | 126 | }) |
110 | } | 127 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | 2 | ||
3 | @mixin colorBtn($color) { | 3 | @mixin colorBtn($color) { |
4 | background: $color; | 4 | background: $color; |
5 | color:#fff; | 5 | color: #fff; |
6 | 6 | ||
7 | &:hover { | 7 | &:hover { |
8 | color: #fff; | 8 | color: #fff; |
... | @@ -99,15 +99,9 @@ | ... | @@ -99,15 +99,9 @@ |
99 | font-size: 14px; | 99 | font-size: 14px; |
100 | border-radius: 4px; | 100 | border-radius: 4px; |
101 | } | 101 | } |
102 | |||
102 | // 搜索框按钮的位置 | 103 | // 搜索框按钮的位置 |
103 | .btnCol{ | 104 | .btnCol { |
104 | box-sizing: border-box; | 105 | box-sizing: border-box; |
105 | text-align: right; | 106 | text-align: right; |
106 | } | 107 | } |
... | \ No newline at end of file | ... | \ No newline at end of file |
107 | |||
108 | // 默认白色按钮样式 | ||
109 | .el-button--default{ | ||
110 | background: #FBFCFD; | ||
111 | border: 1px solid #E4EBF4; | ||
112 | border-radius: 4px; | ||
113 | } | ... | ... |
... | @@ -2,11 +2,11 @@ | ... | @@ -2,11 +2,11 @@ |
2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
3 | <!-- 表单部分 --> | 3 | <!-- 表单部分 --> |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="queryForm" ref="queryForm" label-width="70px"> | 5 | <el-form :model="queryForm" ref="queryForm" label-width="80px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="5"> | 7 | <el-col :span="5"> |
8 | <el-form-item label="业务来源"> | 8 | <el-form-item label="业务来源"> |
9 | <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源"> | 9 | <el-select v-model="queryForm.ywly" class="width100" filterable clearable placeholder="请选择业务来源"> |
10 | <el-option v-for="item in dictData['ywly']" :key="item.value" :label="item.label" :value="item.value"> | 10 | <el-option v-for="item in dictData['ywly']" :key="item.value" :label="item.label" :value="item.value"> |
11 | </el-option> | 11 | </el-option> |
12 | </el-select> | 12 | </el-select> |
... | @@ -14,16 +14,16 @@ | ... | @@ -14,16 +14,16 @@ |
14 | </el-col> | 14 | </el-col> |
15 | <el-col :span="5"> | 15 | <el-col :span="5"> |
16 | <el-form-item label="权利类型"> | 16 | <el-form-item label="权利类型"> |
17 | <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型"> | 17 | <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型"> |
18 | <el-option v-for="item in dictData['A8']" :key="item.value" :label="item.label" :value="item.value"> | 18 | <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
19 | </el-option> | 19 | </el-option> |
20 | </el-select> | 20 | </el-select> |
21 | </el-form-item> | 21 | </el-form-item> |
22 | </el-col> | 22 | </el-col> |
23 | <el-col :span="5"> | 23 | <el-col :span="5"> |
24 | <el-form-item label="登记类型"> | 24 | <el-form-item label="登记类型"> |
25 | <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型"> | 25 | <el-select v-model="queryForm.djlx" filterable class="width100" clearable placeholder="请选择登记类型"> |
26 | <el-option v-for="item in dictData['A21']" :key="item.value" :label="item.label" :value="item.value"> | 26 | <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
27 | </el-option> | 27 | </el-option> |
28 | </el-select> | 28 | </el-select> |
29 | </el-form-item> | 29 | </el-form-item> | ... | ... |
... | @@ -2,62 +2,37 @@ | ... | @@ -2,62 +2,37 @@ |
2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
3 | <!-- 表单部分 --> | 3 | <!-- 表单部分 --> |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="queryForm" ref="queryForm" label-width="70px"> | 5 | <el-form :model="queryForm" ref="queryForm" label-width="80px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="5"> | 7 | <el-col :span="5"> |
8 | <el-form-item label="查询编号"> | 8 | <el-form-item label="查询编号"> |
9 | <el-input | 9 | <el-input placeholder="请输入编号" v-model="queryForm.cxbh" clearable> |
10 | placeholder="请输入编号" | ||
11 | v-model="queryForm.cxbh" | ||
12 | clearable | ||
13 | > | ||
14 | </el-input> | 10 | </el-input> |
15 | </el-form-item> | 11 | </el-form-item> |
16 | </el-col> | 12 | </el-col> |
17 | <el-col :span="5"> | 13 | <el-col :span="5"> |
18 | <el-form-item label="申请人"> | 14 | <el-form-item label="申请人"> |
19 | <el-input | 15 | <el-input placeholder="请输入申请人" v-model="queryForm.sqr" clearable> |
20 | placeholder="请输入申请人" | ||
21 | v-model="queryForm.sqr" | ||
22 | clearable | ||
23 | > | ||
24 | </el-input> | 16 | </el-input> |
25 | </el-form-item> | 17 | </el-form-item> |
26 | </el-col> | 18 | </el-col> |
27 | <el-col :span="5"> | 19 | <el-col :span="5"> |
28 | <el-form-item label="查询用途"> | 20 | <el-form-item label="查询用途"> |
29 | <el-select | 21 | <el-select v-model="queryForm.cxyt" class="width100" filterable clearable placeholder="请选择用途"> |
30 | v-model="queryForm.cxyt" | 22 | <el-option v-for="item in cxytOption" :key="item.value" :label="item.label" :value="item.value"> |
31 | filterable | ||
32 | clearable | ||
33 | placeholder="请选择用途" | ||
34 | > | ||
35 | <el-option | ||
36 | v-for="item in cxytOption" | ||
37 | :key="item.value" | ||
38 | :label="item.label" | ||
39 | :value="item.value" | ||
40 | > | ||
41 | </el-option> | 23 | </el-option> |
42 | </el-select> | 24 | </el-select> |
43 | </el-form-item> | 25 | </el-form-item> |
44 | </el-col> | 26 | </el-col> |
45 | <el-col :span="5"> | 27 | <el-col :span="5"> |
46 | <el-form-item label="业务号"> | 28 | <el-form-item label="业务号"> |
47 | <el-input | 29 | <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width200px"> |
48 | placeholder="请输入业务号" | ||
49 | v-model="queryForm.ywh" | ||
50 | clearable | ||
51 | class="width200px" | ||
52 | > | ||
53 | </el-input> | 30 | </el-input> |
54 | </el-form-item> | 31 | </el-form-item> |
55 | </el-col> | 32 | </el-col> |
56 | <el-col :span="4" class="btnCol"> | 33 | <el-col :span="4" class="btnCol"> |
57 | <el-form-item> | 34 | <el-form-item> |
58 | <el-button type="primary" icon="el-icon-search" @click="fetchData" | 35 | <el-button type="primary" icon="el-icon-search" @click="fetchData">查询</el-button> |
59 | >查询</el-button | ||
60 | > | ||
61 | <el-button @click="moreQueryClick()">高级查询</el-button> | 36 | <el-button @click="moreQueryClick()">高级查询</el-button> |
62 | </el-form-item> | 37 | </el-form-item> |
63 | </el-col> | 38 | </el-col> |
... | @@ -66,16 +41,9 @@ | ... | @@ -66,16 +41,9 @@ |
66 | </div> | 41 | </div> |
67 | <!-- 表格 --> | 42 | <!-- 表格 --> |
68 | <div class="from-clues-content"> | 43 | <div class="from-clues-content"> |
69 | <lb-table | 44 | <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total" |
70 | :page-size="pageData.size" | 45 | @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" |
71 | border | 46 | :data="tableData.data"> |
72 | :current-page.sync="pageData.current" | ||
73 | :total="tableData.total" | ||
74 | @size-change="handleSizeChange" | ||
75 | @p-current-change="handleCurrentChange" | ||
76 | :column="tableData.columns" | ||
77 | :data="tableData.data" | ||
78 | > | ||
79 | </lb-table> | 47 | </lb-table> |
80 | </div> | 48 | </div> |
81 | </div> | 49 | </div> |
... | @@ -88,10 +56,10 @@ export default { | ... | @@ -88,10 +56,10 @@ export default { |
88 | name: "jtfc", | 56 | name: "jtfc", |
89 | components: {}, | 57 | components: {}, |
90 | mixins: [table], | 58 | mixins: [table], |
91 | mounted() { | 59 | mounted () { |
92 | sendThis(this); | 60 | sendThis(this); |
93 | }, | 61 | }, |
94 | data() { | 62 | data () { |
95 | return { | 63 | return { |
96 | sqrOption: [], | 64 | sqrOption: [], |
97 | cxytOption: [], | 65 | cxytOption: [], |
... | @@ -121,14 +89,14 @@ export default { | ... | @@ -121,14 +89,14 @@ export default { |
121 | }, | 89 | }, |
122 | methods: { | 90 | methods: { |
123 | // 初始化数据 | 91 | // 初始化数据 |
124 | fetchData() { | 92 | fetchData () { |
125 | getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { | 93 | getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { |
126 | let { records, total } = res.result; | 94 | let { records, total } = res.result; |
127 | // this.tableData.data = records | 95 | // this.tableData.data = records |
128 | this.tableData.total = total; | 96 | this.tableData.total = total; |
129 | }); | 97 | }); |
130 | }, | 98 | }, |
131 | handleSort(name, sort) { | 99 | handleSort (name, sort) { |
132 | console.log(name, sort); | 100 | console.log(name, sort); |
133 | }, | 101 | }, |
134 | }, | 102 | }, | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
3 | <!-- 表单部分 --> | 3 | <!-- 表单部分 --> |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="queryForm" ref="queryForm" label-width="70px"> | 5 | <el-form :model="queryForm" ref="queryForm" label-width="80px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="5"> | 7 | <el-col :span="5"> |
8 | <el-form-item label="查询编号"> | 8 | <el-form-item label="查询编号"> |
... | @@ -18,7 +18,7 @@ | ... | @@ -18,7 +18,7 @@ |
18 | </el-col> | 18 | </el-col> |
19 | <el-col :span="5"> | 19 | <el-col :span="5"> |
20 | <el-form-item label="查询用途"> | 20 | <el-form-item label="查询用途"> |
21 | <el-select v-model="queryForm.cxyt" filterable clearable placeholder="请选择用途"> | 21 | <el-select v-model="queryForm.cxyt" class="width100" filterable clearable placeholder="请选择用途"> |
22 | <el-option v-for="item in cxytOption" :key="item.value" :label="item.label" :value="item.value"> | 22 | <el-option v-for="item in cxytOption" :key="item.value" :label="item.label" :value="item.value"> |
23 | </el-option> | 23 | </el-option> |
24 | </el-select> | 24 | </el-select> | ... | ... |
... | @@ -2,11 +2,11 @@ | ... | @@ -2,11 +2,11 @@ |
2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
3 | <!-- 表单部分 --> | 3 | <!-- 表单部分 --> |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="queryForm" ref="queryForm" label-width="70px"> | 5 | <el-form :model="queryForm" ref="queryForm" label-width="80px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="5"> | 7 | <el-col :span="5"> |
8 | <el-form-item label="业务来源"> | 8 | <el-form-item label="业务来源"> |
9 | <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源"> | 9 | <el-select v-model="queryForm.ywly" class="width100" filterable clearable placeholder="请选择业务来源"> |
10 | <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode"> | 10 | <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
11 | </el-option> | 11 | </el-option> |
12 | </el-select> | 12 | </el-select> |
... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
14 | </el-col> | 14 | </el-col> |
15 | <el-col :span="5"> | 15 | <el-col :span="5"> |
16 | <el-form-item label="权利类型"> | 16 | <el-form-item label="权利类型"> |
17 | <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型"> | 17 | <el-select v-model="queryForm.qllx" class="width100" filterable clearable placeholder="请选择权利类型"> |
18 | <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> | 18 | <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
19 | </el-option> | 19 | </el-option> |
20 | </el-select> | 20 | </el-select> |
... | @@ -22,7 +22,7 @@ | ... | @@ -22,7 +22,7 @@ |
22 | </el-col> | 22 | </el-col> |
23 | <el-col :span="5"> | 23 | <el-col :span="5"> |
24 | <el-form-item label="登记类型"> | 24 | <el-form-item label="登记类型"> |
25 | <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型"> | 25 | <el-select v-model="queryForm.djlx" class="width100" filterable clearable placeholder="请选择登记类型"> |
26 | <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> | 26 | <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
27 | </el-option> | 27 | </el-option> |
28 | </el-select> | 28 | </el-select> |
... | @@ -150,12 +150,11 @@ export default { | ... | @@ -150,12 +150,11 @@ export default { |
150 | }); | 150 | }); |
151 | }, | 151 | }, |
152 | ywhClick (item) { | 152 | ywhClick (item) { |
153 | //const { href } = this.$router.resolve('/fqsq?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1'); | ||
154 | const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1'); | 153 | const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1'); |
155 | window.open(href, '_blank'); | 154 | window.open(href, '_blank'); |
156 | }, | 155 | } |
157 | }, | 156 | } |
158 | }; | 157 | } |
159 | </script> | 158 | </script> |
160 | <style scoped lang="scss"> | 159 | <style scoped lang="scss"> |
161 | @import "~@/styles/public.scss"; | 160 | @import "~@/styles/public.scss"; | ... | ... |
... | @@ -99,20 +99,9 @@ class data extends filter { | ... | @@ -99,20 +99,9 @@ class data extends filter { |
99 | </div> | 99 | </div> |
100 | ) | 100 | ) |
101 | } | 101 | } |
102 | }, | ||
103 | { | ||
104 | label: '操作', | ||
105 | width: '80', | ||
106 | align: 'center', | ||
107 | fixed: 'right', | ||
108 | render: (h, scope) => { | ||
109 | return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>删除</el-button> | ||
110 | } | ||
111 | } | 102 | } |
112 | ] | 103 | ] |
113 | } | 104 | } |
114 | |||
115 | |||
116 | } | 105 | } |
117 | let datas = new data() | 106 | let datas = new data() |
118 | export { | 107 | export { | ... | ... |
... | @@ -63,7 +63,7 @@ | ... | @@ -63,7 +63,7 @@ |
63 | </div> | 63 | </div> |
64 | </template> | 64 | </template> |
65 | <script> | 65 | <script> |
66 | import zsylDialog from "./zsyl"; | 66 | import zsylDialog from "./zsyl.vue"; |
67 | import { getBdcqzList, invalidCertificate } from "@/api/fqsq.js"; | 67 | import { getBdcqzList, invalidCertificate } from "@/api/fqsq.js"; |
68 | 68 | ||
69 | export default { | 69 | export default { | ... | ... |
... | @@ -56,6 +56,9 @@ | ... | @@ -56,6 +56,9 @@ |
56 | </div> | 56 | </div> |
57 | </div> | 57 | </div> |
58 | </div> | 58 | </div> |
59 | <dialogBox title="流程图" width="70%" isMain v-model="myValue" :isFullscreen="false" :isButton="false"> | ||
60 | <img :src="imgSrc" style="margin: 20px 0" /> | ||
61 | </dialogBox> | ||
59 | </div> | 62 | </div> |
60 | </template> | 63 | </template> |
61 | 64 | ||
... | @@ -72,10 +75,14 @@ import { | ... | @@ -72,10 +75,14 @@ import { |
72 | getNextLinkInfo, | 75 | getNextLinkInfo, |
73 | completeTask, | 76 | completeTask, |
74 | } from "@/api/fqsq.js"; | 77 | } from "@/api/fqsq.js"; |
78 | import { getWorkFlowImage } from "@/api/jsydsyqFlow.js" | ||
75 | import { getForm } from "./flowform.js"; | 79 | import { getForm } from "./flowform.js"; |
76 | export default { | 80 | export default { |
77 | data () { | 81 | data () { |
78 | return { | 82 | return { |
83 | // 流程图 | ||
84 | imgSrc: '', | ||
85 | myValue: false, | ||
79 | // 折叠 | 86 | // 折叠 |
80 | isShowdrawer: true, | 87 | isShowdrawer: true, |
81 | // 默认选中 | 88 | // 默认选中 |
... | @@ -144,6 +151,12 @@ export default { | ... | @@ -144,6 +151,12 @@ export default { |
144 | operation (index, item) { | 151 | operation (index, item) { |
145 | let that = this; | 152 | let that = this; |
146 | switch (item.value) { | 153 | switch (item.value) { |
154 | case "B1": | ||
155 | getWorkFlowImage(this.bsmSlsq).then(res => { | ||
156 | this.imgSrc = URL.createObjectURL(res) | ||
157 | this.myValue = true | ||
158 | }) | ||
159 | break; | ||
147 | case "zsyl": | 160 | case "zsyl": |
148 | this.zsylFlag = true; | 161 | this.zsylFlag = true; |
149 | break; | 162 | break; |
... | @@ -173,7 +186,6 @@ export default { | ... | @@ -173,7 +186,6 @@ export default { |
173 | } | 186 | } |
174 | }); | 187 | }); |
175 | // this.$alert(res.result); | 188 | // this.$alert(res.result); |
176 | |||
177 | break; | 189 | break; |
178 | case "tc": | 190 | case "tc": |
179 | window.close(); | 191 | window.close(); |
... | @@ -239,8 +251,6 @@ export default { | ... | @@ -239,8 +251,6 @@ export default { |
239 | h("i", { style: "color: teal" }, obj.usernames.join(",")), | 251 | h("i", { style: "color: teal" }, obj.usernames.join(",")), |
240 | ]), | 252 | ]), |
241 | showCancelButton: true, | 253 | showCancelButton: true, |
242 | confirmButtonText: "确定", | ||
243 | cancelButtonText: "取消", | ||
244 | beforeClose: (action, instance, done) => { | 254 | beforeClose: (action, instance, done) => { |
245 | if (action === "confirm") { | 255 | if (action === "confirm") { |
246 | instance.confirmButtonLoading = true; | 256 | instance.confirmButtonLoading = true; |
... | @@ -267,10 +277,10 @@ export default { | ... | @@ -267,10 +277,10 @@ export default { |
267 | }).then((action) => { | 277 | }).then((action) => { |
268 | this.$message({ | 278 | this.$message({ |
269 | type: "info", | 279 | type: "info", |
270 | message: "action: " + action, | 280 | message: "action: " + action |
271 | }); | 281 | }) |
272 | }); | 282 | }) |
273 | }, | 283 | } |
274 | }, | 284 | } |
275 | }; | 285 | } |
276 | </script> | 286 | </script> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -2,11 +2,11 @@ | ... | @@ -2,11 +2,11 @@ |
2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
3 | <!-- 表单部分 --> | 3 | <!-- 表单部分 --> |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="queryForm" ref="queryForm" label-width="70px"> | 5 | <el-form :model="queryForm" ref="queryForm" label-width="80px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="5"> | 7 | <el-col :span="5"> |
8 | <el-form-item label="业务来源"> | 8 | <el-form-item label="业务来源"> |
9 | <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源"> | 9 | <el-select v-model="queryForm.ywly" class="width100" filterable clearable placeholder="请选择业务来源"> |
10 | <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode"> | 10 | <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
11 | </el-option> | 11 | </el-option> |
12 | </el-select> | 12 | </el-select> |
... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
14 | </el-col> | 14 | </el-col> |
15 | <el-col :span="5"> | 15 | <el-col :span="5"> |
16 | <el-form-item label="权利类型"> | 16 | <el-form-item label="权利类型"> |
17 | <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型"> | 17 | <el-select v-model="queryForm.qllx" class="width100" filterable clearable placeholder="请选择权利类型"> |
18 | <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> | 18 | <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
19 | </el-option> | 19 | </el-option> |
20 | </el-select> | 20 | </el-select> |
... | @@ -22,7 +22,7 @@ | ... | @@ -22,7 +22,7 @@ |
22 | </el-col> | 22 | </el-col> |
23 | <el-col :span="5"> | 23 | <el-col :span="5"> |
24 | <el-form-item label="登记类型"> | 24 | <el-form-item label="登记类型"> |
25 | <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型"> | 25 | <el-select v-model="queryForm.djlx" class="width100" filterable clearable placeholder="请选择登记类型"> |
26 | <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> | 26 | <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> |
27 | </el-option> | 27 | </el-option> |
28 | </el-select> | 28 | </el-select> |
... | @@ -57,7 +57,7 @@ | ... | @@ -57,7 +57,7 @@ |
57 | import { mapGetters } from 'vuex' | 57 | import { mapGetters } from 'vuex' |
58 | import table from "@/utils/mixin/table"; | 58 | import table from "@/utils/mixin/table"; |
59 | import { datas, sendThis } from "./ybxdata"; | 59 | import { datas, sendThis } from "./ybxdata"; |
60 | import { searchTaskDone} from "@/api/ywbl.js" | 60 | import { searchTaskDone } from "@/api/ywbl.js" |
61 | export default { | 61 | export default { |
62 | name: "ybx", | 62 | name: "ybx", |
63 | components: {}, | 63 | components: {}, |
... | @@ -108,11 +108,11 @@ export default { | ... | @@ -108,11 +108,11 @@ export default { |
108 | handleSort (name, sort) { | 108 | handleSort (name, sort) { |
109 | console.log(name, sort); | 109 | console.log(name, sort); |
110 | }, | 110 | }, |
111 | openDialog (item) { | 111 | ywhClick (item) { |
112 | const { href } = this.$router.resolve('/fqsq?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=2') | 112 | const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1'); |
113 | window.open(href, '_blank'); | 113 | window.open(href, '_blank'); |
114 | }, | 114 | } |
115 | }, | 115 | } |
116 | }; | 116 | }; |
117 | </script> | 117 | </script> |
118 | <style scoped lang="scss"> | 118 | <style scoped lang="scss"> | ... | ... |
... | @@ -35,11 +35,7 @@ class data extends filter { | ... | @@ -35,11 +35,7 @@ class data extends filter { |
35 | { | 35 | { |
36 | label: "业务号", | 36 | label: "业务号", |
37 | render: (h, scope) => { | 37 | render: (h, scope) => { |
38 | return ( | 38 | return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button> |
39 | <div> | ||
40 | <el-link type="primary" onClick={() => { vm.openDialog(scope.row) }}>{scope.row.ywh}</el-link> | ||
41 | </div> | ||
42 | ) | ||
43 | } | 39 | } |
44 | }, | 40 | }, |
45 | { | 41 | { |
... | @@ -79,15 +75,6 @@ class data extends filter { | ... | @@ -79,15 +75,6 @@ class data extends filter { |
79 | </div> | 75 | </div> |
80 | ) | 76 | ) |
81 | } | 77 | } |
82 | }, | ||
83 | { | ||
84 | label: '操作', | ||
85 | width: '80', | ||
86 | align: 'center', | ||
87 | fixed: 'right', | ||
88 | render: (h, scope) => { | ||
89 | return <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>编辑</el-button> | ||
90 | } | ||
91 | } | 78 | } |
92 | ] | 79 | ] |
93 | } | 80 | } | ... | ... |
1 | <template> | 1 | <template> |
2 | <dialogBox title="证书使用情况" @closeDialog="closeDialog" v-model="myValue" :isButton="false"> | 2 | <dialogBox title="证书使用情况" @closeDialog="closeDialog" @submitForm="submitForm" v-model="myValue" :isButton="false"> |
3 | <el-form :model="ruleForm" ref="ruleForm" label-width="100px"> | 3 | <el-form :model="ruleForm" ref="ruleForm" label-width="100px"> |
4 | <div class="title-name"> | 4 | <div class="title-name"> |
5 | 入库情况 | 5 | 入库情况 |
... | @@ -113,6 +113,7 @@ | ... | @@ -113,6 +113,7 @@ |
113 | </template> | 113 | </template> |
114 | 114 | ||
115 | <script> | 115 | <script> |
116 | import { getZssyqkInfo} from "@/api/zsgl.js" | ||
116 | export default { | 117 | export default { |
117 | props: { | 118 | props: { |
118 | value: { type: Boolean, default: false }, | 119 | value: { type: Boolean, default: false }, |
... | @@ -120,23 +121,7 @@ export default { | ... | @@ -120,23 +121,7 @@ export default { |
120 | data () { | 121 | data () { |
121 | return { | 122 | return { |
122 | myValue: this.value, | 123 | myValue: this.value, |
123 | ruleForm: { | 124 | ruleForm: {} |
124 | rkbh: '', | ||
125 | rksj: '', | ||
126 | rkry: '', | ||
127 | djjg: '', | ||
128 | bz: '', | ||
129 | ffbh: '', | ||
130 | lqsj: '', | ||
131 | // 证书信息 | ||
132 | bdcqzh: '', | ||
133 | ywh: '', | ||
134 | bdcdyh: '', | ||
135 | zslx: '', | ||
136 | ysxlh: '', | ||
137 | sfzf: '', | ||
138 | zfyy: '' | ||
139 | } | ||
140 | } | 125 | } |
141 | }, | 126 | }, |
142 | watch: { | 127 | watch: { |
... | @@ -145,11 +130,21 @@ export default { | ... | @@ -145,11 +130,21 @@ export default { |
145 | }, | 130 | }, |
146 | }, | 131 | }, |
147 | methods: { | 132 | methods: { |
133 | getDetail (bsmZswj) { | ||
134 | getZssyqkInfo({"bsmZswj":bsmZswj}).then(res => { | ||
135 | if(res.code == 200){ | ||
136 | this.ruleForm = res.result | ||
137 | } | ||
138 | }) | ||
139 | }, | ||
140 | submitForm () { | ||
141 | }, | ||
148 | closeDialog () { | 142 | closeDialog () { |
149 | this.$emit('input', false) | 143 | this.$emit('input', false) |
144 | this.$refs['ruleForm'].resetFields() | ||
150 | } | 145 | } |
151 | }, | 146 | } |
152 | }; | 147 | } |
153 | </script> | 148 | </script> |
154 | <style scoped lang="scss"> | 149 | <style scoped lang="scss"> |
155 | @import "~@/styles/mixin.scss"; | 150 | @import "~@/styles/mixin.scss"; | ... | ... |
1 | <template> | 1 | <template> |
2 | <dialogBox title="证书分发" @submitForm="submitForm" saveButton="保存" width="45%" @closeDialog="closeDialog" v-model="value"> | 2 | <dialogBox title="证书分发" @submitForm="submitForm" saveButton="保存" width="50%" :isFullscreen="false" |
3 | @closeDialog="closeDialog" v-model="myValue"> | ||
3 | <div> | 4 | <div> |
4 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> | 5 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> |
5 | <el-row> | 6 | <el-row> |
... | @@ -10,31 +11,35 @@ | ... | @@ -10,31 +11,35 @@ |
10 | </el-col> | 11 | </el-col> |
11 | <el-col :span="12"> | 12 | <el-col :span="12"> |
12 | <el-form-item label="领取时间:" prop="rksj"> | 13 | <el-form-item label="领取时间:" prop="rksj"> |
13 | <el-date-picker v-model="ruleForm.rksj" type="datetime" placeholder="选择日期时间"></el-date-picker> | 14 | <el-date-picker v-model="ruleForm.rksj" class="width100" type="datetime" placeholder="选择日期时间"> |
15 | </el-date-picker> | ||
14 | </el-form-item> | 16 | </el-form-item> |
15 | </el-col> | 17 | </el-col> |
16 | </el-row> | 18 | </el-row> |
17 | <el-row> | 19 | <el-row> |
18 | <el-col :span="12"> | 20 | <el-col :span="12"> |
19 | <el-form-item label="发放人员:" prop="rkry"> | 21 | <el-form-item label="入库人员:"> |
20 | <el-input v-model="ruleForm.rkry" :disabled="true"></el-input> | 22 | <el-input v-model="ruleForm.rkry" :disabled="true"></el-input> |
21 | </el-form-item> | 23 | </el-form-item> |
22 | </el-col> | 24 | </el-col> |
23 | <el-col :span="12"> | 25 | <el-col :span="12"> |
24 | <el-form-item label="领取人:" prop="receiver"> | 26 | <el-form-item label="领取人:" prop="receiver"> |
25 | <el-select v-model="ruleForm.receiver" placeholder="请选择"> | 27 | <el-select v-model="ruleForm.receiver" class="width100" placeholder="请选择"> |
26 | <el-option v-for="item in usernames" :key="item" :label="item" :value="item"></el-option> | 28 | <el-option v-for="item in usernames" :key="item" :label="item" :value="item"></el-option> |
27 | </el-select> | 29 | </el-select> |
28 | </el-form-item> | 30 | </el-form-item> |
29 | </el-col> | 31 | </el-col> |
30 | </el-row> | 32 | </el-row> |
31 | <div> | 33 | <div> |
32 | <el-table :data="tableForm" border :header-cell-style="{'text-align':'center',background: 'rgb(236, 245, 255)'}" :cell-style="{'text-align':'center'}"> | 34 | <el-table :data="tableForm" border |
35 | :header-cell-style="{'text-align':'center',background: 'rgb(236, 245, 255)'}" | ||
36 | :cell-style="{'text-align':'center'}"> | ||
33 | <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column> | 37 | <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column> |
34 | <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200"></el-table-column> | 38 | <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200"></el-table-column> |
35 | <el-table-column prop="bs" label="本数"> | 39 | <el-table-column prop="bs" label="本数"> |
36 | <template slot-scope="scope"> | 40 | <template slot-scope="scope"> |
37 | <el-input v-model="scope.row.bs" @blur="ysxlhDeal(scope.row)" oninput="value=value.replace(/[^\d.]/g,'')" ></el-input> | 41 | <el-input v-model="scope.row.bs" @blur="ysxlhDeal(scope.row)" |
42 | oninput="value=value.replace(/[^\d.]/g,'')" maxlength="6"></el-input> | ||
38 | </template> | 43 | </template> |
39 | </el-table-column> | 44 | </el-table-column> |
40 | <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200"> | 45 | <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200"> |
... | @@ -54,7 +59,7 @@ | ... | @@ -54,7 +59,7 @@ |
54 | </template> | 59 | </template> |
55 | 60 | ||
56 | <script> | 61 | <script> |
57 | import { getZsStartNo,getSysSerialSingle, getZsEndNo,zsff} from "@/api/zsgl.js" | 62 | import { getZsStartNo, getSysSerialSingle, getZsEndNo, zsff } from "@/api/zsgl.js" |
58 | export default { | 63 | export default { |
59 | components: { | 64 | components: { |
60 | }, | 65 | }, |
... | @@ -65,6 +70,7 @@ export default { | ... | @@ -65,6 +70,7 @@ export default { |
65 | }, | 70 | }, |
66 | data () { | 71 | data () { |
67 | return { | 72 | return { |
73 | myValue: this.value, | ||
68 | //表单提交数据 | 74 | //表单提交数据 |
69 | ruleForm: { | 75 | ruleForm: { |
70 | batchno: '', | 76 | batchno: '', |
... | @@ -104,7 +110,7 @@ export default { | ... | @@ -104,7 +110,7 @@ export default { |
104 | digit: '5' | 110 | digit: '5' |
105 | }, | 111 | }, |
106 | //用户列表 | 112 | //用户列表 |
107 | usernames: ['张三','李四'], | 113 | usernames: ['张三', '李四'], |
108 | rules: { | 114 | rules: { |
109 | batchNo: [ | 115 | batchNo: [ |
110 | { required: true, message: '入库编号不能为空', trigger: 'blur' } | 116 | { required: true, message: '入库编号不能为空', trigger: 'blur' } |
... | @@ -112,79 +118,81 @@ export default { | ... | @@ -112,79 +118,81 @@ export default { |
112 | lqr: [ | 118 | lqr: [ |
113 | { required: true, message: '请选择领取人', trigger: 'change' } | 119 | { required: true, message: '请选择领取人', trigger: 'change' } |
114 | ], | 120 | ], |
115 | rkry: [ | ||
116 | { required: true, message: '入库人员不能为空', trigger: 'blur' } | ||
117 | ], | ||
118 | rksj: [ | 121 | rksj: [ |
119 | { required: true, message: '请选择入库时间', trigger: 'change' } | 122 | { required: true, message: '请选择入库时间', trigger: 'change' } |
120 | ], | 123 | ], |
121 | }, | 124 | }, |
122 | } | 125 | } |
123 | }, | 126 | }, |
127 | watch: { | ||
128 | value (val) { | ||
129 | this.myValue = val | ||
130 | } | ||
131 | }, | ||
124 | methods: { | 132 | methods: { |
125 | //表单提交 | 133 | //表单提交 |
126 | submitForm () { | 134 | submitForm () { |
127 | zsff(this.ruleForm).then(res => { | 135 | zsff(this.ruleForm).then(res => { |
128 | if(res.code == 200){ | 136 | if (res.code == 200) { |
129 | this.$message.success('保存成功') | 137 | this.$message.success('保存成功') |
130 | this.$emit("input", false); | 138 | this.$emit("input", false); |
131 | this.ruleForm = {}; | 139 | this.$refs['ruleForm'].resetFields(); |
132 | this.resetTableFields(); | 140 | this.resetTableFields(); |
133 | this.$parent.fetchData(); | 141 | this.$parent.fetchData(); |
134 | }else{ | 142 | } else { |
135 | this.$message.error(res.message) | 143 | this.$message.error(res.message) |
136 | } | 144 | } |
137 | }) | 145 | }) |
138 | }, | 146 | }, |
139 | //序列号获取 | 147 | //序列号获取 |
140 | ywhSerial(){ | 148 | ywhSerial () { |
141 | getSysSerialSingle(this.ywhQueryForm).then(res => { | 149 | getSysSerialSingle(this.ywhQueryForm).then(res => { |
142 | if(res.code == 200){ | 150 | if (res.code == 200) { |
143 | this.ruleForm.batchno = res.message; | 151 | this.ruleForm.batchno = res.message; |
144 | } | 152 | } |
145 | }) | 153 | }) |
146 | }, | 154 | }, |
147 | initStartNo(){ | 155 | initStartNo () { |
148 | getZsStartNo().then(res => { | 156 | getZsStartNo().then(res => { |
149 | if(res.code == 200){ | 157 | if (res.code == 200) { |
150 | this.tableForm[0].ksysxlh = res.result.zsstarno | 158 | this.tableForm[0].ksysxlh = res.result.zsstarno |
151 | this.tableForm[1].ksysxlh = res.result.zmstarno | 159 | this.tableForm[1].ksysxlh = res.result.zmstarno |
152 | } | 160 | } |
153 | }) | 161 | }) |
154 | }, | 162 | }, |
155 | //印刷序列号处理 | 163 | //印刷序列号处理 |
156 | ysxlhDeal(item){ | 164 | ysxlhDeal (item) { |
157 | if(item.bs){ | 165 | if (item.bs) { |
158 | //存在本数 | 166 | //存在本数 |
159 | getZsEndNo({"bookNumber": item.bs,"zslx": item.zslx}).then(res => { | 167 | getZsEndNo({ "bookNumber": item.bs, "zslx": item.zslx }).then(res => { |
160 | if(res.code == 200){ | 168 | if (res.code == 200) { |
161 | item.jsysxlh = res.result.endno | 169 | item.jsysxlh = res.result.endno |
162 | item.bs = res.result.bookNumber | 170 | item.bs = res.result.bookNumber |
163 | this.updateRuleForm(res.result.endno,res.result.bookNumber,item); | 171 | this.updateRuleForm(res.result.endno, res.result.bookNumber, item); |
164 | }else{ | 172 | } else { |
165 | this.$message.error(res.message) | 173 | this.$message.error(res.message) |
166 | } | 174 | } |
167 | }) | 175 | }) |
168 | }else{ | 176 | } else { |
169 | //不存在本数 | 177 | //不存在本数 |
170 | item.bs = 0; | 178 | item.bs = 0; |
171 | item.jsysxlh = ''; | 179 | item.jsysxlh = ''; |
172 | this.updateRuleForm('',0,item); | 180 | this.updateRuleForm('', 0, item); |
173 | } | 181 | } |
174 | }, | 182 | }, |
175 | //更新表单数据 | 183 | //更新表单数据 |
176 | updateRuleForm(endno,bookNumber,item){ | 184 | updateRuleForm (endno, bookNumber, item) { |
177 | if(item.zslx == 'zs'){ | 185 | if (item.zslx == 'zs') { |
178 | this.ruleForm.zsstarno = item.ksysxlh; | 186 | this.ruleForm.zsstarno = item.ksysxlh; |
179 | this.ruleForm.zsendno = endno; | 187 | this.ruleForm.zsendno = endno; |
180 | this.ruleForm.zsnum = bookNumber; | 188 | this.ruleForm.zsnum = bookNumber; |
181 | }else if(item.zslx == 'zm'){ | 189 | } else if (item.zslx == 'zm') { |
182 | this.ruleForm.zmstarno = item.ksysxlh; | 190 | this.ruleForm.zmstarno = item.ksysxlh; |
183 | this.ruleForm.zmendno = endno; | 191 | this.ruleForm.zmendno = endno; |
184 | this.ruleForm.zmnum = bookNumber; | 192 | this.ruleForm.zmnum = bookNumber; |
185 | } | 193 | } |
186 | }, | 194 | }, |
187 | resetTableFields() { | 195 | resetTableFields () { |
188 | this.tableForm = [ | 196 | this.tableForm = [ |
189 | { | 197 | { |
190 | name: '不动产权证书', | 198 | name: '不动产权证书', |
... | @@ -204,16 +212,19 @@ export default { | ... | @@ -204,16 +212,19 @@ export default { |
204 | }, | 212 | }, |
205 | closeDialog () { | 213 | closeDialog () { |
206 | this.$emit("input", false); | 214 | this.$emit("input", false); |
207 | }, | 215 | this.$refs['ruleForm'].resetFields(); |
216 | } | ||
208 | } | 217 | } |
209 | } | 218 | } |
210 | </script> | 219 | </script> |
211 | <style scoped lang="scss"> | 220 | <style scoped lang="scss"> |
212 | @import "~@/styles/mixin.scss"; | 221 | @import "~@/styles/mixin.scss"; |
213 | .font-red{ | 222 | |
223 | .font-red { | ||
214 | color: red | 224 | color: red |
215 | } | 225 | } |
216 | .middle-margin-bottom{ | 226 | |
217 | margin-top:20px | 227 | .middle-margin-bottom { |
228 | margin-top: 20px | ||
218 | } | 229 | } |
219 | </style> | 230 | </style> | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
3 | <!-- 表单部分 --> | 3 | <!-- 表单部分 --> |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="ruleForm" label-width="70px"> | 5 | <el-form :model="ruleForm" label-width="80px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="5"> | 7 | <el-col :span="5"> |
8 | <el-form-item label="分发编号"> | 8 | <el-form-item label="分发编号"> |
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
12 | <el-col :span="8"> | 12 | <el-col :span="8"> |
13 | <el-form-item label="领取时间"> | 13 | <el-form-item label="领取时间"> |
14 | <el-date-picker v-model="ruleForm.ffsj" type="daterange" range-separator="至" start-placeholder="开始日期" | 14 | <el-date-picker v-model="ruleForm.ffsj" type="daterange" range-separator="至" start-placeholder="开始日期" |
15 | end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable > | 15 | end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable> |
16 | </el-date-picker> | 16 | </el-date-picker> |
17 | </el-form-item> | 17 | </el-form-item> |
18 | </el-col> | 18 | </el-col> |
... | @@ -32,23 +32,26 @@ | ... | @@ -32,23 +32,26 @@ |
32 | :data="tableData.data"> | 32 | :data="tableData.data"> |
33 | </lb-table> | 33 | </lb-table> |
34 | </div> | 34 | </div> |
35 | <addDialog ref="addDialog" v-model="isDialog"/> | 35 | <addDialog ref="addDialog" v-model="isDialog" /> |
36 | <viewDialog v-model="viewDialog" /> | ||
36 | </div> | 37 | </div> |
37 | </template> | 38 | </template> |
38 | <script> | 39 | <script> |
39 | import table from "@/utils/mixin/table"; | 40 | import table from "@/utils/mixin/table"; |
40 | import { datas, sendThis } from "./zsffdata"; | 41 | import { datas, sendThis } from "./zsffdata"; |
41 | import { getZsglffList,removeZsgl,confirmZsff} from "@/api/zsgl.js" | 42 | import viewDialog from "../components/viewDialog.vue"; |
43 | import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js" | ||
42 | import addDialog from "./components/addDialog.vue" | 44 | import addDialog from "./components/addDialog.vue" |
43 | export default { | 45 | export default { |
44 | name: "zsff", | 46 | name: "zsff", |
45 | components: {addDialog}, | 47 | components: { addDialog, viewDialog }, |
46 | mixins: [table], | 48 | mixins: [table], |
47 | mounted () { | 49 | mounted () { |
48 | sendThis(this); | 50 | sendThis(this); |
49 | }, | 51 | }, |
50 | data () { | 52 | data () { |
51 | return { | 53 | return { |
54 | viewDialog: false, | ||
52 | isDialog: false, | 55 | isDialog: false, |
53 | value: '', | 56 | value: '', |
54 | ruleForm: { | 57 | ruleForm: { |
... | @@ -83,7 +86,7 @@ export default { | ... | @@ -83,7 +86,7 @@ export default { |
83 | }, | 86 | }, |
84 | openDialog () { | 87 | openDialog () { |
85 | this.isDialog = true; | 88 | this.isDialog = true; |
86 | this.$nextTick(()=> { | 89 | this.$nextTick(() => { |
87 | this.$refs.addDialog.ywhSerial(); | 90 | this.$refs.addDialog.ywhSerial(); |
88 | this.$refs.addDialog.initStartNo(); | 91 | this.$refs.addDialog.initStartNo(); |
89 | }) | 92 | }) |
... | @@ -92,7 +95,7 @@ export default { | ... | @@ -92,7 +95,7 @@ export default { |
92 | this.fetchData() | 95 | this.fetchData() |
93 | }, | 96 | }, |
94 | //修改筛选时间 | 97 | //修改筛选时间 |
95 | timeChange() { | 98 | timeChange () { |
96 | if (this.ruleForm.ffsj != null) { | 99 | if (this.ruleForm.ffsj != null) { |
97 | this.approveForm.ffkssj = this.ruleForm.ffsj[0]; | 100 | this.approveForm.ffkssj = this.ruleForm.ffsj[0]; |
98 | this.approveForm.ffjssj = this.ruleForm.ffsj[1]; | 101 | this.approveForm.ffjssj = this.ruleForm.ffsj[1]; |
... | @@ -102,17 +105,17 @@ export default { | ... | @@ -102,17 +105,17 @@ export default { |
102 | } | 105 | } |
103 | }, | 106 | }, |
104 | //确定证书分发 | 107 | //确定证书分发 |
105 | confrimVerify(item){ | 108 | confrimVerify (item) { |
106 | this.$confirm('是否确定分发', '提示', { | 109 | this.$confirm('是否确定分发', '提示', { |
107 | confirmButtonText: '确定', | 110 | confirmButtonText: '确定', |
108 | cancelButtonText: '取消', | 111 | cancelButtonText: '取消', |
109 | type: 'warning' | 112 | type: 'warning' |
110 | }).then(() => { | 113 | }).then(() => { |
111 | confirmZsff({"bsmBatch":item.bsmBatch}).then(res => { | 114 | confirmZsff({ "bsmBatch": item.bsmBatch }).then(res => { |
112 | if(res.code == 200){ | 115 | if (res.code == 200) { |
113 | this.$message.success("分发成功") | 116 | this.$message.success("分发成功") |
114 | this.fetchData(); | 117 | this.fetchData(); |
115 | }else{ | 118 | } else { |
116 | this.$message.error(res.message) | 119 | this.$message.error(res.message) |
117 | } | 120 | } |
118 | }) | 121 | }) |
... | @@ -124,17 +127,18 @@ export default { | ... | @@ -124,17 +127,18 @@ export default { |
124 | }); | 127 | }); |
125 | }, | 128 | }, |
126 | //删除证书分发数据 | 129 | //删除证书分发数据 |
127 | delZsff(item){ | 130 | delZsff (item) { |
128 | this.$confirm('确定要删除吗, 是否继续?', '提示', { | 131 | this.$confirm('确定要删除吗, 是否继续?', '提示', { |
129 | confirmButtonText: '确定', | 132 | confirmButtonText: '确定', |
130 | cancelButtonText: '取消', | 133 | cancelButtonText: '取消', |
131 | type: 'warning' | 134 | type: 'warning' |
132 | }).then(() => { | 135 | }).then(() => { |
133 | removeZsgl({"bsmBatch":item.bsmBatch}).then(res => { | 136 | removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => { |
134 | if(res.code == 200){ | 137 | if (res.code == 200) { |
135 | this.$message.success("删除成功") | 138 | this.$message.success("删除成功") |
136 | this.fetchData(); | 139 | this.handleDel() |
137 | }else{ | 140 | this.fetchData() |
141 | } else { | ||
138 | this.$message.error(res.message) | 142 | this.$message.error(res.message) |
139 | } | 143 | } |
140 | }) | 144 | }) | ... | ... |
... | @@ -13,7 +13,14 @@ class data extends filter { | ... | @@ -13,7 +13,14 @@ class data extends filter { |
13 | { | 13 | { |
14 | label: '序号', | 14 | label: '序号', |
15 | type: 'index', | 15 | type: 'index', |
16 | width: '50' | 16 | width: '50', |
17 | render: (h, scope) => { | ||
18 | return ( | ||
19 | <div> | ||
20 | {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1} | ||
21 | </div> | ||
22 | ) | ||
23 | } | ||
17 | }, | 24 | }, |
18 | { | 25 | { |
19 | prop: "batchno", | 26 | prop: "batchno", |
... | @@ -63,15 +70,15 @@ class data extends filter { | ... | @@ -63,15 +70,15 @@ class data extends filter { |
63 | <el-button type="text" icon="el-icon-delete" onClick={() => { vm.delZsff(scope.row) }}>删除</el-button> | 70 | <el-button type="text" icon="el-icon-delete" onClick={() => { vm.delZsff(scope.row) }}>删除</el-button> |
64 | </div> | 71 | </div> |
65 | case '1': | 72 | case '1': |
66 | return <el-button type="text" onClick={() => { }}>查看</el-button> | 73 | return <el-button type="text" onClick={() => { vm.viewDialog = true }}>查看</el-button> |
67 | } | 74 | } |
68 | } | 75 | } |
69 | } | 76 | } |
70 | ] | 77 | ] |
71 | } | 78 | } |
72 | 79 | ||
73 | ywlys(){ | 80 | ywlys () { |
74 | return[ | 81 | return [ |
75 | { value: 1, label: "办事大厅" }, | 82 | { value: 1, label: "办事大厅" }, |
76 | { value: 2, label: "微信小程序" }, | 83 | { value: 2, label: "微信小程序" }, |
77 | { value: 3, label: "法院端" }, | 84 | { value: 3, label: "法院端" }, | ... | ... |
1 | <template> | 1 | <template> |
2 | <dialogBox title="证书入库" @submitForm="submitForm" saveButton="保存" width="45%" @closeDialog="closeDialog" v-model="value"> | 2 | <dialogBox title="证书入库" @submitForm="submitForm" saveButton="保存" :isFullscreen="false" width="50%" |
3 | <div> | 3 | @closeDialog="closeDialog" v-model="myValue"> |
4 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> | 4 | <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> |
5 | <el-row> | 5 | <el-row> |
6 | <el-col :span="12"> | 6 | <el-col :span="12"> |
... | @@ -10,37 +10,41 @@ | ... | @@ -10,37 +10,41 @@ |
10 | </el-col> | 10 | </el-col> |
11 | <el-col :span="12"> | 11 | <el-col :span="12"> |
12 | <el-form-item label="登记机构:" prop="djjg"> | 12 | <el-form-item label="登记机构:" prop="djjg"> |
13 | <el-select v-model="ruleForm.djjg" placeholder="请选择"> | 13 | <el-select v-model="ruleForm.djjg" class="width100" placeholder="请选择"> |
14 | <el-option v-for="item in dictData['ywly']" :key="item.dname" :label="item.dname" :value="item.dname"></el-option> | 14 | <el-option v-for="item in dictData['ywly']" :key="item.dname" :label="item.dname" :value="item.dname"> |
15 | </el-option> | ||
15 | </el-select> | 16 | </el-select> |
16 | </el-form-item> | 17 | </el-form-item> |
17 | </el-col> | 18 | </el-col> |
18 | </el-row> | 19 | </el-row> |
19 | <el-row> | 20 | <el-row> |
20 | <el-col :span="12"> | 21 | <el-col :span="12"> |
21 | <el-form-item label="入库人员:" prop="rkry"> | 22 | <el-form-item label="入库人员:"> |
22 | <el-input v-model="ruleForm.rkry" :disabled="true"></el-input> | 23 | <el-input v-model="ruleForm.rkry" :disabled="true"></el-input> |
23 | </el-form-item> | 24 | </el-form-item> |
24 | </el-col> | 25 | </el-col> |
25 | <el-col :span="12"> | 26 | <el-col :span="12"> |
26 | <el-form-item label="入库时间:" prop="rksj"> | 27 | <el-form-item label="入库时间:" prop="rksj"> |
27 | <el-date-picker v-model="ruleForm.rksj" type="datetime" placeholder="选择日期时间"></el-date-picker> | 28 | <el-date-picker v-model="ruleForm.rksj" class="width100" type="datetime"> |
29 | </el-date-picker> | ||
28 | </el-form-item> | 30 | </el-form-item> |
29 | </el-col> | 31 | </el-col> |
30 | </el-row> | 32 | </el-row> |
31 | <div> | 33 | <div> |
32 | <el-table :data="tableForm" border style="width: 100%" :header-cell-style="{'text-align':'center',background: 'rgb(236, 245, 255)'}" :cell-style="{'text-align':'center'}"> | 34 | <el-table :data="tableForm" border style="width: 100%" |
35 | :header-cell-style="{'text-align':'center',background: 'rgb(236, 245, 255)'}" | ||
36 | :cell-style="{'text-align':'center'}"> | ||
33 | <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column> | 37 | <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column> |
34 | <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200"> | 38 | <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200"> |
35 | <template slot-scope="scope"> | 39 | <template slot-scope="scope"> |
36 | <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11" | 40 | <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11" |
37 | oninput="value=value.replace(/[^\d.]/g,'')" ></el-input> | 41 | oninput="value=value.replace(/[^\d.]/g,'')"></el-input> |
38 | </template> | 42 | </template> |
39 | </el-table-column> | 43 | </el-table-column> |
40 | <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200"> | 44 | <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200"> |
41 | <template slot-scope="scope"> | 45 | <template slot-scope="scope"> |
42 | <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11" | 46 | <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11" |
43 | oninput="value=value.replace(/[^\d.]/g,'')" ></el-input> | 47 | oninput="value=value.replace(/[^\d.]/g,'')"></el-input> |
44 | </template> | 48 | </template> |
45 | </el-table-column> | 49 | </el-table-column> |
46 | <el-table-column prop="bs" label="本数"> | 50 | <el-table-column prop="bs" label="本数"> |
... | @@ -56,16 +60,13 @@ | ... | @@ -56,16 +60,13 @@ |
56 | <el-input type="textarea" v-model="ruleForm.bz" :rows="4"></el-input> | 60 | <el-input type="textarea" v-model="ruleForm.bz" :rows="4"></el-input> |
57 | </el-form-item> | 61 | </el-form-item> |
58 | </el-form> | 62 | </el-form> |
59 | </div> | ||
60 | </dialogBox> | 63 | </dialogBox> |
61 | </template> | 64 | </template> |
62 | 65 | ||
63 | <script> | 66 | <script> |
64 | import { mapGetters } from 'vuex' | 67 | import { mapGetters } from 'vuex' |
65 | import { getSysSerialSingle,zsrk} from "@/api/zsgl.js" | 68 | import { getSysSerialSingle, zsrk } from "@/api/zsgl.js" |
66 | export default { | 69 | export default { |
67 | components: { | ||
68 | }, | ||
69 | computed: { | 70 | computed: { |
70 | ...mapGetters(['dictData']), | 71 | ...mapGetters(['dictData']), |
71 | }, | 72 | }, |
... | @@ -74,6 +75,7 @@ export default { | ... | @@ -74,6 +75,7 @@ export default { |
74 | }, | 75 | }, |
75 | data () { | 76 | data () { |
76 | return { | 77 | return { |
78 | myValue: this.value, | ||
77 | //表单提交数据 | 79 | //表单提交数据 |
78 | ruleForm: { | 80 | ruleForm: { |
79 | batchno: '', | 81 | batchno: '', |
... | @@ -95,14 +97,14 @@ export default { | ... | @@ -95,14 +97,14 @@ export default { |
95 | ksysxlh: '', | 97 | ksysxlh: '', |
96 | jsysxlh: '', | 98 | jsysxlh: '', |
97 | bs: 0, | 99 | bs: 0, |
98 | zslx:1 | 100 | zslx: 1 |
99 | }, | 101 | }, |
100 | { | 102 | { |
101 | name: '不动产权登记证明', | 103 | name: '不动产权登记证明', |
102 | ksysxlh: '', | 104 | ksysxlh: '', |
103 | jsysxlh: '', | 105 | jsysxlh: '', |
104 | bs: 0, | 106 | bs: 0, |
105 | zslx:2 | 107 | zslx: 2 |
106 | } | 108 | } |
107 | ], | 109 | ], |
108 | //证书入库业务号参数 | 110 | //证书入库业务号参数 |
... | @@ -119,111 +121,116 @@ export default { | ... | @@ -119,111 +121,116 @@ export default { |
119 | djjg: [ | 121 | djjg: [ |
120 | { required: true, message: '请选择登记机构', trigger: 'change' } | 122 | { required: true, message: '请选择登记机构', trigger: 'change' } |
121 | ], | 123 | ], |
122 | rkry: [ | ||
123 | { required: true, message: '入库人员不能为空', trigger: 'blur' } | ||
124 | ], | ||
125 | rksj: [ | 124 | rksj: [ |
126 | { required: true, message: '请选择入库时间', trigger: 'change' } | 125 | { required: true, message: '请选择入库时间', trigger: 'change' } |
127 | ], | 126 | ], |
128 | }, | 127 | }, |
129 | } | 128 | } |
130 | }, | 129 | }, |
130 | watch: { | ||
131 | value (val) { | ||
132 | this.myValue = val | ||
133 | } | ||
134 | }, | ||
131 | methods: { | 135 | methods: { |
132 | //表单提交 | 136 | //表单提交 |
133 | submitForm () { | 137 | submitForm () { |
134 | this.tableForm.forEach((item,index)=>{ | 138 | this.tableForm.forEach((item, index) => { |
135 | if(item.bs < 0){ | 139 | if (item.bs < 0) { |
136 | return; | 140 | return; |
137 | } | 141 | } |
138 | }) | 142 | }) |
139 | zsrk(this.ruleForm).then(res => { | 143 | zsrk(this.ruleForm).then(res => { |
140 | if(res.code == 200){ | 144 | if (res.code == 200) { |
141 | this.$message.success('保存成功') | 145 | this.$message.success('保存成功') |
142 | this.$emit("input", false); | 146 | this.$emit("input", false); |
143 | this.ruleForm = {}; | 147 | this.$refs['ruleForm'].resetFields(); |
144 | this.resetTableFields(); | 148 | this.resetTableFields(); |
145 | this.$parent.fetchData(); | 149 | this.$parent.fetchData(); |
146 | }else{ | 150 | } else { |
147 | this.$message.error(res.message); | 151 | this.$message.error(res.message); |
148 | } | 152 | } |
149 | }) | 153 | }) |
150 | }, | 154 | }, |
151 | //序列号获取 | 155 | //序列号获取 |
152 | ywhSerial(){ | 156 | ywhSerial () { |
153 | getSysSerialSingle(this.ywhQueryForm).then(res => { | 157 | getSysSerialSingle(this.ywhQueryForm).then(res => { |
154 | if(res.code == 200){ | 158 | if (res.code == 200) { |
155 | this.ruleForm.batchno = res.message; | 159 | this.ruleForm.batchno = res.message; |
156 | } | 160 | } |
157 | }) | 161 | }) |
158 | }, | 162 | }, |
159 | //印刷序列号处理 | 163 | //印刷序列号处理 |
160 | ysxlhDeal(item){ | 164 | ysxlhDeal (item) { |
161 | if(item.ksysxlh && item.jsysxlh){ | 165 | if (item.ksysxlh && item.jsysxlh) { |
162 | if(item.ksysxlh.length == item.jsysxlh.length){ | 166 | if (item.ksysxlh.length == item.jsysxlh.length) { |
163 | if(item.ksysxlh.length != 11){ | 167 | if (item.ksysxlh.length != 11) { |
164 | item.bs = -1; | 168 | item.bs = -1; |
165 | return; | 169 | return; |
166 | } | 170 | } |
167 | if(item.ksysxlh > item.jsysxlh){ | 171 | if (item.ksysxlh > item.jsysxlh) { |
168 | item.bs = -1; | 172 | item.bs = -1; |
169 | return; | 173 | return; |
170 | } | 174 | } |
171 | item.bs = item.jsysxlh - item.ksysxlh + 1; | 175 | item.bs = item.jsysxlh - item.ksysxlh + 1; |
172 | if(item.zslx == 1){ | 176 | if (item.zslx == 1) { |
173 | this.ruleForm.zsstarno = item.ksysxlh; | 177 | this.ruleForm.zsstarno = item.ksysxlh; |
174 | this.ruleForm.zsendno = item.jsysxlh; | 178 | this.ruleForm.zsendno = item.jsysxlh; |
175 | this.ruleForm.zsnum = item.bs | 179 | this.ruleForm.zsnum = item.bs |
176 | }else if(item.zslx == 2){ | 180 | } else if (item.zslx == 2) { |
177 | this.ruleForm.zmstarno = item.ksysxlh; | 181 | this.ruleForm.zmstarno = item.ksysxlh; |
178 | this.ruleForm.zmendno = item.jsysxlh; | 182 | this.ruleForm.zmendno = item.jsysxlh; |
179 | this.ruleForm.zmnum = item.bs | 183 | this.ruleForm.zmnum = item.bs |
180 | } | 184 | } |
181 | }else{ | 185 | } else { |
182 | item.bs = -1; | 186 | item.bs = -1; |
183 | } | 187 | } |
184 | }else{ | 188 | } else { |
185 | item.bs = 0; | 189 | item.bs = 0; |
186 | if(item.zslx == 1){ | 190 | if (item.zslx == 1) { |
187 | this.ruleForm.zsstarno = ''; | 191 | this.ruleForm.zsstarno = ''; |
188 | this.ruleForm.zsendno = ''; | 192 | this.ruleForm.zsendno = ''; |
189 | this.ruleForm.zsnum = item.bs | 193 | this.ruleForm.zsnum = item.bs |
190 | }else if(item.zslx == 2){ | 194 | } else if (item.zslx == 2) { |
191 | this.ruleForm.zmstarno = ''; | 195 | this.ruleForm.zmstarno = ''; |
192 | this.ruleForm.zmendno = ''; | 196 | this.ruleForm.zmendno = ''; |
193 | this.ruleForm.zmnum = item.bs | 197 | this.ruleForm.zmnum = item.bs |
194 | } | 198 | } |
195 | } | 199 | } |
196 | }, | 200 | }, |
197 | resetTableFields() { | 201 | resetTableFields () { |
198 | this.tableForm = [ | 202 | this.tableForm = [ |
199 | { | 203 | { |
200 | name: '不动产权证书', | 204 | name: '不动产权证书', |
201 | ksysxlh: '', | 205 | ksysxlh: '', |
202 | jsysxlh: '', | 206 | jsysxlh: '', |
203 | bs: 0, | 207 | bs: 0, |
204 | zslx:1 | 208 | zslx: 1 |
205 | }, | 209 | }, |
206 | { | 210 | { |
207 | name: '不动产权登记证明', | 211 | name: '不动产权登记证明', |
208 | ksysxlh: '', | 212 | ksysxlh: '', |
209 | jsysxlh: '', | 213 | jsysxlh: '', |
210 | bs: 0, | 214 | bs: 0, |
211 | zslx:2 | 215 | zslx: 2 |
212 | } | 216 | } |
213 | ] | 217 | ] |
214 | }, | 218 | }, |
215 | closeDialog () { | 219 | closeDialog () { |
216 | this.$emit("input", false); | 220 | this.$emit("input", false); |
217 | }, | 221 | this.$refs['ruleForm'].resetFields(); |
222 | } | ||
218 | } | 223 | } |
219 | } | 224 | } |
220 | </script> | 225 | </script> |
221 | <style scoped lang="scss"> | 226 | <style scoped lang="scss"> |
222 | @import "~@/styles/mixin.scss"; | 227 | @import "~@/styles/mixin.scss"; |
223 | .font-red{ | 228 | |
229 | .font-red { | ||
224 | color: red | 230 | color: red |
225 | } | 231 | } |
226 | .middle-margin-bottom{ | 232 | |
227 | margin-top:20px | 233 | .middle-margin-bottom { |
234 | margin-top: 20px | ||
228 | } | 235 | } |
229 | </style> | 236 | </style> | ... | ... |
... | @@ -2,17 +2,17 @@ | ... | @@ -2,17 +2,17 @@ |
2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
3 | <!-- 表单部分 --> | 3 | <!-- 表单部分 --> |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="ruleForm" label-width="70px"> | 5 | <el-form :model="ruleForm" label-width="80px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="5"> | 7 | <el-col :span="5"> |
8 | <el-form-item label="入库编号"> | 8 | <el-form-item label="入库编号"> |
9 | <el-input v-model="approveForm.batchno" clearable placeholder="入库编号"></el-input> | 9 | <el-input v-model="ruleForm.batchno" clearable placeholder="入库编号"></el-input> |
10 | </el-form-item> | 10 | </el-form-item> |
11 | </el-col> | 11 | </el-col> |
12 | <el-col :span="8"> | 12 | <el-col :span="8"> |
13 | <el-form-item label="人库时间"> | 13 | <el-form-item label="人库时间"> |
14 | <el-date-picker v-model="ruleForm.rksj" type="datetimerange" range-separator="至" start-placeholder="开始日期" | 14 | <el-date-picker v-model="ruleForm.rksj" type="datetimerange" range-separator="至" start-placeholder="开始日期" |
15 | end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable > | 15 | end-placeholder="结束日期" @change="timeChange()" value-format="yyyy-MM-dd HH:mm:ss" clearable> |
16 | </el-date-picker> | 16 | </el-date-picker> |
17 | </el-form-item> | 17 | </el-form-item> |
18 | </el-col> | 18 | </el-col> |
... | @@ -32,17 +32,19 @@ | ... | @@ -32,17 +32,19 @@ |
32 | :data="tableData.data"> | 32 | :data="tableData.data"> |
33 | </lb-table> | 33 | </lb-table> |
34 | </div> | 34 | </div> |
35 | <addDialog ref="addDialog" v-model="isDialog"/> | 35 | <addDialog ref="addDialog" v-model="isDialog" /> |
36 | <viewDialog v-model="viewDialog" /> | ||
36 | </div> | 37 | </div> |
37 | </template> | 38 | </template> |
38 | <script> | 39 | <script> |
39 | import table from "@/utils/mixin/table"; | 40 | import table from "@/utils/mixin/table"; |
40 | import { datas, sendThis } from "./zsrkdata"; | 41 | import { datas, sendThis } from "./zsrkdata"; |
41 | import addDialog from "./components/addDialog.vue" | 42 | import addDialog from "./components/addDialog.vue"; |
42 | import { getZsglrkList ,removeZsgl,verifyZsrk} from "@/api/zsgl.js" | 43 | import viewDialog from "../components/viewDialog.vue"; |
44 | import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js"; | ||
43 | export default { | 45 | export default { |
44 | name: "zsrk", | 46 | name: "zsrk", |
45 | components: {addDialog}, | 47 | components: { addDialog, viewDialog }, |
46 | mixins: [table], | 48 | mixins: [table], |
47 | mounted () { | 49 | mounted () { |
48 | sendThis(this); | 50 | sendThis(this); |
... | @@ -50,10 +52,9 @@ export default { | ... | @@ -50,10 +52,9 @@ export default { |
50 | data () { | 52 | data () { |
51 | return { | 53 | return { |
52 | isDialog: false, | 54 | isDialog: false, |
55 | viewDialog: false, | ||
53 | ruleForm: { | 56 | ruleForm: { |
54 | rksj: '' | 57 | rksj: '', |
55 | }, | ||
56 | approveForm: { | ||
57 | batchno: '', | 58 | batchno: '', |
58 | rkkssj: '', | 59 | rkkssj: '', |
59 | rkjssj: '' | 60 | rkjssj: '' |
... | @@ -66,12 +67,9 @@ export default { | ... | @@ -66,12 +67,9 @@ export default { |
66 | }; | 67 | }; |
67 | }, | 68 | }, |
68 | methods: { | 69 | methods: { |
69 | init (e) { | ||
70 | this.fetchData() | ||
71 | }, | ||
72 | // 列表渲染接口 | 70 | // 列表渲染接口 |
73 | fetchData () { | 71 | fetchData () { |
74 | getZsglrkList({ ...this.approveForm, ...this.pageData }).then(res => { | 72 | getZsglrkList({ ...this.ruleForm, ...this.pageData }).then(res => { |
75 | if (res.code === 200) { | 73 | if (res.code === 200) { |
76 | let { total, records } = res.result | 74 | let { total, records } = res.result |
77 | this.tableData.total = total; | 75 | this.tableData.total = total; |
... | @@ -80,36 +78,38 @@ export default { | ... | @@ -80,36 +78,38 @@ export default { |
80 | }) | 78 | }) |
81 | }, | 79 | }, |
82 | openDialog () { | 80 | openDialog () { |
83 | this.isDialog = true; | 81 | this.$nextTick(() => { |
84 | this.$nextTick(()=> { | ||
85 | this.$refs.addDialog.ywhSerial(); | 82 | this.$refs.addDialog.ywhSerial(); |
83 | this.isDialog = true; | ||
86 | }) | 84 | }) |
87 | }, | 85 | }, |
88 | queryClick () { | 86 | queryClick () { |
89 | this.fetchData() | 87 | this.fetchData() |
90 | }, | 88 | }, |
91 | //修改筛选时间 | 89 | //修改筛选时间 |
92 | timeChange() { | 90 | timeChange (val) { |
93 | if (this.ruleForm.rksj != null) { | 91 | if (this.ruleForm.rksj != null) { |
94 | this.approveForm.rkkssj = this.ruleForm.rksj[0]; | 92 | |
95 | this.approveForm.rkjssj = this.ruleForm.rksj[1]; | 93 | this.ruleForm.rkkssj = this.ruleForm.rksj[0]; |
94 | this.ruleForm.rkjssj = this.ruleForm.rksj[1]; | ||
96 | } else { | 95 | } else { |
97 | this.approveForm.rkkssj = '' | 96 | this.ruleForm.rkkssj = '' |
98 | this.approveForm.rkjssj = '' | 97 | this.ruleForm.rkjssj = '' |
99 | } | 98 | } |
100 | }, | 99 | }, |
101 | //删除证书入库数据 | 100 | //删除证书入库数据 |
102 | delZsrk(item){ | 101 | delZsrk (item) { |
103 | this.$confirm('确定要删除吗, 是否继续?', '提示', { | 102 | this.$confirm('确定要删除吗, 是否继续?', '提示', { |
104 | confirmButtonText: '确定', | 103 | confirmButtonText: '确定', |
105 | cancelButtonText: '取消', | 104 | cancelButtonText: '取消', |
106 | type: 'warning' | 105 | type: 'warning' |
107 | }).then(() => { | 106 | }).then(() => { |
108 | removeZsgl({"bsmBatch":item.bsmBatch}).then(res => { | 107 | removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => { |
109 | if(res.code == 200){ | 108 | if (res.code == 200) { |
110 | this.$message.success("删除成功") | 109 | this.$message.success("删除成功") |
111 | this.fetchData(); | 110 | this.handleDel() |
112 | }else{ | 111 | this.fetchData() |
112 | } else { | ||
113 | this.$message.error(res.message) | 113 | this.$message.error(res.message) |
114 | } | 114 | } |
115 | }) | 115 | }) |
... | @@ -121,17 +121,17 @@ export default { | ... | @@ -121,17 +121,17 @@ export default { |
121 | }); | 121 | }); |
122 | }, | 122 | }, |
123 | //审核证书入库数据 | 123 | //审核证书入库数据 |
124 | confrimVerify(item){ | 124 | confrimVerify (item) { |
125 | this.$confirm('审核是否通过', '提示', { | 125 | this.$confirm('审核是否通过', '提示', { |
126 | confirmButtonText: '确定', | 126 | confirmButtonText: '确定', |
127 | cancelButtonText: '取消', | 127 | cancelButtonText: '取消', |
128 | type: 'warning' | 128 | type: 'warning' |
129 | }).then(() => { | 129 | }).then(() => { |
130 | verifyZsrk({"bsmBatch":item.bsmBatch}).then(res => { | 130 | verifyZsrk({ "bsmBatch": item.bsmBatch }).then(res => { |
131 | if(res.code == 200){ | 131 | if (res.code == 200) { |
132 | this.$message.success("审核成功") | 132 | this.$message.success("审核成功") |
133 | this.fetchData(); | 133 | this.fetchData(); |
134 | }else{ | 134 | } else { |
135 | this.$message.error(res.message) | 135 | this.$message.error(res.message) |
136 | } | 136 | } |
137 | }) | 137 | }) | ... | ... |
... | @@ -13,7 +13,14 @@ class data extends filter { | ... | @@ -13,7 +13,14 @@ class data extends filter { |
13 | { | 13 | { |
14 | label: '序号', | 14 | label: '序号', |
15 | type: 'index', | 15 | type: 'index', |
16 | width: '50' | 16 | width: '50', |
17 | render: (h, scope) => { | ||
18 | return ( | ||
19 | <div> | ||
20 | {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1} | ||
21 | </div> | ||
22 | ) | ||
23 | } | ||
17 | }, | 24 | }, |
18 | { | 25 | { |
19 | prop: "batchno", | 26 | prop: "batchno", |
... | @@ -63,15 +70,15 @@ class data extends filter { | ... | @@ -63,15 +70,15 @@ class data extends filter { |
63 | <el-button type="text" icon="el-icon-delete" onClick={() => { vm.delZsrk(scope.row) }}>删除</el-button> | 70 | <el-button type="text" icon="el-icon-delete" onClick={() => { vm.delZsrk(scope.row) }}>删除</el-button> |
64 | </div> | 71 | </div> |
65 | case '1': | 72 | case '1': |
66 | return <el-button type="text" onClick={() => { }}>查看</el-button> | 73 | return <el-button type="text" onClick={() => { vm.viewDialog = true }}>查看</el-button> |
67 | } | 74 | } |
68 | } | 75 | } |
69 | } | 76 | } |
70 | ] | 77 | ] |
71 | } | 78 | } |
72 | 79 | ||
73 | ywlys(){ | 80 | ywlys () { |
74 | return[ | 81 | return [ |
75 | { value: 1, label: "办事大厅" }, | 82 | { value: 1, label: "办事大厅" }, |
76 | { value: 2, label: "微信小程序" }, | 83 | { value: 2, label: "微信小程序" }, |
77 | { value: 3, label: "法院端" }, | 84 | { value: 3, label: "法院端" }, | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | <div class="from-clues"> | 2 | <div class="from-clues"> |
3 | <!-- 表单部分 --> | 3 | <!-- 表单部分 --> |
4 | <div class="from-clues-header"> | 4 | <div class="from-clues-header"> |
5 | <el-form :model="ruleForm" label-width="120px"> | 5 | <el-form :model="ruleForm" label-width="85px"> |
6 | <el-row> | 6 | <el-row> |
7 | <el-col :span="5"> | 7 | <el-col :span="5"> |
8 | <el-form-item label="印刷序列号" prop="ysxlh"> | 8 | <el-form-item label="印刷序列号" prop="ysxlh"> |
... | @@ -11,23 +11,19 @@ | ... | @@ -11,23 +11,19 @@ |
11 | </el-col> | 11 | </el-col> |
12 | <el-col :span="5"> | 12 | <el-col :span="5"> |
13 | <el-form-item label="证书类型" prop="zslx"> | 13 | <el-form-item label="证书类型" prop="zslx"> |
14 | <el-select v-model="ruleForm.zslx" placeholder="请选择证书类型" clearable > | 14 | <el-select v-model="ruleForm.zslx" class="width100" placeholder="请选择证书类型" clearable> |
15 | <el-option | 15 | <el-option v-for="item in zslxArr" :key="item.value" :label="item.label" :value="item.value"> |
16 | v-for="item in zslxArr" | ||
17 | :key="item.value" | ||
18 | :label="item.label" | ||
19 | :value="item.value"> | ||
20 | </el-option> | 16 | </el-option> |
21 | </el-select> | 17 | </el-select> |
22 | </el-form-item> | 18 | </el-form-item> |
23 | </el-col> | 19 | </el-col> |
24 | <el-col :span="5"> | 20 | <el-col :span="5"> |
25 | <el-form-item label="业务号" prop="ywh"> | 21 | <el-form-item label="业务号" label-width="60px" prop="ywh"> |
26 | <el-input v-model="ruleForm.ywh" clearable placeholder="请输入业务号"></el-input> | 22 | <el-input v-model="ruleForm.ywh" clearable placeholder="请输入业务号"></el-input> |
27 | </el-form-item> | 23 | </el-form-item> |
28 | </el-col> | 24 | </el-col> |
29 | <el-col :span="6"> | 25 | <el-col :span="6"> |
30 | <el-form-item label="不动产权证号" prop="bdcqzh"> | 26 | <el-form-item label="不动产权证号" label-width="100px" prop="bdcqzh"> |
31 | <el-input v-model="ruleForm.bdcqzh" placeholder="请输入不动产权证号"></el-input> | 27 | <el-input v-model="ruleForm.bdcqzh" placeholder="请输入不动产权证号"></el-input> |
32 | </el-form-item> | 28 | </el-form-item> |
33 | </el-col> | 29 | </el-col> |
... | @@ -48,13 +44,13 @@ | ... | @@ -48,13 +44,13 @@ |
48 | :data="tableData.data"> | 44 | :data="tableData.data"> |
49 | </lb-table> | 45 | </lb-table> |
50 | </div> | 46 | </div> |
51 | <viewDialog v-model="isDialog" /> | 47 | <viewDialog ref="viewDialog" v-model="isDialog" /> |
52 | </div> | 48 | </div> |
53 | </template> | 49 | </template> |
54 | <script> | 50 | <script> |
55 | import viewDialog from "./components/viewDialog.vue" | 51 | import viewDialog from "../components/viewDialog.vue" |
56 | import table from "@/utils/mixin/table"; | 52 | import table from "@/utils/mixin/table"; |
57 | import { getZssyqkList} from "@/api/zsgl.js" | 53 | import { getZssyqkList } from "@/api/zsgl.js" |
58 | import { datas, sendThis } from "./zssyjldata"; | 54 | import { datas, sendThis } from "./zssyjldata"; |
59 | export default { | 55 | export default { |
60 | name: "zssyjl", | 56 | name: "zssyjl", |
... | @@ -78,15 +74,12 @@ export default { | ... | @@ -78,15 +74,12 @@ export default { |
78 | data: [], | 74 | data: [], |
79 | }, | 75 | }, |
80 | zslxArr: [ | 76 | zslxArr: [ |
81 | {label: '不动产权证书',value: 'zs'}, | 77 | { label: '不动产权证书', value: 'zs' }, |
82 | {label: '不动产登记证明', value: 'zm'} | 78 | { label: '不动产登记证明', value: 'zm' } |
83 | ] | 79 | ] |
84 | }; | 80 | }; |
85 | }, | 81 | }, |
86 | methods: { | 82 | methods: { |
87 | init (e) { | ||
88 | this.fetchData() | ||
89 | }, | ||
90 | // 列表渲染接口 | 83 | // 列表渲染接口 |
91 | fetchData () { | 84 | fetchData () { |
92 | getZssyqkList({ ...this.ruleForm, ...this.pageData }).then(res => { | 85 | getZssyqkList({ ...this.ruleForm, ...this.pageData }).then(res => { |
... | @@ -97,11 +90,14 @@ export default { | ... | @@ -97,11 +90,14 @@ export default { |
97 | } | 90 | } |
98 | }) | 91 | }) |
99 | }, | 92 | }, |
100 | openDialog () { | 93 | openDialog (item) { |
101 | this.isDialog = true | 94 | this.isDialog = true |
102 | }, | 95 | this.$nextTick(() => { |
103 | }, | 96 | this.$refs.viewDialog.getDetail(item.bsmZswj); |
104 | }; | 97 | }) |
98 | } | ||
99 | } | ||
100 | } | ||
105 | </script> | 101 | </script> |
106 | <style scoped lang="scss"> | 102 | <style scoped lang="scss"> |
107 | @import "~@/styles/public.scss"; | 103 | @import "~@/styles/public.scss"; | ... | ... |
... | @@ -13,7 +13,14 @@ class data extends filter { | ... | @@ -13,7 +13,14 @@ class data extends filter { |
13 | { | 13 | { |
14 | label: '序号', | 14 | label: '序号', |
15 | type: 'index', | 15 | type: 'index', |
16 | width: '50' | 16 | width: '50', |
17 | render: (h, scope) => { | ||
18 | return ( | ||
19 | <div> | ||
20 | {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1} | ||
21 | </div> | ||
22 | ) | ||
23 | } | ||
17 | }, | 24 | }, |
18 | { | 25 | { |
19 | label: "状态", | 26 | label: "状态", |
... | @@ -75,7 +82,7 @@ class data extends filter { | ... | @@ -75,7 +82,7 @@ class data extends filter { |
75 | align: 'center', | 82 | align: 'center', |
76 | fixed: 'right', | 83 | fixed: 'right', |
77 | render: (h, scope) => { | 84 | render: (h, scope) => { |
78 | return <el-button type="text" icon="el-icon-view" onClick={() => { }}>查看</el-button> | 85 | return <el-button type="text" icon="el-icon-view" onClick={() => { vm.openDialog(scope.row) }}>查看</el-button> |
79 | } | 86 | } |
80 | } | 87 | } |
81 | ] | 88 | ] | ... | ... |
-
Please register or sign in to post a comment