c97c8c01 by xiaomiao

--no commit message

1 parent d6ddac43
Showing 30 changed files with 85 additions and 72 deletions
import { log } from 'bpmn-js-token-simulation';
import { mapGetters } from 'vuex'
import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
export default {
......@@ -9,13 +10,23 @@ export default {
}
}
},
created() {
},
computed: {
...mapGetters(['dictData']),
},
mounted () {
window.addEventListener('keydown', this.handkeyCode, true)//开启监听键盘按下事件
this.handleSearch()
},
methods: {
handkeyCode(e) {
if(e.keyCode === 13){
console.log("安");
this.handleSearch()
}
},
handleSearch(){
this.pageData.currentPage = 1
if (this.fetchData) {
......
......@@ -30,7 +30,7 @@
:key="index"
>
<div>
<p>{{ item.qllxmc }} ||{{ item.operate }}</p>
<p>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
<!-- <p class="title-detail">{{ item.zl }}</p> -->
</div>
<i
......@@ -263,5 +263,8 @@ export default {
}
.blxx {
border: #b0d9f8 solid 1px;
.tpcolor{
color: red;
}
}
</style>
......
......@@ -34,7 +34,7 @@
</template>
<script>
import { mapGetters } from "vuex";
import clxxAddDialog from "./components/tabsconcent/clxxAddDialog.vue";
import clxxAddDialog from "./components/clxxAddDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { popupDialog } from "@/utils/popup.js";
......
<!--
* @Description : 房地产权1
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:45:00
* @LastEditTime : 2023-06-16 10:23:27
-->
<template>
<div class="djxxTable">
......@@ -111,23 +111,22 @@
},
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '取消编辑'
// });
// });
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
......
<!--
* @Description : 房地产权2
* @Autor : miaofang
* @LastEditTime : 2023-06-14 10:52:48
* @LastEditTime : 2023-06-16 10:24:19
-->
<template>
<div class="djxxTable">
......@@ -108,23 +108,23 @@ export default {
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '取消编辑'
// });
// });
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
......
<!--
* @Description :国有建设用地使用权
* @Autor : miaofang
* @LastEditTime : 2023-06-13 13:55:51
* @LastEditTime : 2023-06-16 10:23:54
-->
<template>
<div class="djxxTable">
......@@ -115,23 +115,23 @@
},
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '取消编辑'
// });
// });
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
......
......@@ -10,7 +10,7 @@
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
<div class="spyj_form" v-for="(item, index) in tableData" :key="index">
<div class="item_left">
{{ item.jdmc }}初审意见
{{ item.jdmc }}意见
</div>
<div class="item_right">
<el-row>
......@@ -101,7 +101,9 @@
getSpyjList(formdata).then((res) => {
this.$endLoading()
if (res.code === 200 && res.result) {
this.tableData = res.result ? res.result : []
console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData);
if (res.result.length == 0) {
that.isNoData = true
}
......
......@@ -98,14 +98,24 @@ export function getForm (tabName, djywbm) {
break;
// 受理信息
case "slxx":
form = require("@/views/djbworkflow/djbBook/slxx.vue");
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/djbBook/components/clxx.vue");
// break;
// case "spyj":
// form = require("@/views/djbworkflow/djbBook/components/spyj.vue");
// break;
// case "slxx":
// form = require("@/views/djbworkflow/djbBook/slxx.vue");
// break;
case "clxx":
form = require("@/views/djbworkflow/djbBook/clxx.vue");
break;
case "spyj":
form = require("@/views/djbworkflow/djbBook/spyj.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/components/clxxUnify.vue");
// break;
......
......@@ -126,7 +126,7 @@ export default {
getCurrentSelectProps (val) {
this.currentSelectProps = val
if(this.currentSelectProps.bsmRepair){
this.tabset()
this.tabset(val)
}else{
this.getdjblist()
}
......@@ -159,11 +159,11 @@ export default {
},
tabset(){
tabset(val){
this.tabName = '';
this.tabList = [
{
name: "受理信息",
name:val.qllxmc+ "补录信息",
value: "slxx",
sort: 1,
},
......@@ -185,10 +185,6 @@ export default {
},
// stepForm(index){
// console.log(index);
// },
//右侧表单选项卡事件
beforeLeave (activeName, oldActiveName) {
if (activeName && activeName != 0) this.getFromRouter(activeName)
......@@ -201,11 +197,13 @@ export default {
break;
}
}
console.log("this.$route.query.sqywbm",this.$route.query.sqywbm);
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
},
// 增加补录记录
addRepairRecord(row){
console.log("this.currentSelectProps",this.currentSelectProps);
let from={
bsmQlxx:"",
bsmSlsq:this.bsmSlsq,
......@@ -216,6 +214,7 @@ export default {
if(row){
from.bsmQlxx=row.bsmQlxx
from.operate="U"
from.qllx=row.qllx
}
addRepairRecord(from).then((res) => {
......
......@@ -100,7 +100,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
selectCfdj({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
......
......@@ -171,7 +171,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
if (!this.isJump) {
//从业务办理进入
......
......@@ -70,7 +70,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectNydsyqQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -98,7 +98,6 @@
methods: {
//默认加载表格信息
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.bsmSqyw = this.bsmSqyw;
selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -57,7 +57,7 @@
import table from "@/utils/mixin/table";
import { datas, sendThis } from "../javascript/selectDjbbl.js";
import { getDjbBysearch } from "@/api/zhcx.js";
import jump from "../components/mixin/jump";
import jump from "../components/mixin/djbbljump";
export default {
name: "djbcx",
mixins: [table, jump],
......@@ -140,7 +140,6 @@
this.$message.error("请至少选择一条数据");
return;
}
console.log("this.sqywInfo", this.sqywInfo, this.sqywInfo.nodetype == "djqx");
let from = {
bsmSqyw: this.bsmSqyw,
bdcdysz: this.bdcdysz,
......
......@@ -75,7 +75,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -75,7 +75,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -83,7 +83,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -79,7 +79,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -75,7 +75,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectYgdj200({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -75,7 +75,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectYgdy({ ...this.queryForm, ...this.pageData }).then((res) => {
......