Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
184f471c by renchao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 1fd6d06f 335c8231
Expand all
Inline Side-by-side
Showing 15 changed files with 343 additions and 147 deletions
...@@ -128,3 +128,15 @@ export function getZtQlxx (params) { ...@@ -128,3 +128,15 @@ export function getZtQlxx (params) {
128 data 128 data
129 }) 129 })
130 } 130 }
131 /**
132 * @description: 添加审核意见
133 * @param {*} data
134 * @author: renchao
135 */
136 export function addidea (data) {
137 return request({
138 url: SERVER.SERVERAPI + '/rest/djbRepair/sh',
139 method: 'post',
140 data
141 })
142 }
......
...@@ -124,6 +124,7 @@ export default { ...@@ -124,6 +124,7 @@ export default {
124 //读取申请单元信息 124 //读取申请单元信息
125 loadBdcdylist(add) { 125 loadBdcdylist(add) {
126 var formdata = new FormData(); 126 var formdata = new FormData();
127 if(this.bsmSlsq){
127 formdata.append("bsmSlsq", this.bsmSlsq); 128 formdata.append("bsmSlsq", this.bsmSlsq);
128 formdata.append("bestepid", this.bestepid); 129 formdata.append("bestepid", this.bestepid);
129 leftMenu(formdata).then((res) => { 130 leftMenu(formdata).then((res) => {
...@@ -135,6 +136,8 @@ export default { ...@@ -135,6 +136,8 @@ export default {
135 } 136 }
136 } 137 }
137 }); 138 });
139 }
140
138 141
139 }, 142 },
140 // 获取右侧菜单 143 // 获取右侧菜单
......
...@@ -59,16 +59,17 @@ ...@@ -59,16 +59,17 @@
59 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" /> 59 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
60 <el-table-column label="流程状态" header-align="center" align="center"> 60 <el-table-column label="流程状态" header-align="center" align="center">
61 <template slot-scope="scope"> 61 <template slot-scope="scope">
62 <div v-if="scope.row.finishTime == null">正在办理</div> 62 <div v-if="scope.row.endTime">已完结</div>
63 <div v-else>已完结</div> 63 <div v-else>正在办理</div>
64 </template> 64 </template>
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" /> 69 <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
70 <el-table-column label="操作方式" align="center"> 70 <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
71 </el-table-column> 71 <el-table-column label="操作方式" prop="controls" align="center"/>
72 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 73 </el-table>
73 </div> 74 </div>
74 </div> 75 </div>
...@@ -118,6 +119,14 @@ ...@@ -118,6 +119,14 @@
118 this.clearViewer() 119 this.clearViewer()
119 }, 120 },
120 methods: { 121 methods: {
122 formatDate(row, column) {
123 let data = row[column.property]
124 if(data == null) {
125 return null
126 }
127 let dt = new Date(data)
128 return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
129 },
121 processReZoom () { 130 processReZoom () {
122 this.defaultZoom = 1 131 this.defaultZoom = 1
123 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto') 132 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
...@@ -237,13 +246,32 @@ ...@@ -237,13 +246,32 @@
237 // 获取流程记录 246 // 获取流程记录
238 getCommentList() { 247 getCommentList() {
239 this.formData.allCommentList.forEach(async (item,index) => { 248 this.formData.allCommentList.forEach(async (item,index) => {
249 item.comments.forEach(element => {
250 if(element.type=="COMPLETE"){
251 this.formData.allCommentList[index].idea=element.message
252 this.formData.allCommentList[index].controls="完成"
253 }
254 });
240 this.formData.allCommentList[index].agent=item.assignee.name 255 this.formData.allCommentList[index].agent=item.assignee.name
241 }) 256 })
242 setTimeout(() => { 257 this.formData.handlinglist.forEach(async (item,index) => {
243 this.taskList =this.formData.allCommentList; 258 if(item.assignee.name){
259 this.formData.handlinglist[index].agent=item.assignee.name
260 }else{
261 let str=""
262 item.countersign.forEach((item) => {
263 str+=item.name+","
264 })
265 str=str.slice(0, -1);
266 this.formData.allCommentList[index].agent=str
267 }
268
269 })
270 this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
271 // this.taskList =this.formData.allCommentList;
244 // 处理数据之后赋值 272 // 处理数据之后赋值
245 this.taskCommentList=this.taskList 273 this.taskCommentList=this.taskList
246 }, 100) 274
247 }, 275 },
248 276
249 // 设置流程图元素状态 277 // 设置流程图元素状态
......
...@@ -373,8 +373,8 @@ ...@@ -373,8 +373,8 @@
373 v-model="ruleForm.qlxx.djsj" 373 v-model="ruleForm.qlxx.djsj"
374 type="date" 374 type="date"
375 placeholder="选择日期" 375 placeholder="选择日期"
376 value-format="yyyy/MM/dd HH:mm:ss" 376 value-format="yyyy-MM-dd HH:mm:ss"
377 format="yyyy/MM/dd" 377 format="yyyy-MM-dd"
378 > 378 >
379 </el-date-picker> 379 </el-date-picker>
380 </el-form-item> 380 </el-form-item>
...@@ -471,7 +471,7 @@ ...@@ -471,7 +471,7 @@
471 /> 471 />
472 </div> 472 </div>
473 </div> 473 </div>
474 <el-row class="btn"> 474 <el-row class="btn" v-if="!$route.query.viewtype">
475 <el-form-item> 475 <el-form-item>
476 <el-button type="primary" @click="onSubmit">保存</el-button> 476 <el-button type="primary" @click="onSubmit">保存</el-button>
477 </el-form-item> 477 </el-form-item>
......
...@@ -110,7 +110,14 @@ ...@@ -110,7 +110,14 @@
110 </el-col> 110 </el-col>
111 <el-col :span="8"> 111 <el-col :span="8">
112 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules"> 112 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
113 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 113 <el-date-picker
114 v-model="ruleForm.qlxx.djsj"
115 type="date"
116 placeholder="选择日期"
117 value-format="yyyy-MM-dd HH:mm:ss"
118 format="yyyy-MM-dd"
119 >
120 </el-date-picker>
114 </el-form-item> 121 </el-form-item>
115 </el-col> 122 </el-col>
116 <el-col :span="8"> 123 <el-col :span="8">
...@@ -253,7 +260,7 @@ ...@@ -253,7 +260,7 @@
253 /> 260 />
254 </div> 261 </div>
255 </div> 262 </div>
256 <el-row class="btn"> 263 <el-row class="btn" v-if="!$route.query.viewtype">
257 <el-form-item> 264 <el-form-item>
258 <el-button type="primary" @click="onSubmit">保存</el-button> 265 <el-button type="primary" @click="onSubmit">保存</el-button>
259 </el-form-item> 266 </el-form-item>
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <el-form-item label="登记类型："> 69 <el-form-item label="登记类型：">
70 <el-select v-model="ruleForm.qlxx.djlx"> 70 <el-select v-model="ruleForm.qlxx.djlx">
71 <el-option 71 <el-option
72 v-for="item in dictData['A21']" 72 v-for="item in djlxlist"
73 :key="item.dcode" 73 :key="item.dcode"
74 :label="item.dname" 74 :label="item.dname"
75 :value="item.dcode" 75 :value="item.dcode"
...@@ -219,28 +219,35 @@ ...@@ -219,28 +219,35 @@
219 </el-col> 219 </el-col>
220 220
221 <el-col :span="8"> 221 <el-col :span="8">
222 <el-form-item label="不动产权证号："> 222 <el-form-item label="不动产权证号：" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules">
223 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 223 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
224 </el-form-item> 224 </el-form-item>
225 </el-col> 225 </el-col>
226 <el-col :span="8"> 226 <el-col :span="8">
227 <el-form-item label="区县代码："> 227 <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
228 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 228 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
229 </el-form-item> 229 </el-form-item>
230 </el-col> 230 </el-col>
231 <el-col :span="8"> 231 <el-col :span="8">
232 <el-form-item label="登记机构："> 232 <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
233 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 233 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
234 </el-form-item> 234 </el-form-item>
235 </el-col> 235 </el-col>
236 <el-col :span="8"> 236 <el-col :span="8">
237 <el-form-item label="登簿人："> 237 <el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules">
238 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 238 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
239 </el-form-item> 239 </el-form-item>
240 </el-col> 240 </el-col>
241 <el-col :span="8"> 241 <el-col :span="8">
242 <el-form-item label="登记时间："> 242 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
243 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 243 <el-date-picker
244 v-model="ruleForm.qlxx.djsj"
245 type="date"
246 placeholder="选择日期"
247 value-format="yyyy-MM-dd HH:mm:ss"
248 format="yyyy-MM-dd"
249 >
250 </el-date-picker>
244 </el-form-item> 251 </el-form-item>
245 </el-col> 252 </el-col>
246 </el-row> 253 </el-row>
...@@ -328,7 +335,7 @@ ...@@ -328,7 +335,7 @@
328 /> 335 />
329 </div> 336 </div>
330 </div> 337 </div>
331 <el-row class="btn"> 338 <el-row class="btn" v-if="!$route.query.viewtype">
332 <el-form-item> 339 <el-form-item>
333 <el-button type="primary" @click="onSubmit">保存</el-button> 340 <el-button type="primary" @click="onSubmit">保存</el-button>
334 </el-form-item> 341 </el-form-item>
...@@ -366,6 +373,34 @@ export default { ...@@ -366,6 +373,34 @@ export default {
366 373
367 //表单是否可操作 374 //表单是否可操作
368 propsParam: this.$attrs, 375 propsParam: this.$attrs,
376 // 登记类型
377 djlxlist: [
378 {
379 dcode: "100",
380 dname: "首次登记",
381 },
382 {
383 dcode: "200",
384 dname: "转移登记",
385 },
386 {
387 dcode: "300",
388 dname: "变更登记",
389 },
390 {
391 dcode: "500",
392 dname: "更正登记",
393 },
394
395 {
396 dcode: "901",
397 dname: "补证",
398 },
399 {
400 dcode: "902",
401 dname: "换证",
402 },
403 ],
369 // 权属状态 404 // 权属状态
370 qsztlist: [ 405 qsztlist: [
371 { 406 {
...@@ -384,7 +419,15 @@ export default { ...@@ -384,7 +419,15 @@ export default {
384 czrOptions: [], 419 czrOptions: [],
385 ruleForm: {}, 420 ruleForm: {},
386 //传递参数\ 421 //传递参数\
387 rules: {}, 422 rules: {
423 bdcqzhrules:[
424 { required: true, message: "不动产权证号：", trigger: "change" },
425 ],
426 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
427 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
428 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
429 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
430 },
388 }; 431 };
389 }, 432 },
390 created() { 433 created() {
...@@ -393,6 +436,7 @@ export default { ...@@ -393,6 +436,7 @@ export default {
393 mounted() {}, 436 mounted() {},
394 methods: { 437 methods: {
395 loadData() { 438 loadData() {
439
396 this.propsParam.isEdit=this.$parent.isEdit 440 this.propsParam.isEdit=this.$parent.isEdit
397 init(this.propsParam).then((res) => { 441 init(this.propsParam).then((res) => {
398 if (res.code == 200) { 442 if (res.code == 200) {
...@@ -423,6 +467,8 @@ export default { ...@@ -423,6 +467,8 @@ export default {
423 this.key++; 467 this.key++;
424 }, 468 },
425 onSubmit() { 469 onSubmit() {
470 this.$refs.ruleForm.validate((valid) => {
471 if (valid) {
426 if (this.ruleForm.qlrData.length == 0) { 472 if (this.ruleForm.qlrData.length == 0) {
427 this.$message({ 473 this.$message({
428 showClose: true, 474 showClose: true,
...@@ -496,7 +542,11 @@ export default { ...@@ -496,7 +542,11 @@ export default {
496 type: "error", 542 type: "error",
497 }); 543 });
498 } 544 }
545 }); } else {
546 return false;
547 }
499 }); 548 });
549
500 }, 550 },
501 }, 551 },
502 }; 552 };
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <el-form-item label="登记类型："> 69 <el-form-item label="登记类型：">
70 <el-select v-model="ruleForm.qlxx.djlx"> 70 <el-select v-model="ruleForm.qlxx.djlx">
71 <el-option 71 <el-option
72 v-for="item in dictData['A21']" 72 v-for="item in djlxlist"
73 :key="item.dcode" 73 :key="item.dcode"
74 :label="item.dname" 74 :label="item.dname"
75 :value="item.dcode" 75 :value="item.dcode"
...@@ -148,28 +148,55 @@ ...@@ -148,28 +148,55 @@
148 </el-col> 148 </el-col>
149 149
150 <el-col :span="8"> 150 <el-col :span="8">
151 <el-form-item label="不动产权证号："> 151 <el-form-item
152 label="不动产权证号："
153 prop="qlxx.bdcqzh"
154 :rules="rules.bdcqzhrules"
155 >
152 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 156 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
153 </el-form-item> 157 </el-form-item>
154 </el-col> 158 </el-col>
155 <el-col :span="8"> 159 <el-col :span="8">
156 <el-form-item label="区县代码："> 160 <el-form-item
161 label="区县代码："
162 prop="qlxx.qxdm"
163 :rules="rules.qxdmrules"
164 >
157 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 165 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
158 </el-form-item> 166 </el-form-item>
159 </el-col> 167 </el-col>
160 <el-col :span="8"> 168 <el-col :span="8">
161 <el-form-item label="登记机构："> 169 <el-form-item
170 label="登记机构："
171 prop="qlxx.djjg"
172 :rules="rules.djjgrules"
173 >
162 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 174 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
163 </el-form-item> 175 </el-form-item>
164 </el-col> 176 </el-col>
165 <el-col :span="8"> 177 <el-col :span="8">
166 <el-form-item label="登簿人："> 178 <el-form-item
179 label="登簿人："
180 prop="qlxx.dbr"
181 :rules="rules.dbrrules"
182 >
167 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 183 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
168 </el-form-item> 184 </el-form-item>
169 </el-col> 185 </el-col>
170 <el-col :span="8"> 186 <el-col :span="8">
171 <el-form-item label="登记时间："> 187 <el-form-item
172 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 188 label="登记时间："
189 prop="qlxx.djsj"
190 :rules="rules.djsjrules"
191 >
192 <el-date-picker
193 v-model="ruleForm.qlxx.djsj"
194 type="date"
195 placeholder="选择日期"
196 value-format="yyyy-MM-dd HH:mm:ss"
197 format="yyyy-MM-dd"
198 >
199 </el-date-picker>
173 </el-form-item> 200 </el-form-item>
174 </el-col> 201 </el-col>
175 </el-row> 202 </el-row>
...@@ -253,7 +280,7 @@ ...@@ -253,7 +280,7 @@
253 /> 280 />
254 </div> 281 </div>
255 </div> 282 </div>
256 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> 283 <el-row class="btn" v-if="!$route.query.viewtype">
257 <el-form-item> 284 <el-form-item>
258 <el-button type="primary" @click="onSubmit">保存</el-button> 285 <el-button type="primary" @click="onSubmit">保存</el-button>
259 </el-form-item> 286 </el-form-item>
...@@ -289,6 +316,34 @@ export default { ...@@ -289,6 +316,34 @@ export default {
289 propsParam: this.$attrs, 316 propsParam: this.$attrs,
290 ableOperation: true, 317 ableOperation: true,
291 key: 0, 318 key: 0,
319 // 登记类型
320 djlxlist: [
321 {
322 dcode: "100",
323 dname: "首次登记",
324 },
325 {
326 dcode: "200",
327 dname: "转移登记",
328 },
329 {
330 dcode: "300",
331 dname: "变更登记",
332 },
333 {
334 dcode: "500",
335 dname: "更正登记",
336 },
337
338 {
339 dcode: "901",
340 dname: "补证",
341 },
342 {
343 dcode: "902",
344 dname: "换证",
345 },
346 ],
292 // 权属状态 347 // 权属状态
293 qsztlist: [ 348 qsztlist: [
294 { 349 {
...@@ -300,13 +355,21 @@ export default { ...@@ -300,13 +355,21 @@ export default {
300 dname: "历史", 355 dname: "历史",
301 }, 356 },
302 ], 357 ],
303 tdxz:null, 358 tdxz: null,
304 isShow: false, 359 isShow: false,
305 disabled: true, 360 disabled: true,
306 czrOptions: [], 361 czrOptions: [],
307 ruleForm: {}, 362 ruleForm: {},
308 //传递参数\ 363 //传递参数\
309 rules: {}, 364 rules: {
365 bdcqzhrules: [
366 { required: true, message: "不动产权证号：", trigger: "change" },
367 ],
368 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
369 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
370 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
371 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
372 },
310 }; 373 };
311 }, 374 },
312 created() { 375 created() {
...@@ -319,14 +382,15 @@ export default { ...@@ -319,14 +382,15 @@ export default {
319 return store.getters.dictData[val]; 382 return store.getters.dictData[val];
320 }, 383 },
321 loadData() { 384 loadData() {
322 this.propsParam.isEdit=this.$parent.isEdit 385
386 this.propsParam.isEdit = this.$parent.isEdit;
323 init(this.propsParam).then((res) => { 387 init(this.propsParam).then((res) => {
324 if (res.code == 200) { 388 if (res.code == 200) {
325 this.ruleForm = res.result; 389 this.ruleForm = res.result;
326 if( this.ruleForm.tdytqxList.length>0){ 390 if (this.ruleForm.tdytqxList.length > 0) {
327 this.tdxz=this.ruleForm.tdytqxList[0].qlxzbm 391 this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
328 }else{ 392 } else {
329 this.tdxz=null 393 this.tdxz = null;
330 } 394 }
331 this.isShow = true; 395 this.isShow = true;
332 } 396 }
...@@ -349,6 +413,8 @@ export default { ...@@ -349,6 +413,8 @@ export default {
349 this.key++; 413 this.key++;
350 }, 414 },
351 onSubmit() { 415 onSubmit() {
416 this.$refs.ruleForm.validate((valid) => {
417 if (valid) {
352 if (this.ruleForm.qlrData.length == 0) { 418 if (this.ruleForm.qlrData.length == 0) {
353 this.$message({ 419 this.$message({
354 showClose: true, 420 showClose: true,
...@@ -402,6 +468,10 @@ export default { ...@@ -402,6 +468,10 @@ export default {
402 }); 468 });
403 } 469 }
404 }); 470 });
471 } else {
472 return false;
473 }
474 });
405 }, 475 },
406 }, 476 },
407 }; 477 };
......
...@@ -111,7 +111,14 @@ ...@@ -111,7 +111,14 @@
111 </el-col> 111 </el-col>
112 <el-col :span="8"> 112 <el-col :span="8">
113 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules"> 113 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
114 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 114 <el-date-picker
115 v-model="ruleForm.qlxx.djsj"
116 type="date"
117 placeholder="选择日期"
118 value-format="yyyy-MM-dd HH:mm:ss"
119 format="yyyy-MM-dd"
120 >
121 </el-date-picker>
115 </el-form-item> 122 </el-form-item>
116 </el-col> 123 </el-col>
117 <el-col :span="8"> 124 <el-col :span="8">
...@@ -292,7 +299,7 @@ ...@@ -292,7 +299,7 @@
292 /> 299 />
293 </div> 300 </div>
294 </div> 301 </div>
295 <el-row class="btn"> 302 <el-row class="btn" v-if="!$route.query.viewtype">
296 <el-form-item> 303 <el-form-item>
297 <el-button type="primary" @click="onSubmit">保存</el-button> 304 <el-button type="primary" @click="onSubmit">保存</el-button>
298 </el-form-item> 305 </el-form-item>
......
...@@ -110,7 +110,14 @@ ...@@ -110,7 +110,14 @@
110 </el-col> 110 </el-col>
111 <el-col :span="8"> 111 <el-col :span="8">
112 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules"> 112 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
113 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 113 <el-date-picker
114 v-model="ruleForm.qlxx.djsj"
115 type="date"
116 placeholder="选择日期"
117 value-format="yyyy-MM-dd HH:mm:ss"
118 format="yyyy-MM-dd"
119 >
120 </el-date-picker>
114 </el-form-item> 121 </el-form-item>
115 </el-col> 122 </el-col>
116 <el-col :span="8"> 123 <el-col :span="8">
...@@ -154,7 +161,14 @@ ...@@ -154,7 +161,14 @@
154 </el-col> 161 </el-col>
155 <el-col :span="8"> 162 <el-col :span="8">
156 <el-form-item label="注销异议登记时间"> 163 <el-form-item label="注销异议登记时间">
157 <el-input v-model="ruleForm.yydj.zxyydjsj"></el-input> 164 <el-date-picker
165 v-model="ruleForm.yydj.zxyydjsj"
166 type="date"
167 placeholder="选择日期"
168 value-format="yyyy-MM-dd HH:mm:ss"
169 format="yyyy-MM-dd"
170 >
171 </el-date-picker>
158 </el-form-item> 172 </el-form-item>
159 </el-col> 173 </el-col>
160 <el-col :span="8"> 174 <el-col :span="8">
...@@ -203,8 +217,7 @@ ...@@ -203,8 +217,7 @@
203 /> 217 />
204 </div> 218 </div>
205 </div> 219 </div>
206 <!-- <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> --> 220 <el-row class="btn" v-if="!$route.query.viewtype">
207 <el-row class="btn">
208 <el-form-item> 221 <el-form-item>
209 <el-button type="primary" @click="onSubmit">保存</el-button> 222 <el-button type="primary" @click="onSubmit">保存</el-button>
210 </el-form-item> 223 </el-form-item>
......
...@@ -4,140 +4,143 @@ ...@@ -4,140 +4,143 @@
4 * @LastEditTime: 2023-05-17 10:41:24 4 * @LastEditTime: 2023-05-17 10:41:24
5 --> 5 -->
6 <template> 6 <template>
7 <div class='spyj loadingtext'> 7 <div class="spyj loadingtext">
8 <div class="box"> 8 <div class="box">
9 <b class="spyj_title">审批表</b> 9 <b class="spyj_title">审批表</b>
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <div v-for="(item, index) in tableData" :key="index">
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 <el-form :model="tableData[index]" label-width="120px" :rules="rules" :ref="'ruleFormRef'+index">
12 <div class="item_left"> 12 <div class="spyj_form" >
13 {{ item.jdmc }}意见 13 <div class="item_left">{{ item.jdmc }}意见</div>
14 </div>
15 <div class="item_right"> 14 <div class="item_right">
16 <el-row> 15 <el-row>
17 <el-col :span="24"> 16 <el-col :span="24">
18 <el-form-item label-width="0" class="opinion_item" prop="shyj"> 17 <el-form-item
19 <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见" 18 label-width="0"
20 v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input> 19 class="opinion_item"
21 <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true"> 20 prop="shyj"
22 </el-input> 21 >
23 <el-button class="opinion_btn" @click="commonOpinion" 22 <el-input
24 v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button> 23 type="textarea"
24 :rows="4"
25 class="opinion"
26 placeholder="请输入审批意见"
27 v-model="item.shyj"
28 ></el-input>
25 </el-form-item> 29 </el-form-item>
26 </el-col> 30 </el-col>
27 </el-row> 31 </el-row>
28 <el-row> 32 <el-row>
29 <el-col :span="16"> 33 <el-col :span="16">
30 <el-form-item label="审查人" prop="shryxm"> 34 <el-form-item
31 {{ item.shryxm }} 35 label="审查人"
36 prop="shryxm"
37 >
38 <el-input v-model="item.shryxm"></el-input>
32 </el-form-item> 39 </el-form-item>
33 </el-col> 40 </el-col>
34 <el-col :span="8"> 41 <el-col :span="8">
35 <el-form-item label="审核时间" prop="shjssj" :key="refresh"> 42 <el-form-item
36 {{ item.shjssj }} 43 label="审核时间"
44 prop="shsj"
45 >
46 <el-date-picker
47 v-model="item.shsj"
48 type="date"
49 placeholder="选择日期"
50 value-format="yyyy/MM/dd HH:mm:ss"
51 format="yyyy/MM/dd"
52 >
53 </el-date-picker>
37 </el-form-item> 54 </el-form-item>
38 </el-col> 55 </el-col>
39 </el-row> 56 </el-row>
40 </div> 57 </div>
41 </div> 58 </div>
42 <div class="submit_button" v-if="ableOperation">
43 <el-button type="primary" @click="onSubmit">保存</el-button>
44 </div>
45 </el-form> 59 </el-form>
46 </div> 60 </div>
47 <el-empty v-if="isNoData" description="暂无数据"></el-empty> 61 <div class="submit_button" v-if="!$route.query.viewtype">
62 <el-button type="primary" @click="onSubmit('ruleFormRef')">保存</el-button>
63 </div>
64 </div>
65 <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
48 </div> 66 </div>
49 </template> 67 </template>
50 <script> 68 <script>
51 import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/fqsq.js"; 69 import { addidea } from "@/api/djbbl.js";
52 import { mapGetters } from 'vuex' 70 import { mapGetters } from "vuex";
53 export default { 71 export default {
54 computed: { 72 computed: {
55 ...mapGetters(['userData', 'yjsqOptions']) 73 ...mapGetters(["userData", "yjsqOptions"]),
56 }, 74 },
57 data () { 75 data() {
58 return { 76 return {
59 isNoData: false, 77 isNoData: false,
60 bsmSlsq: '',
61 //刷新值
62 refresh: 10,
63 ableOperation: true, 78 ableOperation: true,
64 bsmSlsq: this.$route.query.bsmSlsq, 79
65 bestepid: this.$route.query.bestepid, 80 tableData: [{ jdmc: "初审" }, { jdmc: "复审" }, { jdmc: "核定" }],
66 ruleForm: {}, 81
67 rules: { 82 rules: {
68 shyj: [ 83 shyj: [{ required: true, message: "请填写意见", trigger: "blur" }],
69 { required: true, message: '请输入审批意见', trigger: 'blur' } 84 shryxm: [{ required: true, message: "审查人", trigger: "blur" }],
70 ], 85 shsj: [{ required: true, message: "审核时间", trigger: "blur" }],
71 },
72 tableData: [],
73 propsParam: {}
74 }
75 },
76 watch: {
77 yjsqOptions: {
78 handler (val) {
79 this.ruleForm.shyj = val
80 },
81 deep: true,
82 immediate: true
83 }, 86 },
87 };
84 }, 88 },
85 mounted () { 89
86 this.propsParam = this.$attrs; 90 watch: {},
87 if (this.$route.query.viewtype) { 91 created() {},
88 this.ableOperation = false 92 mounted() {},
89 }
90 this.list();
91 },
92 methods: { 93 methods: {
93 //审批意见数据初始化 94 onSubmit(formName) {
94 list () { 95 const falg = []
95 let that = this 96 for (let index = 0; index < this.tableData.length; index++) {
96 this.$startLoading() 97 this.$refs[formName + index][0].validate((valid) => {
97 var formdata = new FormData(); 98 if (valid) {
98 formdata.append("bsmBusiness", this.propsParam.bsmRepair); 99 falg.push(1)
99 formdata.append("bestepid", this.$route.query.bestepid); 100 }
100 formdata.append("ableOperation", this.ableOperation) 101 });
101 getSpyjList(formdata).then((res) => { 102 }
102 this.$endLoading() 103 if (falg.length == this.tableData.length) {
103 if (res.code === 200 && res.result) { 104 this.tableData.forEach((item, index) => {
104 console.log("this.tableData this.tableData this.tableData ",this.tableData ); 105 item["bsmBusiness"] = this.$parent.bsmRepair;
105 this.tableData = res.result ? res.result : [] 106 }),
106 console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData); 107 addidea(this.tableData).then((res) => {
107 if (res.result.length == 0) {
108 that.isNoData = true
109 }
110 this.ruleForm = res.result[res.result.length - 1]
111 }
112 })
113 },
114 onSubmit () {
115 this.ruleForm.bsmSlsq = this.bsmSlsq
116 this.ruleForm.bestepid = this.bestepid
117 saveSpyjBySlsq(this.ruleForm).then(res => {
118 if (res.code === 200) { 108 if (res.code === 200) {
119 this.$message.success("保存成功") 109 this.$message.success("保存成功");
120 this.refresh += 1 110 this.refresh += 1;
111 } else {
112 this.$message.error(res.message);
113 }
114 });
115 alert(1)
121 } else { 116 } else {
122 this.$message.error(res.message) 117 return false;
123 } 118 }
124 })
125 }, 119 },
126 //打开常用意见列表弹窗 120 // onSubmit() {
127 commonOpinion () { 121 // this.$refs.tablelist[index].validate((valid) => {
128 this.$popupDialog("常用意见", "djbworkflow/components/dialog/commonOpinion", {}, "70%", true) 122 // if (valid) {
123 // this.tableData.forEach((item, index) => {
124 // item["bsmBusiness"] = this.$parent.bsmRepair;
125 // }),
126 // addidea(this.tableData).then((res) => {
127 // if (res.code === 200) {
128 // this.$message.success("保存成功");
129 // this.refresh += 1;
130 // } else {
131 // this.$message.error(res.message);
132 // }
133 // });
134 // }
135 // });
136 // },
129 }, 137 },
130 //使用常用意见 138 };
131 useOpinion (opinion) {
132 this.ruleForm.shyj = opinion
133 }
134 }
135 }
136 </script> 139 </script>
137 <style scoped lang='scss'> 140 <style scoped lang="scss">
138 @import "~@/styles/mixin.scss"; 141 @import "~@/styles/mixin.scss";
139 142
140 .spyj { 143 .spyj {
141 width: 100%; 144 width: 100%;
142 height: 100%; 145 height: 100%;
143 background-color: #f5f5f5; 146 background-color: #f5f5f5;
...@@ -229,5 +232,5 @@ ...@@ -229,5 +232,5 @@
229 text-align: center; 232 text-align: center;
230 margin: 15px 0; 233 margin: 15px 0;
231 } 234 }
232 } 235 }
233 </style> 236 </style>
......
...@@ -75,10 +75,11 @@ export default { ...@@ -75,10 +75,11 @@ export default {
75 finishedInfo: { 75 finishedInfo: {
76 finishedTaskSet: result.finishedActivityIds, 76 finishedTaskSet: result.finishedActivityIds,
77 unfinishedTaskSet: result.runningActivityIds, 77 unfinishedTaskSet: result.runningActivityIds,
78 rejectedTaskSet: result.rejectedTaskSet, 78 rejectedTaskSet: {},
79 finishedSequenceFlowSet: result.finishedSequenceFlowIds 79 finishedSequenceFlowSet: result.finishedSequenceFlowIds
80 }, 80 },
81 allCommentList: result.historyTaskList 81 handlinglist:result.runningTasks,
82 allCommentList: result.finishedTasks
82 }, '80%', true) 83 }, '80%', true)
83 }) 84 })
84 break; 85 break;
......
...@@ -67,9 +67,11 @@ ...@@ -67,9 +67,11 @@
67 ...mapGetters(["dictData"]) 67 ...mapGetters(["dictData"])
68 }, 68 },
69 created () { 69 created () {
70 this.ableOperation = this.$parent?.currentSelectTab?.ableOperation || false
71 this.clmlInitList(1) 70 this.clmlInitList(1)
72 }, 71 },
72 mounted() {
73 this.ableOperation = this.$parent.isEdit;
74 },
73 methods: { 75 methods: {
74 // 自动预览 76 // 自动预览
75 nextPriview () { 77 nextPriview () {
...@@ -125,7 +127,6 @@ ...@@ -125,7 +127,6 @@
125 this.previewImg.bsmSj = item.bsmSj; 127 this.previewImg.bsmSj = item.bsmSj;
126 }, 128 },
127 updateList (val) { 129 updateList (val) {
128 console.log(val, 'valvalvalval');
129 let that = this 130 let that = this
130 if (val.children.length != []) { //删除最后一张图片时 val=null 131 if (val.children.length != []) { //删除最后一张图片时 val=null
131 this.tableData.forEach(item => { 132 this.tableData.forEach(item => {
......
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
83 }, 83 },
84 }, 84 },
85 mounted () { 85 mounted () {
86 this.propsParam.isEdit=this.$parent.isEdit
86 this.propsParam = this.$attrs; 87 this.propsParam = this.$attrs;
87 if (this.$route.query.viewtype) { 88 if (this.$route.query.viewtype) {
88 this.ableOperation = false 89 this.ableOperation = false
......
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
198 "/djbworkFrameview?bsmSlsq=" + 198 "/djbworkFrameview?bsmSlsq=" +
199 item.bsmSlsq + 199 item.bsmSlsq +
200 "&bestepid=" + 200 "&bestepid=" +
201 item.bestepid + 201 item.bestepid+
202 "&isEdit=" + 202 "&bsmBusiness=" +
203 true 203 "&viewtype=1"
204 ); 204 );
205 window.open(href, `urlname${item.bsmSlsq}`); 205 window.open(href, `urlname${item.bsmSlsq}`);
206 } else { 206 } else {
......