Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
5 changed files
with
87 additions
and
120 deletions
... | @@ -97,6 +97,23 @@ export function stepExpandInfo (data) { | ... | @@ -97,6 +97,23 @@ export function stepExpandInfo (data) { |
97 | }) | 97 | }) |
98 | } | 98 | } |
99 | 99 | ||
100 | // 获取审批意见 | ||
101 | export function getSpyjList (data) { | ||
102 | return request({ | ||
103 | url: '/business/workFlow/getSpyjList', | ||
104 | method: 'post', | ||
105 | data | ||
106 | }) | ||
107 | } | ||
108 | |||
109 | // 保存审批意见 | ||
110 | export function saveSpyj (data) { | ||
111 | return request({ | ||
112 | url: '/business/workFlow/saveSpyj', | ||
113 | method: 'post', | ||
114 | data | ||
115 | }) | ||
116 | } | ||
100 | // 登簿接口 | 117 | // 登簿接口 |
101 | export function record (data) { | 118 | export function record (data) { |
102 | return request({ | 119 | return request({ | ... | ... |
... | @@ -138,6 +138,8 @@ export default { | ... | @@ -138,6 +138,8 @@ export default { |
138 | message: '删除成功!' | 138 | message: '删除成功!' |
139 | }); | 139 | }); |
140 | this.fetchData() | 140 | this.fetchData() |
141 | }else { | ||
142 | this.$message.error(res.message); | ||
141 | } | 143 | } |
142 | }) | 144 | }) |
143 | }).catch(() => { | 145 | }).catch(() => { | ... | ... |
... | @@ -13,8 +13,8 @@ | ... | @@ -13,8 +13,8 @@ |
13 | <div class="item_right"> | 13 | <div class="item_right"> |
14 | <el-row> | 14 | <el-row> |
15 | <el-col :span="24"> | 15 | <el-col :span="24"> |
16 | <el-form-item label-width="0" class="opinion_item" prop="csyj"> | 16 | <el-form-item label-width="0" class="opinion_item" prop="shyj"> |
17 | <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.csyj"> | 17 | <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.shyj"> |
18 | </el-input> | 18 | </el-input> |
19 | <el-popover placement="right" width="50" trigger="hover"> | 19 | <el-popover placement="right" width="50" trigger="hover"> |
20 | <ul class="pointer"> | 20 | <ul class="pointer"> |
... | @@ -28,18 +28,13 @@ | ... | @@ -28,18 +28,13 @@ |
28 | </el-row> | 28 | </el-row> |
29 | 29 | ||
30 | <el-row> | 30 | <el-row> |
31 | <el-col :span="8"> | 31 | <el-col :span="16"> |
32 | <el-form-item label="审查人" prop="scr"> | 32 | <el-form-item label="审查人:" prop="scr"> |
33 | {{ ruleForm.scr }} | 33 | {{ ruleForm.shryxm }} |
34 | </el-form-item> | 34 | </el-form-item> |
35 | </el-col> | 35 | </el-col> |
36 | <el-col :span="8"> | 36 | <el-col :span="8"> |
37 | <el-form-item label="审核开始时间" prop="shkssj"> | 37 | <el-form-item label="审核时间:" prop="shjssj"> |
38 | {{ ruleForm.shkssj }} | ||
39 | </el-form-item> | ||
40 | </el-col> | ||
41 | <el-col :span="8"> | ||
42 | <el-form-item label="审核结束时间" prop="shjssj"> | ||
43 | {{ ruleForm.shjssj }} | 38 | {{ ruleForm.shjssj }} |
44 | </el-form-item> | 39 | </el-form-item> |
45 | </el-col> | 40 | </el-col> |
... | @@ -53,8 +48,8 @@ | ... | @@ -53,8 +48,8 @@ |
53 | <div class="item_right"> | 48 | <div class="item_right"> |
54 | <el-row> | 49 | <el-row> |
55 | <el-col :span="24"> | 50 | <el-col :span="24"> |
56 | <el-form-item label-width="0" class="opinion_item" prop="csyj"> | 51 | <el-form-item label-width="0" class="opinion_item" prop="shyj"> |
57 | <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.csyj"> | 52 | <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.shyj"> |
58 | </el-input> | 53 | </el-input> |
59 | <el-popover placement="right" width="50" trigger="hover"> | 54 | <el-popover placement="right" width="50" trigger="hover"> |
60 | <ul class="pointer"> | 55 | <ul class="pointer"> |
... | @@ -68,18 +63,13 @@ | ... | @@ -68,18 +63,13 @@ |
68 | </el-row> | 63 | </el-row> |
69 | 64 | ||
70 | <el-row> | 65 | <el-row> |
71 | <el-col :span="8"> | 66 | <el-col :span="16"> |
72 | <el-form-item label="审查人" prop="scr"> | 67 | <el-form-item label="审查人:" prop="scr"> |
73 | {{ ruleForm.scr }} | 68 | {{ ruleForm.shryxm }} |
74 | </el-form-item> | 69 | </el-form-item> |
75 | </el-col> | 70 | </el-col> |
76 | <el-col :span="8"> | 71 | <el-col :span="8"> |
77 | <el-form-item label="审核开始时间" prop="shkssj"> | 72 | <el-form-item label="审核时间:" prop="shjssj"> |
78 | {{ ruleForm.shkssj }} | ||
79 | </el-form-item> | ||
80 | </el-col> | ||
81 | <el-col :span="8"> | ||
82 | <el-form-item label="审核结束时间" prop="shjssj"> | ||
83 | {{ ruleForm.shjssj }} | 73 | {{ ruleForm.shjssj }} |
84 | </el-form-item> | 74 | </el-form-item> |
85 | </el-col> | 75 | </el-col> |
... | @@ -93,8 +83,8 @@ | ... | @@ -93,8 +83,8 @@ |
93 | <div class="item_right"> | 83 | <div class="item_right"> |
94 | <el-row> | 84 | <el-row> |
95 | <el-col :span="24"> | 85 | <el-col :span="24"> |
96 | <el-form-item label-width="0" class="opinion_item" prop="csyj"> | 86 | <el-form-item label-width="0" class="opinion_item" prop="shyj"> |
97 | <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.csyj"> | 87 | <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入内容" v-model="ruleForm.shyj"> |
98 | </el-input> | 88 | </el-input> |
99 | <el-popover placement="right" width="50" trigger="hover"> | 89 | <el-popover placement="right" width="50" trigger="hover"> |
100 | <ul class="pointer"> | 90 | <ul class="pointer"> |
... | @@ -108,18 +98,13 @@ | ... | @@ -108,18 +98,13 @@ |
108 | </el-row> | 98 | </el-row> |
109 | 99 | ||
110 | <el-row> | 100 | <el-row> |
111 | <el-col :span="8"> | 101 | <el-col :span="16"> |
112 | <el-form-item label="审查人" prop="scr"> | 102 | <el-form-item label="审查人:" prop="scr"> |
113 | {{ ruleForm.scr }} | 103 | {{ ruleForm.shryxm }} |
114 | </el-form-item> | 104 | </el-form-item> |
115 | </el-col> | 105 | </el-col> |
116 | <el-col :span="8"> | 106 | <el-col :span="8"> |
117 | <el-form-item label="审核开始时间" prop="shkssj"> | 107 | <el-form-item label="审核时间:" prop="shjssj"> |
118 | {{ ruleForm.shkssj }} | ||
119 | </el-form-item> | ||
120 | </el-col> | ||
121 | <el-col :span="8"> | ||
122 | <el-form-item label="审核结束时间" prop="shjssj"> | ||
123 | {{ ruleForm.shjssj }} | 108 | {{ ruleForm.shjssj }} |
124 | </el-form-item> | 109 | </el-form-item> |
125 | </el-col> | 110 | </el-col> |
... | @@ -127,32 +112,60 @@ | ... | @@ -127,32 +112,60 @@ |
127 | </div> | 112 | </div> |
128 | </div> | 113 | </div> |
129 | <div class="submit_button"> | 114 | <div class="submit_button"> |
130 | <el-button type="primary">保存</el-button> | 115 | <el-button type="primary" @click="onSubmit">保存</el-button> |
131 | </div> | 116 | </div> |
132 | </el-form> | 117 | </el-form> |
133 | </div> | 118 | </div> |
134 | </template> | 119 | </template> |
135 | <script> | 120 | <script> |
136 | 121 | import { getSpyjList,saveSpyj } from "@/api/fqsq.js"; | |
137 | export default { | 122 | export default { |
138 | components: {}, | 123 | components: {}, |
124 | props: { | ||
125 | bsmBusiness:{type:String}, | ||
126 | bestepid: {type:String} | ||
127 | }, | ||
139 | data () { | 128 | data () { |
140 | return { | 129 | return { |
141 | ruleForm: { | 130 | ruleForm: { |
142 | csyj: '', | 131 | shyj: '', |
143 | scr: '', | 132 | bsmBusiness: this.bsmBusiness, |
133 | stepid: this.bestepid | ||
144 | }, | 134 | }, |
145 | rules: { | 135 | rules: { |
146 | csyj: [ | 136 | shyj: [ |
147 | { required: true, message: '请输入审批意见', trigger: 'blur' } | 137 | { required: true, message: '请输入审批意见', trigger: 'blur' } |
148 | ], | 138 | ], |
149 | } | 139 | }, |
140 | unitData: [] | ||
150 | } | 141 | } |
151 | }, | 142 | }, |
152 | methods: { | 143 | methods: { |
153 | handleClick () { | 144 | handleClick () { |
154 | console.log(1) | 145 | console.log(1) |
155 | } | 146 | }, |
147 | //审批意见数据初始化 | ||
148 | list (bsmBusiness,bestepid) { | ||
149 | var formdata = new FormData(); | ||
150 | formdata.append("bsmBusiness", bsmBusiness); | ||
151 | formdata.append("bestepid", bestepid); | ||
152 | getSpyjList(formdata).then((res) => { | ||
153 | if (res.code === 200 && res.result) { | ||
154 | this.ruleForm = {...res.result[0]} | ||
155 | } | ||
156 | }) | ||
157 | }, | ||
158 | onSubmit () { | ||
159 | saveSpyj(this.ruleForm).then(res => { | ||
160 | if (res.code === 200) { | ||
161 | |||
162 | }else{ | ||
163 | this.$message.error(res.message) | ||
164 | } | ||
165 | }) | ||
166 | |||
167 | }, | ||
168 | |||
156 | }, | 169 | }, |
157 | } | 170 | } |
158 | </script> | 171 | </script> | ... | ... |
... | @@ -185,12 +185,21 @@ export default { | ... | @@ -185,12 +185,21 @@ export default { |
185 | } | 185 | } |
186 | }, | 186 | }, |
187 | // 左侧列表点击调用接口 | 187 | // 左侧列表点击调用接口 |
188 | unitClick(item) { | 188 | unitClick (item) { |
189 | this.taskId = item.taskId; | 189 | this.taskId = item.taskId |
190 | this.bsmBusiness = item.bsmBusiness; | 190 | this.bsmBusiness = item.bsmBusiness |
191 | this.$nextTick(() => { | 191 | var activeTabName = this.activeName |
192 | this.$refs.slxx[0].list(item.bsmSldy); | 192 | if(activeTabName == 'slxx'){ |
193 | }); | 193 | //受理信息页面接口调取 |
194 | this.$nextTick(() => { | ||
195 | this.$refs.slxx[0].list(item.bsmSldy) | ||
196 | }) | ||
197 | }else if(activeTabName == 'spyj'){ | ||
198 | //审批页面接口调取 | ||
199 | this.$nextTick(() => { | ||
200 | this.$refs.spyj[0].list(this.bsmBusiness,this.queryForm.bestepid) | ||
201 | }) | ||
202 | } | ||
194 | }, | 203 | }, |
195 | operation(index, item) { | 204 | operation(index, item) { |
196 | let that = this; | 205 | let that = this; | ... | ... |
src/views/ywbl/ywsq/ywsqdata.js
deleted
100644 → 0
1 | import filter from '@/utils/filter.js' | ||
2 | let vm = null | ||
3 | |||
4 | const sendThis = (_this) => { | ||
5 | vm = _this | ||
6 | } | ||
7 | class data extends filter { | ||
8 | constructor() { | ||
9 | super() | ||
10 | } | ||
11 | columns () { | ||
12 | return [ | ||
13 | { | ||
14 | type: 'selection', | ||
15 | label: '全选' | ||
16 | }, | ||
17 | { | ||
18 | label: '序号', | ||
19 | type: 'index', | ||
20 | width: '50', | ||
21 | render: (h, scope) => { | ||
22 | return ( | ||
23 | <div> | ||
24 | {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1} | ||
25 | </div> | ||
26 | ) | ||
27 | } | ||
28 | }, | ||
29 | { | ||
30 | prop: "status", | ||
31 | label: "状态", | ||
32 | }, | ||
33 | { | ||
34 | prop: "qllx", | ||
35 | label: "权利类型", | ||
36 | }, | ||
37 | { | ||
38 | prop: "zddm", | ||
39 | label: "宗地代码", | ||
40 | }, | ||
41 | { | ||
42 | prop: "bdcdyh", | ||
43 | label: "不动产单元号", | ||
44 | }, | ||
45 | { | ||
46 | prop: "qlxz", | ||
47 | label: "权利性质", | ||
48 | }, | ||
49 | { | ||
50 | prop: "zdmj", | ||
51 | label: "宗地面积", | ||
52 | }, | ||
53 | { | ||
54 | prop: "qlsdfs", | ||
55 | label: "权利设定方式", | ||
56 | }, | ||
57 | { | ||
58 | prop: "tdyt", | ||
59 | label: "土地用途", | ||
60 | }, | ||
61 | { | ||
62 | prop: "zl", | ||
63 | label: "坐落", | ||
64 | }, | ||
65 | ] | ||
66 | } | ||
67 | |||
68 | |||
69 | } | ||
70 | let datas = new data() | ||
71 | export { | ||
72 | datas, | ||
73 | sendThis | ||
74 | } |
-
Please register or sign in to post a comment