Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
18 changed files
with
101 additions
and
110 deletions
... | @@ -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 | /* |
... | @@ -58,7 +59,8 @@ export function getZsglffList (data) { | ... | @@ -58,7 +59,8 @@ export function getZsglffList (data) { |
58 | return request({ | 59 | return request({ |
59 | url: '/sys/zsgl/getZsglffList', | 60 | url: '/sys/zsgl/getZsglffList', |
60 | method: 'post', | 61 | method: 'post', |
61 | data | 62 | data, |
63 | showLoading: true | ||
62 | }) | 64 | }) |
63 | } | 65 | } |
64 | /* | 66 | /* |
... | @@ -109,7 +111,8 @@ export function getZssyqkList (data) { | ... | @@ -109,7 +111,8 @@ export function getZssyqkList (data) { |
109 | return request({ | 111 | return request({ |
110 | url: '/sys/zsgl/getZssyqkList', | 112 | url: '/sys/zsgl/getZssyqkList', |
111 | method: 'post', | 113 | method: 'post', |
112 | data | 114 | data, |
115 | showLoading: true | ||
113 | }) | 116 | }) |
114 | } | 117 | } |
115 | /* | 118 | /* | ... | ... |
... | @@ -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> | ... | ... |
... | @@ -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 { | ... | ... |
... | @@ -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> | ... | ... |
... | @@ -75,15 +75,6 @@ class data extends filter { | ... | @@ -75,15 +75,6 @@ class data extends filter { |
75 | </div> | 75 | </div> |
76 | ) | 76 | ) |
77 | } | 77 | } |
78 | }, | ||
79 | { | ||
80 | label: '操作', | ||
81 | width: '80', | ||
82 | align: 'center', | ||
83 | fixed: 'right', | ||
84 | render: (h, scope) => { | ||
85 | return <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope) }}>编辑</el-button> | ||
86 | } | ||
87 | } | 78 | } |
88 | ] | 79 | ] |
89 | } | 80 | } | ... | ... |
... | @@ -136,7 +136,8 @@ export default { | ... | @@ -136,7 +136,8 @@ export default { |
136 | removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => { | 136 | removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => { |
137 | if (res.code == 200) { | 137 | if (res.code == 200) { |
138 | this.$message.success("删除成功") | 138 | this.$message.success("删除成功") |
139 | this.fetchData(); | 139 | this.handleDel() |
140 | this.fetchData() | ||
140 | } else { | 141 | } else { |
141 | this.$message.error(res.message) | 142 | this.$message.error(res.message) |
142 | } | 143 | } | ... | ... |
... | @@ -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", | ... | ... |
... | @@ -44,7 +44,7 @@ import viewDialog from "../components/viewDialog.vue"; | ... | @@ -44,7 +44,7 @@ import viewDialog from "../components/viewDialog.vue"; |
44 | import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js"; | 44 | import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js"; |
45 | export default { | 45 | export default { |
46 | name: "zsrk", | 46 | name: "zsrk", |
47 | components: { addDialog,viewDialog }, | 47 | components: { addDialog, viewDialog }, |
48 | mixins: [table], | 48 | mixins: [table], |
49 | mounted () { | 49 | mounted () { |
50 | sendThis(this); | 50 | sendThis(this); |
... | @@ -89,6 +89,7 @@ export default { | ... | @@ -89,6 +89,7 @@ export default { |
89 | //修改筛选时间 | 89 | //修改筛选时间 |
90 | timeChange (val) { | 90 | timeChange (val) { |
91 | if (this.ruleForm.rksj != null) { | 91 | if (this.ruleForm.rksj != null) { |
92 | |||
92 | this.ruleForm.rkkssj = this.ruleForm.rksj[0]; | 93 | this.ruleForm.rkkssj = this.ruleForm.rksj[0]; |
93 | this.ruleForm.rkjssj = this.ruleForm.rksj[1]; | 94 | this.ruleForm.rkjssj = this.ruleForm.rksj[1]; |
94 | } else { | 95 | } else { |
... | @@ -106,7 +107,8 @@ export default { | ... | @@ -106,7 +107,8 @@ export default { |
106 | removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => { | 107 | removeZsgl({ "bsmBatch": item.bsmBatch }).then(res => { |
107 | if (res.code == 200) { | 108 | if (res.code == 200) { |
108 | this.$message.success("删除成功") | 109 | this.$message.success("删除成功") |
109 | this.fetchData(); | 110 | this.handleDel() |
111 | this.fetchData() | ||
110 | } else { | 112 | } else { |
111 | this.$message.error(res.message) | 113 | this.$message.error(res.message) |
112 | } | 114 | } | ... | ... |
... | @@ -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", | ... | ... |
... | @@ -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: "状态", | ... | ... |
-
Please register or sign in to post a comment