Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
8776edad by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 4bfea328 44477458
Expand all
Inline Side-by-side
Showing 18 changed files with 151 additions and 359 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 15:43:30 4 * @LastEditTime: 2023-08-07 14:43:46
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rlPopup"> 7 <div class="rlPopup">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <el-button type="primary" @click="clickImage" v-if="previewImg.imgList.length>0">（放大） 显示（缩小）</el-button> 25 <el-button type="primary" @click="clickImage" v-if="previewImg.imgList.length>0">（放大） 显示（缩小）</el-button>
26 <el-upload class="fileUpdate" ref="upload" :key="key" action="" :show-file-list="false" :multiple="true" :auto-upload="false" 26 <el-upload class="fileUpdate" ref="upload" :key="key" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
27 :on-change="handleChange" 27 :on-change="handleChange"
28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload"> 28 accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg">
29 <el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button> 29 <el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button>
30 </el-upload> 30 </el-upload>
31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete" 31 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
...@@ -225,28 +225,12 @@ ...@@ -225,28 +225,12 @@
225 this.showViewer = true 225 this.showViewer = true
226 }, 226 },
227 /** 227 /**
228 * @description: 上传
229 * @param {*} file
230 * @author: renchao
231 */
232 beforeUpload (file) {
233 const isLt5M = file.size / 1024 / 1024 < 5;
234 if (!isLt5M) {
235 this.$message.error('上传图片大小不能超过 5MB!');
236 return false;
237 }
238
239 // 所有条件满足时返回 true
240 return true;
241 },
242 /**
243 * @description: handleChange 228 * @description: handleChange
244 * @param {*} file 229 * @param {*} file
245 * @param {*} files 230 * @param {*} files
246 * @author: renchao 231 * @author: renchao
247 */ 232 */
248 async handleChange (file, fileList) { 233 async handleChange (file, fileList) {
249 if (!this.beforeUpload(file)) return
250 let length = fileList.length; 234 let length = fileList.length;
251 this.maxFileLength = Math.max(length, this.maxFileLength) 235 this.maxFileLength = Math.max(length, this.maxFileLength)
252 var formData = new FormData(); 236 var formData = new FormData();
...@@ -254,8 +238,12 @@ ...@@ -254,8 +238,12 @@
254 if (this.maxFileLength !== length) { 238 if (this.maxFileLength !== length) {
255 return 239 return
256 } 240 }
257 let num = 0 241 let num = 0, max = 0;
242 const isLt5M = file.size / 1024 / 1024 < 5;
258 fileList.forEach(item => { 243 fileList.forEach(item => {
244 if (!isLt5M) {
245 max++
246 }
259 if (!['image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(item.raw.type)) { 247 if (!['image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(item.raw.type)) {
260 num++ 248 num++
261 } else { 249 } else {
...@@ -268,6 +256,11 @@ ...@@ -268,6 +256,11 @@
268 this.key++ 256 this.key++
269 return; 257 return;
270 } 258 }
259 if (max >= 1) {
260 this.$message.error('上传图片大小不能超过 5MB!');
261 this.key++
262 return;
263 }
271 formData.append("bsmSj", this.previewImg.bsmSj); 264 formData.append("bsmSj", this.previewImg.bsmSj);
272 formData.append("bsmSlsq", this.previewImg.bsmSlsq); 265 formData.append("bsmSlsq", this.previewImg.bsmSlsq);
273 uploadBatch(formData).then((res) => { 266 uploadBatch(formData).then((res) => {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 :show-message="false" 4 :show-message="false"
5 * @LastEditTime: 2023-08-03 14:56:50 5 * @LastEditTime: 2023-08-07 17:31:09
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 </el-col> 107 </el-col>
108 <el-col :span="8"> 108 <el-col :span="8">
109 <el-form-item label="坐落："> 109 <el-form-item label="坐落：">
110 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 110 <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
111 </el-form-item> 111 </el-form-item>
112 </el-col> 112 </el-col>
113 </el-row> 113 </el-row>
...@@ -189,14 +189,7 @@ ...@@ -189,14 +189,7 @@
189 <el-form-item label="是否被续封：" 189 <el-form-item label="是否被续封："
190 prop="cfdj.sfbxf" 190 prop="cfdj.sfbxf"
191 :rules="rules.sfbxfrules"> 191 :rules="rules.sfbxfrules">
192 <el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange"> 192 <el-radio-group v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
193 <el-option
194 v-for="item in sfbxflist"
195 :key="item.dcode"
196 :label="item.dname"
197 :value="item.dcode"></el-option>
198 </el-select>
199 <el-radio-group v-model="ruleForm.cfdj.sfbxf">
200 <el-radio label="1">是</el-radio> 193 <el-radio label="1">是</el-radio>
201 <el-radio label="2">否</el-radio> 194 <el-radio label="2">否</el-radio>
202 </el-radio-group> 195 </el-radio-group>
...@@ -513,7 +506,6 @@ ...@@ -513,7 +506,6 @@
513 }, 506 },
514 // 弹框事件 507 // 弹框事件
515 ssQlxxchangediolog (val) { 508 ssQlxxchangediolog (val) {
516 console.log("确定了", this.ruleForm);
517 this.$confirm("是否将上手权利信息同步到表单", "提示", { 509 this.$confirm("是否将上手权利信息同步到表单", "提示", {
518 iconClass: "el-icon-question", //自定义图标样式 510 iconClass: "el-icon-question", //自定义图标样式
519 confirmButtonText: "确认", //确认按钮文字更换 511 confirmButtonText: "确认", //确认按钮文字更换
...@@ -524,8 +516,6 @@ ...@@ -524,8 +516,6 @@
524 getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => { 516 getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
525 if (res.code == 200) { 517 if (res.code == 200) {
526 this.nowlist = res.result; 518 this.nowlist = res.result;
527 console.log("his.nowlist", this.nowlist);
528 console.log("this.ruleForm", this.ruleForm);
529 for (var key in this.ruleForm.cfdj) { 519 for (var key in this.ruleForm.cfdj) {
530 if ( 520 if (
531 this.ruleForm.cfdj[key] == "" || 521 this.ruleForm.cfdj[key] == "" ||
...@@ -539,13 +529,11 @@ ...@@ -539,13 +529,11 @@
539 (this.ruleForm.qlxx[key] == null && key != "ywh") || 529 (this.ruleForm.qlxx[key] == null && key != "ywh") ||
540 this.ruleForm.qlxx[key] == null 530 this.ruleForm.qlxx[key] == null
541 ) { 531 ) {
542 console.log("this.ruleForm.qlxx[key]", key);
543 if (key != "ywh") { 532 if (key != "ywh") {
544 this.ruleForm.qlxx[key] = this.nowlist.qlxx[key]; 533 this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
545 } 534 }
546 } 535 }
547 } 536 }
548 console.log("this.ruleForm", this.ruleForm);
549 this.$message({ 537 this.$message({
550 type: "success", 538 type: "success",
551 message: "同步成功!", 539 message: "同步成功!",
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 </el-col> 101 </el-col>
102 <el-col :span="8"> 102 <el-col :span="8">
103 <el-form-item label="坐落："> 103 <el-form-item label="坐落：">
104 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 104 <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
105 </el-form-item> 105 </el-form-item>
106 </el-col> 106 </el-col>
107 </el-row> 107 </el-row>
...@@ -473,7 +473,7 @@ ...@@ -473,7 +473,7 @@
473 <el-form-item label="共有方式："> 473 <el-form-item label="共有方式：">
474 <el-radio-group 474 <el-radio-group
475 :disabled="!ableOperation" 475 :disabled="!ableOperation"
476 v-model="ruleForm.sldy.gyfs"> 476 v-model="ruleForm.qlxx.gyfs">
477 <el-radio label="0">单独所有</el-radio> 477 <el-radio label="0">单独所有</el-radio>
478 <el-radio label="1">共同共有</el-radio> 478 <el-radio label="1">共同共有</el-radio>
479 <el-radio label="2">按份所有</el-radio> 479 <el-radio label="2">按份所有</el-radio>
...@@ -481,10 +481,10 @@ ...@@ -481,10 +481,10 @@
481 </el-radio-group> 481 </el-radio-group>
482 </el-form-item> 482 </el-form-item>
483 </el-col> 483 </el-col>
484 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 484 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
485 <el-form-item label="是否分别持证："> 485 <el-form-item label="是否分别持证：">
486 <el-radio-group 486 <el-radio-group
487 v-model="ruleForm.sldy.sqfbcz" 487 v-model="ruleForm.qlxx.sqfbcz"
488 :disabled="!ableOperation"> 488 :disabled="!ableOperation">
489 <el-radio :label="1">是</el-radio> 489 <el-radio :label="1">是</el-radio>
490 <el-radio :label="0">否</el-radio> 490 <el-radio :label="0">否</el-radio>
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
493 </el-col> 493 </el-col>
494 <el-col 494 <el-col
495 :span="6" 495 :span="6"
496 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'"> 496 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
497 <el-form-item label="持证人："> 497 <el-form-item label="持证人：">
498 <el-select 498 <el-select
499 v-model="ruleForm.czr" 499 v-model="ruleForm.czr"
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
507 </el-option> 507 </el-option>
508 </el-select> 508 </el-select>
509 </el-form-item> 509 </el-form-item>
510 </el-col> 510 </el-col> -->
511 </el-row> 511 </el-row>
512 <qlrCommonTable 512 <qlrCommonTable
513 :tableData="ruleForm.qlrData" 513 :tableData="ruleForm.qlrData"
...@@ -831,7 +831,7 @@ ...@@ -831,7 +831,7 @@
831 }); 831 });
832 return false; 832 return false;
833 } 833 }
834 if (this.ruleForm.sldy.gyfs == "0") { 834 if (this.ruleForm.qlxx.gyfs == "0") {
835 if (this.ruleForm.qlrData.length > 1) { 835 if (this.ruleForm.qlrData.length > 1) {
836 this.$message({ 836 this.$message({
837 showClose: true, 837 showClose: true,
...@@ -842,7 +842,7 @@ ...@@ -842,7 +842,7 @@
842 } 842 }
843 this.ruleForm.qlrData[0].sfczr = "1"; 843 this.ruleForm.qlrData[0].sfczr = "1";
844 } else { 844 } else {
845 if (this.ruleForm.qlrList.length <= 1) { 845 if (this.ruleForm.qlrData.length <= 1) {
846 this.$message({ 846 this.$message({
847 showClose: true, 847 showClose: true,
848 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 848 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -850,29 +850,29 @@ ...@@ -850,29 +850,29 @@
850 }); 850 });
851 return false; 851 return false;
852 } 852 }
853 //是否分别持证 853 // //是否分别持证
854 if (this.ruleForm.sldy.sqfbcz == "1") { 854 // if (this.ruleForm.qlxx.sqfbcz == "1") {
855 //是 855 // //是
856 this.ruleForm.qlrList.forEach((item, index) => { 856 // this.ruleForm.qlrData.forEach((item, index) => {
857 item.sfczr = "1"; 857 // item.sfczr = "1";
858 }); 858 // });
859 } else { 859 // } else {
860 if (!that.ruleForm.czr) { 860 // if (!that.ruleForm.czr) {
861 that.$message({ 861 // that.$message({
862 showClose: true, 862 // showClose: true,
863 message: "请选择持证人", 863 // message: "请选择持证人",
864 type: "error", 864 // type: "error",
865 }); 865 // });
866 return false; 866 // return false;
867 } 867 // }
868 this.ruleForm.qlrList.forEach((item, index) => { 868 // this.ruleForm.qlrData.forEach((item, index) => {
869 if (item.zjh == this.ruleForm.czr) { 869 // if (item.zjh == this.ruleForm.czr) {
870 item.sfczr = "1"; 870 // item.sfczr = "1";
871 } else { 871 // } else {
872 item.sfczr = "0"; 872 // item.sfczr = "0";
873 } 873 // }
874 }) 874 // })
875 } 875 // }
876 } 876 }
877 save(this.ruleForm).then((res) => { 877 save(this.ruleForm).then((res) => {
878 if (res.code === 200) { 878 if (res.code === 200) {
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 </el-col> 100 </el-col>
101 <el-col :span="8"> 101 <el-col :span="8">
102 <el-form-item label="坐落："> 102 <el-form-item label="坐落：">
103 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 103 <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
104 </el-form-item> 104 </el-form-item>
105 </el-col> 105 </el-col>
106 </el-row> 106 </el-row>
...@@ -717,7 +717,7 @@ ...@@ -717,7 +717,7 @@
717 }); 717 });
718 return false; 718 return false;
719 } 719 }
720 if (this.ruleForm.sldy.gyfs == "0") { 720 if (this.ruleForm.qlxx.gyfs == "0") {
721 if (this.ruleForm.qlrData.length > 1) { 721 if (this.ruleForm.qlrData.length > 1) {
722 this.$message({ 722 this.$message({
723 showClose: true, 723 showClose: true,
...@@ -726,7 +726,6 @@ ...@@ -726,7 +726,6 @@
726 }); 726 });
727 return false; 727 return false;
728 } 728 }
729 this.ruleForm.qlrData[0].sfczr = "1";
730 } else { 729 } else {
731 if (this.ruleForm.qlrList.length <= 1) { 730 if (this.ruleForm.qlrList.length <= 1) {
732 this.$message({ 731 this.$message({
...@@ -736,29 +735,7 @@ ...@@ -736,29 +735,7 @@
736 }); 735 });
737 return false; 736 return false;
738 } 737 }
739 //是否分别持证 738
740 if (this.ruleForm.sldy.sqfbcz == "1") {
741 //是
742 this.ruleForm.qlrList.forEach((item, index) => {
743 item.sfczr = "1";
744 });
745 } else {
746 if (!that.ruleForm.czr) {
747 that.$message({
748 showClose: true,
749 message: "请选择持证人",
750 type: "error",
751 });
752 return false;
753 }
754 this.ruleForm.qlrList.forEach((item, index) => {
755 if (item.zjh == this.ruleForm.czr) {
756 item.sfczr = "1";
757 } else {
758 item.sfczr = "0";
759 }
760 });
761 }
762 } 739 }
763 save(this.ruleForm).then((res) => { 740 save(this.ruleForm).then((res) => {
764 if (res.code === 200) { 741 if (res.code === 200) {
......
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
399 <el-form-item label="共有方式："> 399 <el-form-item label="共有方式：">
400 <el-radio-group 400 <el-radio-group
401 :disabled="!ableOperation" 401 :disabled="!ableOperation"
402 v-model="ruleForm.sldy.gyfs"> 402 v-model="ruleForm.qlxx.gyfs">
403 <el-radio label="0">单独所有</el-radio> 403 <el-radio label="0">单独所有</el-radio>
404 <el-radio label="1">共同共有</el-radio> 404 <el-radio label="1">共同共有</el-radio>
405 <el-radio label="2">按份所有</el-radio> 405 <el-radio label="2">按份所有</el-radio>
...@@ -407,33 +407,6 @@ ...@@ -407,33 +407,6 @@
407 </el-radio-group> 407 </el-radio-group>
408 </el-form-item> 408 </el-form-item>
409 </el-col> 409 </el-col>
410 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
411 <el-form-item label="是否分别持证：">
412 <el-radio-group
413 v-model="ruleForm.sldy.sqfbcz"
414 :disabled="!ableOperation">
415 <el-radio :label="1">是</el-radio>
416 <el-radio :label="0">否</el-radio>
417 </el-radio-group>
418 </el-form-item>
419 </el-col>
420 <el-col
421 :span="6"
422 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
423 <el-form-item label="持证人：">
424 <el-select
425 v-model="ruleForm.czr"
426 placeholder="持证人"
427 :disabled="!ableOperation">
428 <el-option
429 v-for="item in czrOptions"
430 :key="item.zjh"
431 :label="item.sqrmc"
432 :value="item.zjh">
433 </el-option>
434 </el-select>
435 </el-form-item>
436 </el-col>
437 </el-row> 410 </el-row>
438 <qlrCommonTable 411 <qlrCommonTable
439 :tableData="ruleForm.qlrData" 412 :tableData="ruleForm.qlrData"
...@@ -775,9 +748,8 @@ ...@@ -775,9 +748,8 @@
775 }); 748 });
776 return false; 749 return false;
777 } 750 }
778 this.ruleForm.qlrData[0].sfczr = "1";
779 } else { 751 } else {
780 if (this.ruleForm.qlrList.length <= 1) { 752 if (this.ruleForm.qlrData.length <= 1) {
781 this.$message({ 753 this.$message({
782 showClose: true, 754 showClose: true,
783 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 755 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -785,29 +757,6 @@ ...@@ -785,29 +757,6 @@
785 }); 757 });
786 return false; 758 return false;
787 } 759 }
788 //是否分别持证
789 if (this.ruleForm.sldy.sqfbcz == "1") {
790 //是
791 this.ruleForm.qlrList.forEach((item, index) => {
792 item.sfczr = "1";
793 });
794 } else {
795 if (!that.ruleForm.czr) {
796 that.$message({
797 showClose: true,
798 message: "请选择持证人",
799 type: "error",
800 });
801 return false;
802 }
803 this.ruleForm.qlrList.forEach((item, index) => {
804 if (item.zjh == this.ruleForm.czr) {
805 item.sfczr = "1";
806 } else {
807 item.sfczr = "0";
808 }
809 });
810 }
811 } 760 }
812 save(this.ruleForm).then((res) => { 761 save(this.ruleForm).then((res) => {
813 if (res.code === 200) { 762 if (res.code === 200) {
......
...@@ -267,33 +267,6 @@ ...@@ -267,33 +267,6 @@
267 </el-radio-group> 267 </el-radio-group>
268 </el-form-item> 268 </el-form-item>
269 </el-col> 269 </el-col>
270 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
271 <el-form-item label="是否分别持证：">
272 <el-radio-group
273 v-model="ruleForm.qlxx.sqfbcz"
274 :disabled="!ableOperation">
275 <el-radio :label="1">是</el-radio>
276 <el-radio :label="0">否</el-radio>
277 </el-radio-group>
278 </el-form-item>
279 </el-col>
280 <el-col
281 :span="6"
282 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
283 <el-form-item label="持证人：">
284 <el-select
285 v-model="ruleForm.czr"
286 placeholder="持证人"
287 :disabled="!ableOperation">
288 <el-option
289 v-for="item in czrOptions"
290 :key="item.zjh"
291 :label="item.sqrmc"
292 :value="item.zjh">
293 </el-option>
294 </el-select>
295 </el-form-item>
296 </el-col>
297 </el-row> 270 </el-row>
298 <qlrCommonTable 271 <qlrCommonTable
299 :tableData="ruleForm.qlrData" 272 :tableData="ruleForm.qlrData"
...@@ -613,9 +586,8 @@ ...@@ -613,9 +586,8 @@
613 }); 586 });
614 return false; 587 return false;
615 } 588 }
616 this.ruleForm.qlrData[0].sfczr = "1";
617 } else { 589 } else {
618 if (this.ruleForm.qlrList.length <= 1) { 590 if (this.ruleForm.qlrData.length <= 1) {
619 this.$message({ 591 this.$message({
620 showClose: true, 592 showClose: true,
621 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 593 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -623,29 +595,6 @@ ...@@ -623,29 +595,6 @@
623 }); 595 });
624 return false; 596 return false;
625 } 597 }
626 //是否分别持证
627 if (this.ruleForm.qlxx.sqfbcz == "1") {
628 //是
629 this.ruleForm.qlrList.forEach((item, index) => {
630 item.sfczr = "1";
631 });
632 } else {
633 if (!that.ruleForm.czr) {
634 that.$message({
635 showClose: true,
636 message: "请选择持证人",
637 type: "error",
638 });
639 return false;
640 }
641 this.ruleForm.qlrList.forEach((item, index) => {
642 if (item.zjh == this.ruleForm.czr) {
643 item.sfczr = "1";
644 } else {
645 item.sfczr = "0";
646 }
647 });
648 }
649 } 598 }
650 save(this.ruleForm).then((res) => { 599 save(this.ruleForm).then((res) => {
651 if (res.code === 200) { 600 if (res.code === 200) {
......
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
362 </el-radio-group> 362 </el-radio-group>
363 </el-form-item> 363 </el-form-item>
364 </el-col> 364 </el-col>
365 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> 365 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
366 <el-form-item label="是否分别持证："> 366 <el-form-item label="是否分别持证：">
367 <el-radio-group 367 <el-radio-group
368 v-model="ruleForm.qlxx.sqfbcz" 368 v-model="ruleForm.qlxx.sqfbcz"
...@@ -371,8 +371,8 @@ ...@@ -371,8 +371,8 @@
371 <el-radio :label="0">否</el-radio> 371 <el-radio :label="0">否</el-radio>
372 </el-radio-group> 372 </el-radio-group>
373 </el-form-item> 373 </el-form-item>
374 </el-col> 374 </el-col> -->
375 <el-col 375 <!-- <el-col
376 :span="6" 376 :span="6"
377 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'"> 377 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
378 <el-form-item label="持证人："> 378 <el-form-item label="持证人：">
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
388 </el-option> 388 </el-option>
389 </el-select> 389 </el-select>
390 </el-form-item> 390 </el-form-item>
391 </el-col> 391 </el-col> -->
392 </el-row> 392 </el-row>
393 <qlrCommonTable 393 <qlrCommonTable
394 :tableData="ruleForm.qlrData" 394 :tableData="ruleForm.qlrData"
...@@ -694,9 +694,8 @@ ...@@ -694,9 +694,8 @@
694 }); 694 });
695 return false; 695 return false;
696 } 696 }
697 this.ruleForm.qlrData[0].sfczr = "1";
698 } else { 697 } else {
699 if (this.ruleForm.qlrList.length <= 1) { 698 if (this.ruleForm.qlrData.length <= 1) {
700 this.$message({ 699 this.$message({
701 showClose: true, 700 showClose: true,
702 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 701 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -704,29 +703,6 @@ ...@@ -704,29 +703,6 @@
704 }); 703 });
705 return false; 704 return false;
706 } 705 }
707 //是否分别持证
708 if (this.ruleForm.qlxx.sqfbcz == "1") {
709 //是
710 this.ruleForm.qlrList.forEach((item, index) => {
711 item.sfczr = "1";
712 });
713 } else {
714 if (!that.ruleForm.czr) {
715 that.$message({
716 showClose: true,
717 message: "请选择持证人",
718 type: "error",
719 });
720 return false;
721 }
722 this.ruleForm.qlrList.forEach((item, index) => {
723 if (item.zjh == this.ruleForm.czr) {
724 item.sfczr = "1";
725 } else {
726 item.sfczr = "0";
727 }
728 });
729 }
730 } 706 }
731 save(this.ruleForm).then((res) => { 707 save(this.ruleForm).then((res) => {
732 if (res.code === 200) { 708 if (res.code === 200) {
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 </el-col> 102 </el-col>
103 <el-col :span="8"> 103 <el-col :span="8">
104 <el-form-item label="坐落："> 104 <el-form-item label="坐落：">
105 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 105 <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
106 </el-form-item> 106 </el-form-item>
107 </el-col> 107 </el-col>
108 </el-row> 108 </el-row>
...@@ -445,7 +445,7 @@ ...@@ -445,7 +445,7 @@
445 <el-form-item label="共有方式："> 445 <el-form-item label="共有方式：">
446 <el-radio-group 446 <el-radio-group
447 :disabled="!ableOperation" 447 :disabled="!ableOperation"
448 v-model="ruleForm.sldy.gyfs"> 448 v-model="ruleForm.qlxx.gyfs">
449 <el-radio label="0">单独所有</el-radio> 449 <el-radio label="0">单独所有</el-radio>
450 <el-radio label="1">共同共有</el-radio> 450 <el-radio label="1">共同共有</el-radio>
451 <el-radio label="2">按份所有</el-radio> 451 <el-radio label="2">按份所有</el-radio>
...@@ -453,33 +453,6 @@ ...@@ -453,33 +453,6 @@
453 </el-radio-group> 453 </el-radio-group>
454 </el-form-item> 454 </el-form-item>
455 </el-col> 455 </el-col>
456 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
457 <el-form-item label="是否分别持证：">
458 <el-radio-group
459 v-model="ruleForm.sldy.sqfbcz"
460 :disabled="!ableOperation">
461 <el-radio :label="1">是</el-radio>
462 <el-radio :label="0">否</el-radio>
463 </el-radio-group>
464 </el-form-item>
465 </el-col>
466 <el-col
467 :span="6"
468 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
469 <el-form-item label="持证人：">
470 <el-select
471 v-model="ruleForm.czr"
472 placeholder="持证人"
473 :disabled="!ableOperation">
474 <el-option
475 v-for="item in czrOptions"
476 :key="item.zjh"
477 :label="item.sqrmc"
478 :value="item.zjh">
479 </el-option>
480 </el-select>
481 </el-form-item>
482 </el-col>
483 </el-row> 456 </el-row>
484 <qlrCommonTable 457 <qlrCommonTable
485 :tableData="ruleForm.qlrData" 458 :tableData="ruleForm.qlrData"
...@@ -814,9 +787,8 @@ ...@@ -814,9 +787,8 @@
814 }); 787 });
815 return false; 788 return false;
816 } 789 }
817 this.ruleForm.qlrData[0].sfczr = "1";
818 } else { 790 } else {
819 if (this.ruleForm.qlrList.length <= 1) { 791 if (this.ruleForm.qlrData.length <= 1) {
820 this.$message({ 792 this.$message({
821 showClose: true, 793 showClose: true,
822 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上", 794 message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
...@@ -824,29 +796,6 @@ ...@@ -824,29 +796,6 @@
824 }); 796 });
825 return false; 797 return false;
826 } 798 }
827 //是否分别持证
828 if (this.ruleForm.sldy.sqfbcz == "1") {
829 //是
830 this.ruleForm.qlrList.forEach((item, index) => {
831 item.sfczr = "1";
832 });
833 } else {
834 if (!that.ruleForm.czr) {
835 that.$message({
836 showClose: true,
837 message: "请选择持证人",
838 type: "error",
839 });
840 return false;
841 }
842 this.ruleForm.qlrList.forEach((item, index) => {
843 if (item.zjh == this.ruleForm.czr) {
844 item.sfczr = "1";
845 } else {
846 item.sfczr = "0";
847 }
848 });
849 }
850 } 799 }
851 save(this.ruleForm).then((res) => { 800 save(this.ruleForm).then((res) => {
852 if (res.code === 200) { 801 if (res.code === 200) {
......
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
368 <el-form-item label="共有方式："> 368 <el-form-item label="共有方式：">
369 <el-radio-group 369 <el-radio-group
370 :disabled="!ableOperation" 370 :disabled="!ableOperation"
371 v-model="ruleForm.sldy.gyfs"> 371 v-model="ruleForm.qlxx.gyfs">
372 <el-radio label="0">单独所有</el-radio> 372 <el-radio label="0">单独所有</el-radio>
373 <el-radio label="1">共同共有</el-radio> 373 <el-radio label="1">共同共有</el-radio>
374 <el-radio label="2">按份所有</el-radio> 374 <el-radio label="2">按份所有</el-radio>
...@@ -376,10 +376,10 @@ ...@@ -376,10 +376,10 @@
376 </el-radio-group> 376 </el-radio-group>
377 </el-form-item> 377 </el-form-item>
378 </el-col> 378 </el-col>
379 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 379 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
380 <el-form-item label="是否分别持证："> 380 <el-form-item label="是否分别持证：">
381 <el-radio-group 381 <el-radio-group
382 v-model="ruleForm.sldy.sqfbcz" 382 v-model="ruleForm.qlxx.sqfbcz"
383 :disabled="!ableOperation"> 383 :disabled="!ableOperation">
384 <el-radio :label="1">是</el-radio> 384 <el-radio :label="1">是</el-radio>
385 <el-radio :label="0">否</el-radio> 385 <el-radio :label="0">否</el-radio>
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
388 </el-col> 388 </el-col>
389 <el-col 389 <el-col
390 :span="6" 390 :span="6"
391 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'"> 391 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
392 <el-form-item label="持证人："> 392 <el-form-item label="持证人：">
393 <el-select 393 <el-select
394 v-model="ruleForm.czr" 394 v-model="ruleForm.czr"
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
402 </el-option> 402 </el-option>
403 </el-select> 403 </el-select>
404 </el-form-item> 404 </el-form-item>
405 </el-col> 405 </el-col> -->
406 </el-row> 406 </el-row>
407 <qlrCommonTable 407 <qlrCommonTable
408 :tableData="ruleForm.qlrData" 408 :tableData="ruleForm.qlrData"
...@@ -717,7 +717,7 @@ ...@@ -717,7 +717,7 @@
717 }); 717 });
718 return false; 718 return false;
719 } 719 }
720 if (this.ruleForm.sldy.gyfs == "0") { 720 if (this.ruleForm.qlxx.gyfs == "0") {
721 if (this.ruleForm.qlrData.length > 1) { 721 if (this.ruleForm.qlrData.length > 1) {
722 this.$message({ 722 this.$message({
723 showClose: true, 723 showClose: true,
...@@ -726,7 +726,6 @@ ...@@ -726,7 +726,6 @@
726 }); 726 });
727 return false; 727 return false;
728 } 728 }
729 this.ruleForm.qlrData[0].sfczr = "1";
730 } else { 729 } else {
731 if (this.ruleForm.qlrList.length <= 1) { 730 if (this.ruleForm.qlrList.length <= 1) {
732 this.$message({ 731 this.$message({
...@@ -736,29 +735,6 @@ ...@@ -736,29 +735,6 @@
736 }); 735 });
737 return false; 736 return false;
738 } 737 }
739 //是否分别持证
740 if (this.ruleForm.sldy.sqfbcz == "1") {
741 //是
742 this.ruleForm.qlrList.forEach((item, index) => {
743 item.sfczr = "1";
744 });
745 } else {
746 if (!that.ruleForm.czr) {
747 that.$message({
748 showClose: true,
749 message: "请选择持证人",
750 type: "error",
751 });
752 return false;
753 }
754 this.ruleForm.qlrList.forEach((item, index) => {
755 if (item.zjh == this.ruleForm.czr) {
756 item.sfczr = "1";
757 } else {
758 item.sfczr = "0";
759 }
760 });
761 }
762 } 738 }
763 save(this.ruleForm).then((res) => { 739 save(this.ruleForm).then((res) => {
764 if (res.code === 200) { 740 if (res.code === 200) {
......
...@@ -113,14 +113,6 @@ export default { ...@@ -113,14 +113,6 @@ export default {
113 }, 113 },
114 }, 114 },
115 mounted() { 115 mounted() {
116 console.log(
117 "bestepid: this.$route.query.bestepid,",
118 this.$route.query.bestepid
119 );
120 console.log(
121 "bestepid: this.$route.query.sqywbm,",
122 this.$route.query.sqywbm
123 );
124 this.ableOperation = this.$parent.ableOperation; 116 this.ableOperation = this.$parent.ableOperation;
125 }, 117 },
126 methods: { 118 methods: {
...@@ -162,7 +154,6 @@ export default { ...@@ -162,7 +154,6 @@ export default {
162 return new Promise((resolve) => { 154 return new Promise((resolve) => {
163 this.unitData = this.$parent.unitData; 155 this.unitData = this.$parent.unitData;
164 var formdata = new FormData(); 156 var formdata = new FormData();
165
166 formdata.append("bsmSlsq", this.$parent.bsmSlsq); 157 formdata.append("bsmSlsq", this.$parent.bsmSlsq);
167 if (this.$route.query.sqywbm == "DJBBL") { 158 if (this.$route.query.sqywbm == "DJBBL") {
168 formdata.append("bsmSldy", this.$parent.bsmRepair); 159 formdata.append("bsmSldy", this.$parent.bsmRepair);
...@@ -259,6 +250,9 @@ export default { ...@@ -259,6 +250,9 @@ export default {
259 sjlx: data.cllx, 250 sjlx: data.cllx,
260 sfxjcl: "1", // 是否必选 251 sfxjcl: "1", // 是否必选
261 }; 252 };
253 if (this.$route.query.sqywbm == "DJBBL") {
254 obj.bsmSldy=this.$parent.bsmRepair
255 }
262 saveClml(obj).then(async (res) => { 256 saveClml(obj).then(async (res) => {
263 if (res.code == 200) { 257 if (res.code == 200) {
264 let res = await this.clmlInitList(2); 258 let res = await this.clmlInitList(2);
...@@ -324,6 +318,7 @@ export default { ...@@ -324,6 +318,7 @@ export default {
324 data: this.tableData, 318 data: this.tableData,
325 unitData: this.$parent.unitData, 319 unitData: this.$parent.unitData,
326 ableOperation: this.$parent.ableOperation, 320 ableOperation: this.$parent.ableOperation,
321 bsmRepair:this.$parent.bsmRepair
327 }, 322 },
328 "60%", 323 "60%",
329 true 324 true
......
...@@ -209,9 +209,14 @@ ...@@ -209,9 +209,14 @@
209 return new Promise(resolve => { 209 return new Promise(resolve => {
210 this.unitData = this.$parent.unitData; 210 this.unitData = this.$parent.unitData;
211 var formdata = new FormData(); 211 var formdata = new FormData();
212 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
213 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq); 212 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
213 if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
214 formdata.append("bsmSldy", this.formData.bsmRepair);
215 formdata.append("clfl", 3);
216 } else {
217 formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
214 formdata.append("clfl", 2); 218 formdata.append("clfl", 2);
219 }
215 InitClml(formdata).then((res) => { 220 InitClml(formdata).then((res) => {
216 if (res.code == 200) { 221 if (res.code == 200) {
217 resolve(res.code) 222 resolve(res.code)
......
...@@ -485,8 +485,19 @@ ...@@ -485,8 +485,19 @@
485 // this.taskList =this.formData.allCommentList; 485 // this.taskList =this.formData.allCommentList;
486 // 处理数据之后赋值 486 // 处理数据之后赋值
487 this.taskCommentList = this.taskList; 487 this.taskCommentList = this.taskList;
488 this.taskCommentList=this.taskCommentList.sort(this.sortDownDate)
488 }, 489 },
490 /**
491 * 时间排序函数
492 * @description: formatDate
493 * @param {*} row
494 * @param {*} column
495 * @author: renchao
496 */
489 497
498 sortDownDate(a, b) {
499 return Date.parse(a.createTime) - Date.parse(b.createTime);
500 },
490 // 设置流程图元素状态 501 // 设置流程图元素状态
491 /** 502 /**
492 * @description: 设置流程图元素状态 503 * @description: 设置流程图元素状态
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <i class="el-icon-question invalid-icon"></i> 9 <i class="el-icon-question invalid-icon"></i>
10 <div class="invalid-body">您是否确定终止该业务办理？</div> 10 <div class="invalid-body">您是否确定终止该业务办理？</div>
11 </div> 11 </div>
12 <div class="invalid-reson">终止原因：</div> 12 <div class="invalid-reson">退件原因：</div>
13 <el-input 13 <el-input
14 v-model="stopMessage" 14 v-model="stopMessage"
15 placeholder="请输入终止原因" 15 placeholder="请输入终止原因"
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 </el-col> 60 </el-col>
61 <el-col :span="8"> 61 <el-col :span="8">
62 <el-form-item label="不动产单元号："> 62 <el-form-item label="不动产单元号：">
63 <el-input v-model="ruleForm.zdjbxx.bdcdyh"></el-input> 63 <el-input v-model="ruleForm.sldy.bdcdyh"></el-input>
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
66 <el-col :span="8"> 66 <el-col :span="8">
......
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
11 :model="queryForm" 11 :model="queryForm"
12 ref="queryForm" 12 ref="queryForm"
13 @submit.native.prevent 13 @submit.native.prevent
14 label-width="80px"> 14 label-width="80px"
15 >
15 <el-row> 16 <el-row>
16 <el-col :span="5"> 17 <el-col :span="5">
17 <el-form-item label="业务来源" label-width="70px"> 18 <el-form-item label="业务来源" label-width="70px">
...@@ -22,12 +23,14 @@ ...@@ -22,12 +23,14 @@
22 class="width100" 23 class="width100"
23 filterable 24 filterable
24 clearable 25 clearable
25 placeholder="请选择业务来源"> 26 placeholder="请选择业务来源"
27 >
26 <el-option 28 <el-option
27 v-for="item in dictData['ywly']" 29 v-for="item in dictData['ywly']"
28 :key="item.dcode" 30 :key="item.dcode"
29 :label="item.dname" 31 :label="item.dname"
30 :value="item.dcode"> 32 :value="item.dcode"
33 >
31 </el-option> 34 </el-option>
32 </el-select> 35 </el-select>
33 </el-form-item> 36 </el-form-item>
...@@ -41,12 +44,14 @@ ...@@ -41,12 +44,14 @@
41 class="width100" 44 class="width100"
42 filterable 45 filterable
43 clearable 46 clearable
44 placeholder="请选择权利类型"> 47 placeholder="请选择权利类型"
48 >
45 <el-option 49 <el-option
46 v-for="item in dictData['A8']" 50 v-for="item in dictData['A8']"
47 :key="item.dcode" 51 :key="item.dcode"
48 :label="item.dname" 52 :label="item.dname"
49 :value="item.dcode"> 53 :value="item.dcode"
54 >
50 </el-option> 55 </el-option>
51 </el-select> 56 </el-select>
52 </el-form-item> 57 </el-form-item>
...@@ -60,12 +65,14 @@ ...@@ -60,12 +65,14 @@
60 class="width100" 65 class="width100"
61 filterable 66 filterable
62 clearable 67 clearable
63 placeholder="请选择登记类型"> 68 placeholder="请选择登记类型"
69 >
64 <el-option 70 <el-option
65 v-for="item in dictData['A21']" 71 v-for="item in dictData['A21']"
66 :key="item.dcode" 72 :key="item.dcode"
67 :label="item.dname" 73 :label="item.dname"
68 :value="item.dcode"> 74 :value="item.dcode"
75 >
69 </el-option> 76 </el-option>
70 </el-select> 77 </el-select>
71 </el-form-item> 78 </el-form-item>
...@@ -76,14 +83,20 @@ ...@@ -76,14 +83,20 @@
76 placeholder="请输入业务号" 83 placeholder="请输入业务号"
77 v-model="queryForm.ywh" 84 v-model="queryForm.ywh"
78 clearable 85 clearable
79 class="width200px"> 86 class="width200px"
87 >
80 </el-input> 88 </el-input>
81 </el-form-item> 89 </el-form-item>
82 </el-col> 90 </el-col>
83 91
84 <el-col :span="4" class="btnColRight"> 92 <el-col :span="4" class="btnColRight">
85 <el-form-item> 93 <el-form-item>
86 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> 94 <el-button
95 type="primary"
96 native-type="submit"
97 @click="handleSearch"
98 >查询</el-button
99 >
87 <el-button @click="moreQueryClick">高级查询</el-button> 100 <el-button @click="moreQueryClick">高级查询</el-button>
88 </el-form-item> 101 </el-form-item>
89 </el-col> 102 </el-col>
...@@ -95,14 +108,16 @@ ...@@ -95,14 +108,16 @@
95 {{ item.name }}:{{ item.value }} 108 {{ item.name }}:{{ item.value }}
96 <i 109 <i
97 class="el-icon-circle-close" 110 class="el-icon-circle-close"
98 @click="handelItem(item, index)"></i> 111 @click="handelItem(item, index)"
112 ></i>
99 </li> 113 </li>
100 </ul> 114 </ul>
101 <el-button 115 <el-button
102 class="clean-btn" 116 class="clean-btn"
103 type="text" 117 type="text"
104 v-if="searchList.length > 0" 118 v-if="searchList.length > 0"
105 @click.native="hanldeCleanAll">清除全部 119 @click.native="hanldeCleanAll"
120 >清除全部
106 </el-button> 121 </el-button>
107 </el-row> 122 </el-row>
108 </el-form> 123 </el-form>
...@@ -119,30 +134,35 @@ ...@@ -119,30 +134,35 @@
119 @size-change="handleSizeChange" 134 @size-change="handleSizeChange"
120 @p-current-change="handleCurrentChange" 135 @p-current-change="handleCurrentChange"
121 :column="tableData.columns" 136 :column="tableData.columns"
122 :data="tableData.data"> 137 :data="tableData.data"
138 >
123 </lb-table> 139 </lb-table>
124 </div> 140 </div>
125 <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" /> 141 <searchBox
142 v-model="isSearch"
143 @getSearch="getSearch"
144 :advancedForm="otherForm"
145 />
126 </div> 146 </div>
127 </template> 147 </template>
128 <script> 148 <script>
129 import { mapGetters } from "vuex"; 149 import { mapGetters } from "vuex";
130 import searchMin from "../components/mixin/index"; 150 import searchMin from "../components/mixin/index";
131 import table from "@/utils/mixin/table"; 151 import table from "@/utils/mixin/table";
132 import { datas, sendThis } from "./ybxdata"; 152 import { datas, sendThis } from "./ybxdata";
133 import { searchTaskDone } from "@/api/workflow/search.js"; 153 import { searchTaskDone } from "@/api/workflow/search.js";
134 import searchBox from "../components/search.vue"; 154 import searchBox from "../components/search.vue";
135 export default { 155 export default {
136 name: "ybx", 156 name: "ybx",
137 components: { searchBox }, 157 components: { searchBox },
138 mixins: [table, searchMin], 158 mixins: [table, searchMin],
139 mounted () { 159 mounted() {
140 sendThis(this); 160 sendThis(this);
141 }, 161 },
142 computed: { 162 computed: {
143 ...mapGetters(["dictData"]), 163 ...mapGetters(["dictData"]),
144 }, 164 },
145 data () { 165 data() {
146 return { 166 return {
147 queryForm: { 167 queryForm: {
148 ywly: "", 168 ywly: "",
...@@ -163,11 +183,11 @@ ...@@ -163,11 +183,11 @@
163 }, 183 },
164 }; 184 };
165 }, 185 },
166 activated () { 186 activated() {
167 this.queryClick() 187 this.queryClick();
168 window["getBpageList"] = () => { 188 window["getBpageList"] = () => {
169 this.queryClick() 189 this.queryClick();
170 } 190 };
171 }, 191 },
172 methods: { 192 methods: {
173 // 列表渲染接口 193 // 列表渲染接口
...@@ -175,7 +195,7 @@ ...@@ -175,7 +195,7 @@
175 * @description: 列表渲染接口 195 * @description: 列表渲染接口
176 * @author: renchao 196 * @author: renchao
177 */ 197 */
178 queryClick () { 198 queryClick() {
179 this.$startLoading(); 199 this.$startLoading();
180 this.searchForm.ywh = this.queryForm.ywh; 200 this.searchForm.ywh = this.queryForm.ywh;
181 this.iterationData(); 201 this.iterationData();
...@@ -203,7 +223,7 @@ ...@@ -203,7 +223,7 @@
203 * @param {*} val 223 * @param {*} val
204 * @author: renchao 224 * @author: renchao
205 */ 225 */
206 handleSort (val) { 226 handleSort(val) {
207 this.queryForm.sortField = val.prop; 227 this.queryForm.sortField = val.prop;
208 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc"; 228 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
209 this.queryClick(); 229 this.queryClick();
...@@ -213,14 +233,17 @@ ...@@ -213,14 +233,17 @@
213 * @param {*} item 233 * @param {*} item
214 * @author: renchao 234 * @author: renchao
215 */ 235 */
216 ywhClick (item) { 236 ywhClick(item) {
217 //有任务权限 237 //有任务权限
218 if (item.sjlx == "3") { 238 if (item.sjlx == "3") {
239 item.djywbm = "DJBBL";
219 const { href } = this.$router.resolve( 240 const { href } = this.$router.resolve(
220 "/djbworkFrameview?bsmSlsq=" + 241 "/djbworkFrameview?bsmSlsq=" +
221 item.bsmSlsq + 242 item.bsmSlsq +
222 "&bestepid=" + 243 "&bestepid=" +
223 item.bestepid 244 item.bestepid +
245 "&sqywbm=" +
246 item.djywbm
224 ); 247 );
225 window.open(href, `djbworkFrameview${item.bsmSlsq}`); 248 window.open(href, `djbworkFrameview${item.bsmSlsq}`);
226 } else { 249 } else {
...@@ -232,10 +255,10 @@ ...@@ -232,10 +255,10 @@
232 ); 255 );
233 window.open(href, `workFrameView${item.bsmSlsq}`); 256 window.open(href, `workFrameView${item.bsmSlsq}`);
234 } 257 }
235 } 258 },
236 } 259 },
237 } 260 };
238 </script> 261 </script>
239 <style scoped lang="scss"> 262 <style scoped lang="scss">
240 @import "~@/styles/public.scss"; 263 @import "~@/styles/public.scss";
241 </style> 264 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-02 10:02:46 4 * @LastEditTime: 2023-08-07 17:31:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -96,16 +96,16 @@ ...@@ -96,16 +96,16 @@
96 </el-col> 96 </el-col>
97 </el-row> 97 </el-row>
98 <el-row> 98 <el-row>
99 <el-col :span="7"> 99 <el-col :span="6">
100 <el-form-item label="项目名称"> 100 <el-form-item label="项目名称">
101 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input> 101 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input>
102 </el-form-item> 102 </el-form-item>
103 </el-col> 103 </el-col>
104 104
105 <el-col :span="3" class="btnColRight"> 105 <el-col :span="18" class="btnColRight">
106 <el-form-item> 106 <el-form-item>
107 <el-button type="primary" @click="resetForm(true)">重置</el-button> 107 <el-button type="primary" @click="resetForm(true)">重置</el-button>
108 <el-button type="primary" @click="handleSearch">查询11</el-button> 108 <el-button type="primary" @click="handleSearch">查询</el-button>
109 </el-form-item> 109 </el-form-item>
110 </el-col> 110 </el-col>
111 </el-row> 111 </el-row>
......
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
198 if (data[index].sffqlc == "1") { 198 if (data[index].sffqlc == "1") {
199 this.selectParam = data[index]; 199 this.selectParam = data[index];
200 this.btnDisabled = false; 200 this.btnDisabled = false;
201 this.djqxList = []
201 } else { 202 } else {
202 this.btnDisabled = true; 203 this.btnDisabled = true;
203 this.getNextNode(data[index].bsmSqyw); 204 this.getNextNode(data[index].bsmSqyw);
......