c97c8c01 by xiaomiao

--no commit message

1 parent d6ddac43
Showing 30 changed files with 85 additions and 72 deletions
1 import { log } from 'bpmn-js-token-simulation';
1 import { mapGetters } from 'vuex' 2 import { mapGetters } from 'vuex'
2 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar"; 3 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
3 export default { 4 export default {
...@@ -9,13 +10,23 @@ export default { ...@@ -9,13 +10,23 @@ export default {
9 } 10 }
10 } 11 }
11 }, 12 },
13 created() {
14
15 },
12 computed: { 16 computed: {
13 ...mapGetters(['dictData']), 17 ...mapGetters(['dictData']),
14 }, 18 },
15 mounted () { 19 mounted () {
20 window.addEventListener('keydown', this.handkeyCode, true)//开启监听键盘按下事件
16 this.handleSearch() 21 this.handleSearch()
17 }, 22 },
18 methods: { 23 methods: {
24 handkeyCode(e) {
25 if(e.keyCode === 13){
26 console.log("安");
27 this.handleSearch()
28 }
29 },
19 handleSearch(){ 30 handleSearch(){
20 this.pageData.currentPage = 1 31 this.pageData.currentPage = 1
21 if (this.fetchData) { 32 if (this.fetchData) {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 :key="index" 30 :key="index"
31 > 31 >
32 <div> 32 <div>
33 <p>{{ item.qllxmc }} ||{{ item.operate }}</p> 33 <p>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
34 <!-- <p class="title-detail">{{ item.zl }}</p> --> 34 <!-- <p class="title-detail">{{ item.zl }}</p> -->
35 </div> 35 </div>
36 <i 36 <i
...@@ -263,5 +263,8 @@ export default { ...@@ -263,5 +263,8 @@ export default {
263 } 263 }
264 .blxx { 264 .blxx {
265 border: #b0d9f8 solid 1px; 265 border: #b0d9f8 solid 1px;
266 .tpcolor{
267 color: red;
268 }
266 } 269 }
267 </style> 270 </style>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </template> 34 </template>
35 <script> 35 <script>
36 import { mapGetters } from "vuex"; 36 import { mapGetters } from "vuex";
37 import clxxAddDialog from "./components/tabsconcent/clxxAddDialog.vue"; 37 import clxxAddDialog from "./components/clxxAddDialog.vue";
38 import imagePreview from '@/views/components/imagePreview.vue' 38 import imagePreview from '@/views/components/imagePreview.vue'
39 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 39 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
40 import { popupDialog } from "@/utils/popup.js"; 40 import { popupDialog } from "@/utils/popup.js";
......
1 <!-- 1 <!--
2 * @Description : 房地产权1 2 * @Description : 房地产权1
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-02 14:45:00 4 * @LastEditTime : 2023-06-16 10:23:27
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -111,23 +111,22 @@ ...@@ -111,23 +111,22 @@
111 }, 111 },
112 // 编辑 112 // 编辑
113 editDialog(row){ 113 editDialog(row){
114 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 114 // this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
115 confirmButtonText: '确定', 115 // confirmButtonText: '确定',
116 cancelButtonText: '取消', 116 // cancelButtonText: '取消',
117 type: 'warning' 117 // type: 'warning'
118 }).then(() => { 118 // }).then(() => {
119 this.$parent.addRepairRecord(row) 119 this.$parent.addRepairRecord(row)
120 120 // this.$message({
121 this.$message({ 121 // type: 'success',
122 type: 'success', 122 // message: '补录成功!'
123 message: '补录成功!' 123 // });
124 }); 124 // }).catch(() => {
125 }).catch(() => { 125 // this.$message({
126 this.$message({ 126 // type: 'info',
127 type: 'info', 127 // message: '取消编辑'
128 message: '取消编辑' 128 // });
129 }); 129 // });
130 });
131 130
132 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", { 131 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
133 // datalist:this.columns, 132 // datalist:this.columns,
......
1 <!-- 1 <!--
2 * @Description : 房地产权2 2 * @Description : 房地产权2
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-14 10:52:48 4 * @LastEditTime : 2023-06-16 10:24:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -108,23 +108,23 @@ export default { ...@@ -108,23 +108,23 @@ export default {
108 108
109 // 编辑 109 // 编辑
110 editDialog(row){ 110 editDialog(row){
111 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 111 // this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
112 confirmButtonText: '确定', 112 // confirmButtonText: '确定',
113 cancelButtonText: '取消', 113 // cancelButtonText: '取消',
114 type: 'warning' 114 // type: 'warning'
115 }).then(() => { 115 // }).then(() => {
116 this.$parent.addRepairRecord(row) 116 this.$parent.addRepairRecord(row)
117 117
118 this.$message({ 118 // this.$message({
119 type: 'success', 119 // type: 'success',
120 message: '补录成功!' 120 // message: '补录成功!'
121 }); 121 // });
122 }).catch(() => { 122 // }).catch(() => {
123 this.$message({ 123 // this.$message({
124 type: 'info', 124 // type: 'info',
125 message: '取消编辑' 125 // message: '取消编辑'
126 }); 126 // });
127 }); 127 // });
128 128
129 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", { 129 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
130 // datalist:this.columns, 130 // datalist:this.columns,
......
1 <!-- 1 <!--
2 * @Description :国有建设用地使用权 2 * @Description :国有建设用地使用权
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-13 13:55:51 4 * @LastEditTime : 2023-06-16 10:23:54
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -115,23 +115,23 @@ ...@@ -115,23 +115,23 @@
115 }, 115 },
116 // 编辑 116 // 编辑
117 editDialog(row){ 117 editDialog(row){
118 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 118 // this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
119 confirmButtonText: '确定', 119 // confirmButtonText: '确定',
120 cancelButtonText: '取消', 120 // cancelButtonText: '取消',
121 type: 'warning' 121 // type: 'warning'
122 }).then(() => { 122 // }).then(() => {
123 this.$parent.addRepairRecord(row) 123 this.$parent.addRepairRecord(row)
124 124
125 this.$message({ 125 // this.$message({
126 type: 'success', 126 // type: 'success',
127 message: '补录成功!' 127 // message: '补录成功!'
128 }); 128 // });
129 }).catch(() => { 129 // }).catch(() => {
130 this.$message({ 130 // this.$message({
131 type: 'info', 131 // type: 'info',
132 message: '取消编辑' 132 // message: '取消编辑'
133 }); 133 // });
134 }); 134 // });
135 135
136 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", { 136 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
137 // datalist:this.columns, 137 // datalist:this.columns,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index">
12 <div class="item_left"> 12 <div class="item_left">
13 {{ item.jdmc }}初审意见 13 {{ item.jdmc }}意见
14 </div> 14 </div>
15 <div class="item_right"> 15 <div class="item_right">
16 <el-row> 16 <el-row>
...@@ -101,7 +101,9 @@ ...@@ -101,7 +101,9 @@
101 getSpyjList(formdata).then((res) => { 101 getSpyjList(formdata).then((res) => {
102 this.$endLoading() 102 this.$endLoading()
103 if (res.code === 200 && res.result) { 103 if (res.code === 200 && res.result) {
104
104 this.tableData = res.result ? res.result : [] 105 this.tableData = res.result ? res.result : []
106 console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData);
105 if (res.result.length == 0) { 107 if (res.result.length == 0) {
106 that.isNoData = true 108 that.isNoData = true
107 } 109 }
......
...@@ -98,14 +98,24 @@ export function getForm (tabName, djywbm) { ...@@ -98,14 +98,24 @@ export function getForm (tabName, djywbm) {
98 break; 98 break;
99 // 受理信息 99 // 受理信息
100 case "slxx": 100 case "slxx":
101 form = require("@/views/djbworkflow/djbBook/slxx.vue"); 101 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
102 break; 102 break;
103 // case "clxx":
104 // form = require("@/views/djbworkflow/djbBook/components/clxx.vue");
105 // break;
106 // case "spyj":
107 // form = require("@/views/djbworkflow/djbBook/components/spyj.vue");
108 // break;
109 // case "slxx":
110 // form = require("@/views/djbworkflow/djbBook/slxx.vue");
111 // break;
103 case "clxx": 112 case "clxx":
104 form = require("@/views/djbworkflow/djbBook/clxx.vue"); 113 form = require("@/views/djbworkflow/djbBook/clxx.vue");
105 break; 114 break;
106 case "spyj": 115 case "spyj":
107 form = require("@/views/djbworkflow/djbBook/spyj.vue"); 116 form = require("@/views/djbworkflow/djbBook/spyj.vue");
108 break; 117 break;
118
109 // case "clxx": 119 // case "clxx":
110 // form = require("@/views/djbworkflow/components/clxxUnify.vue"); 120 // form = require("@/views/djbworkflow/components/clxxUnify.vue");
111 // break; 121 // break;
......
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
126 getCurrentSelectProps (val) { 126 getCurrentSelectProps (val) {
127 this.currentSelectProps = val 127 this.currentSelectProps = val
128 if(this.currentSelectProps.bsmRepair){ 128 if(this.currentSelectProps.bsmRepair){
129 this.tabset() 129 this.tabset(val)
130 }else{ 130 }else{
131 this.getdjblist() 131 this.getdjblist()
132 } 132 }
...@@ -159,11 +159,11 @@ export default { ...@@ -159,11 +159,11 @@ export default {
159 159
160 }, 160 },
161 161
162 tabset(){ 162 tabset(val){
163 this.tabName = ''; 163 this.tabName = '';
164 this.tabList = [ 164 this.tabList = [
165 { 165 {
166 name: "受理信息", 166 name:val.qllxmc+ "补录信息",
167 value: "slxx", 167 value: "slxx",
168 sort: 1, 168 sort: 1,
169 }, 169 },
...@@ -185,10 +185,6 @@ export default { ...@@ -185,10 +185,6 @@ export default {
185 185
186 }, 186 },
187 187
188 // stepForm(index){
189 // console.log(index);
190 // },
191
192 //右侧表单选项卡事件 188 //右侧表单选项卡事件
193 beforeLeave (activeName, oldActiveName) { 189 beforeLeave (activeName, oldActiveName) {
194 if (activeName && activeName != 0) this.getFromRouter(activeName) 190 if (activeName && activeName != 0) this.getFromRouter(activeName)
...@@ -201,11 +197,13 @@ export default { ...@@ -201,11 +197,13 @@ export default {
201 break; 197 break;
202 } 198 }
203 } 199 }
200 console.log("this.$route.query.sqywbm",this.$route.query.sqywbm);
204 this.componentTag = getForm(tabname, this.$route.query.sqywbm); 201 this.componentTag = getForm(tabname, this.$route.query.sqywbm);
205 }, 202 },
206 203
207 // 增加补录记录 204 // 增加补录记录
208 addRepairRecord(row){ 205 addRepairRecord(row){
206 console.log("this.currentSelectProps",this.currentSelectProps);
209 let from={ 207 let from={
210 bsmQlxx:"", 208 bsmQlxx:"",
211 bsmSlsq:this.bsmSlsq, 209 bsmSlsq:this.bsmSlsq,
...@@ -216,6 +214,7 @@ export default { ...@@ -216,6 +214,7 @@ export default {
216 if(row){ 214 if(row){
217 from.bsmQlxx=row.bsmQlxx 215 from.bsmQlxx=row.bsmQlxx
218 from.operate="U" 216 from.operate="U"
217 from.qllx=row.qllx
219 } 218 }
220 219
221 addRepairRecord(from).then((res) => { 220 addRepairRecord(from).then((res) => {
......
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
100 }, 100 },
101 methods: { 101 methods: {
102 queryClick () { 102 queryClick () {
103 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
104 this.$startLoading(); 103 this.$startLoading();
105 selectCfdj({ ...this.queryForm, ...this.pageData }).then((res) => { 104 selectCfdj({ ...this.queryForm, ...this.pageData }).then((res) => {
106 this.$endLoading(); 105 this.$endLoading();
......
...@@ -171,7 +171,6 @@ ...@@ -171,7 +171,6 @@
171 }, 171 },
172 methods: { 172 methods: {
173 queryClick () { 173 queryClick () {
174 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
175 this.$startLoading(); 174 this.$startLoading();
176 if (!this.isJump) { 175 if (!this.isJump) {
177 //从业务办理进入 176 //从业务办理进入
......
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
70 }, 70 },
71 methods: { 71 methods: {
72 queryClick () { 72 queryClick () {
73 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
74 this.$startLoading(); 73 this.$startLoading();
75 this.queryForm.sqywbm = this.sqywInfo.djywbm; 74 this.queryForm.sqywbm = this.sqywInfo.djywbm;
76 selectNydsyqQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 75 selectNydsyqQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
98 methods: { 98 methods: {
99 //默认加载表格信息 99 //默认加载表格信息
100 queryClick () { 100 queryClick () {
101 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
102 this.$startLoading(); 101 this.$startLoading();
103 this.queryForm.bsmSqyw = this.bsmSqyw; 102 this.queryForm.bsmSqyw = this.bsmSqyw;
104 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 103 selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 import table from "@/utils/mixin/table"; 57 import table from "@/utils/mixin/table";
58 import { datas, sendThis } from "../javascript/selectDjbbl.js"; 58 import { datas, sendThis } from "../javascript/selectDjbbl.js";
59 import { getDjbBysearch } from "@/api/zhcx.js"; 59 import { getDjbBysearch } from "@/api/zhcx.js";
60 import jump from "../components/mixin/jump"; 60 import jump from "../components/mixin/djbbljump";
61 export default { 61 export default {
62 name: "djbcx", 62 name: "djbcx",
63 mixins: [table, jump], 63 mixins: [table, jump],
...@@ -140,7 +140,6 @@ ...@@ -140,7 +140,6 @@
140 this.$message.error("请至少选择一条数据"); 140 this.$message.error("请至少选择一条数据");
141 return; 141 return;
142 } 142 }
143 console.log("this.sqywInfo", this.sqywInfo, this.sqywInfo.nodetype == "djqx");
144 let from = { 143 let from = {
145 bsmSqyw: this.bsmSqyw, 144 bsmSqyw: this.bsmSqyw,
146 bdcdysz: this.bdcdysz, 145 bdcdysz: this.bdcdysz,
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 }, 75 },
76 methods: { 76 methods: {
77 queryClick () { 77 queryClick () {
78 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
79 this.$startLoading(); 78 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 79 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => { 80 selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 }, 75 },
76 methods: { 76 methods: {
77 queryClick () { 77 queryClick () {
78 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
79 this.$startLoading(); 78 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 79 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { 80 selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
83 }, 83 },
84 methods: { 84 methods: {
85 queryClick () { 85 queryClick () {
86 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
87 this.$startLoading(); 86 this.$startLoading();
88 this.queryForm.sqywbm = this.sqywInfo.djywbm; 87 this.queryForm.sqywbm = this.sqywInfo.djywbm;
89 selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => { 88 selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
79 }, 79 },
80 methods: { 80 methods: {
81 queryClick () { 81 queryClick () {
82 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
83 this.$startLoading(); 82 this.$startLoading();
84 this.queryForm.sqywbm = this.sqywInfo.djywbm; 83 this.queryForm.sqywbm = this.sqywInfo.djywbm;
85 selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => { 84 selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 }, 75 },
76 methods: { 76 methods: {
77 queryClick () { 77 queryClick () {
78 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
79 this.$startLoading(); 78 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 79 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectYgdj200({ ...this.queryForm, ...this.pageData }).then((res) => { 80 selectYgdj200({ ...this.queryForm, ...this.pageData }).then((res) => {
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
75 }, 75 },
76 methods: { 76 methods: {
77 queryClick () { 77 queryClick () {
78 console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
79 this.$startLoading(); 78 this.$startLoading();
80 this.queryForm.sqywbm = this.sqywInfo.djywbm; 79 this.queryForm.sqywbm = this.sqywInfo.djywbm;
81 selectYgdy({ ...this.queryForm, ...this.pageData }).then((res) => { 80 selectYgdy({ ...this.queryForm, ...this.pageData }).then((res) => {
......