Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c075fdae by jikai
Options

Merge remote-tracking branch 'origin/master'

2 parents bd291794 8488098c
Inline Side-by-side
Showing 37 changed files with 1253 additions and 97 deletions
VUE_APP_api = 'https://192.168.2.111:8006'
VUE_APP_api1 = 'https://127.0.0.1:8006'
VUE_APP_api2 = 'https://192.168.2.9:8006'
VUE_APP_api3 = 'https://192.168.2.11:8006'
VUE_APP_api4 = 'http://192.168.2.111:18080'
VUE_APP_api2 = 'https://192.168.2.145:8006'
VUE_APP_api3 = 'https://192.168.2.119:8006'
VUE_APP_api4 = 'http://192.168.2.146:8006'
VUE_APP_api5 = 'https://192.168.2.142:8006'
VUE_APP_name = '开发环境'
NODE_ENV="development"
VUE_APP_VERSION = 'psh'
......
import request from "@/plugin/axios";
/**
* 新增个性化配置信息
*/
export function insertGxh(data) {
return request({
url: '/gxh/insertGxh',
method: 'post',
data: data,
})
}
/**
* 修改个性化配置信息
*/
export function updateGxh(data) {
return request({
url: '/gxh/updateGxh',
method: 'post',
data: data,
})
}
/**
* 查询个性化配置信息
*/
export function getGxhList(data) {
return request({
url: '/gxh/getGxhList',
method: 'get',
params: {
title: data.title,
code: data.code,
pageNo: data.pageNo,
pageSize: data.pageSize,
}
})
}
// export function getGxhList(data) {
// return request({
// url: '/gxh/getGxhList',
// method: 'post',
// params: data
// })
// }
\ No newline at end of file
......@@ -11,3 +11,14 @@ export function getQjLqDetailById(data) {
}
})
}
/**
* 保存林权信息
*/
export function updateQjLq(data) {
return request({
url: '/system/qjLq/updateQjLq',
method: 'put',
data: data
})
}
......
......@@ -44,6 +44,19 @@ export function getQlrInfoByGlbsm(data) {
},
})
}
/**
* 根据glbsm和type查询qlr信息
*/
export function getQlrByGlbsmAndType(data) {
return request({
url: '/system/Qlr/getQlrByGlbsmAndType',
method: 'get',
params: {
glbsm:data.bsm,
type:data.type
},
})
}
/**
* 更新权利人共有公用情况
......
import request from '@/plugin/axios'
/**
* 查询土地承包经营权、农用地其他使用权调查表基本信息
*/
export function getQjTdcbjyqNydqtsyqdcDetailByZdbsm(data) {
return request({
url: '/zd/qjTdcbjyqNydqtsyqdc/getQjTdcbjyqNydqtsyqdcDetailByZdbsm',
method: 'get',
params: {
zdbsm: data,
}
})
}
/**
* 保存权籍_土地承包经营权、农用地其他使用权调查基本信息
*/
export function saveOrUpdateQjTdcbjyqNydqtsyqdc(data) {
return request({
url: '/zd/qjTdcbjyqNydqtsyqdc/saveOrUpdateQjTdcbjyqNydqtsyqdc',
method: 'post',
data: data,
})
}
......@@ -12,7 +12,7 @@
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
宗地代码:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.zddm"></el-input>
......
......@@ -176,10 +176,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......@@ -274,10 +274,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -11,10 +11,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -2,9 +2,14 @@
<div class="temp">
<table class="tempTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<template v-if="lq == ''">
<td colspan="2"><span class="table-title">权利人信息</span></td>
<td colspan="2">共有方式</td>
<td colspan="8">
</template>
<template v-else>
<td colspan="2">共有方式</td>
</template>
<td :colspan="lq == '' ? 8 : 10">
<el-row>
<el-col :span="14" class="fl" style="line-height:32px">
<el-radio-group v-model="gyfs" @change="updateGyfs">
......@@ -311,7 +316,7 @@
<script>
import {getDdicByMC} from "@api/common";
import {insertQlrDlrFr,getQlrInfoByGlbsm,updateQlrDlrFr,deleteQlrDlrFrByQlrbsm,updateGyGyQlrQk} from "@api/qlr";
import {insertQlrDlrFr,getQlrInfoByGlbsm,updateQlrDlrFr,deleteQlrDlrFrByQlrbsm,updateGyGyQlrQk,getQlrByGlbsmAndType} from "@api/qlr";
export default {
props: {
......@@ -338,7 +343,13 @@
lq:{
type: String,
default: "",
}
},
// lqData:{
// type: Array,
// default: () => {
// return [];
// },
// }
},
data() {
return {
......@@ -649,6 +660,7 @@
}
},
getQlrInfo(bsm){
if(this.lq == ""){
getQlrInfoByGlbsm(bsm).then((res)=>{
if(res.code){
if(res.result!=null){
......@@ -661,6 +673,24 @@
}
}
})
}else{
let params = {
bsm:bsm,
type:this.lq
}
getQlrByGlbsmAndType(params).then((res)=>{
if(res.code){
if(res.result!=null){
this.tableData=res.result;
if(this.tableData.length===0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}else {
this.gyfs=res.result[0].gyfsbsm;
}
}
}
})
}
}
},
created(){
......
......@@ -7,10 +7,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
@change="query"
></el-input>
</el-form-item>
......
......@@ -385,7 +385,7 @@ export default {
}
}
}
.iszrz{
.iszrz,.isgzw{
left: 0px!important;
text-indent: 96px;
}
......
......@@ -5,7 +5,7 @@
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
宗地代码:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.zddm"></el-input>
......
......@@ -14,10 +14,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -4,10 +4,11 @@
<el-row>
<el-col :span="18">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
maxlength="19"
@change="query"
></el-input>
</el-form-item>
......@@ -76,11 +77,10 @@
<el-checkbox label="zd" name="type">宗地</el-checkbox>
<el-checkbox label="dz" name="type">多幢</el-checkbox>
<el-checkbox label="zrz" name="type">自然幢</el-checkbox>
<el-checkbox label="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="gzw" name="type" v-show="type !== 'add'">构筑物</el-checkbox>
<el-checkbox label="lq" name="type" v-show="type !== 'add'">林权</el-checkbox>
<el-checkbox label="h" name="type" v-show="type !== 'add'">户</el-checkbox>
<!-- <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="lq" name="type">林权</el-checkbox>
<el-checkbox label="zh" name="type">宗海</el-checkbox> -->
<!-- <el-checkbox label="zh" name="type">宗海</el-checkbox> -->
</el-checkbox-group>
</el-form-item>
</el-form>
......
......@@ -12,6 +12,7 @@
action="/api/tx/excelGeo/import"
:data="sxdrData"
:on-success="uploadSuccess"
:before-upload="uploadProgress"
:show-file-list="false"
multiple
>
......@@ -92,17 +93,21 @@
elemIF.style.display = "none";
document.body.appendChild(elemIF)
},
uploadProgress(){
vm.loadingShow('正在导入中')
},
uploadSuccess(res, file, fileList) {
this.errorData = [];
vm.loadingHide();
if (res.success) {
this.$message.success("上传成功")
this.$message.success("导入成功")
this.loading();
this.close()
} else {
if (res.result == null) {
this.$message.error(res.message)
} else {
this.$message.error("上传失败")
this.$message.error("导入失败")
this.errorData = res.result;
}
}
......
......@@ -11,10 +11,10 @@
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -117,6 +117,12 @@ const constantRoutes = [
code: "1-3",
component: () => import("@/views/lq/index"),
},
{
path: "/zykfzddgxhgl",
name: "个性化管理",
code: "1-4",
component: () => import("@/views/manage/gxhgl/index"),
},
],
},
];
......
......@@ -55,6 +55,9 @@ const store = new Vuex.Store({
newZdbsm:'',
isWorkFlow:false, // 判断是否工作流数据
lcgzShow:false,//是否待办箱的数据，显示流程追踪
familyList:[], //家庭关系分类
syttlx:[],//水域滩涂类型
yzyfs:[] //养殖业方式
},
modules: {
user,
......
......@@ -321,6 +321,10 @@ export default {
s.cqlyOptions = s.cqlyOptions.length == 0 ?await this.getDicData("产权来源") : s.cqlyOptions;
s.jgOptions = s.jgOptions.length == 0 ?await this.getDicData("房屋结构") : s.jgOptions;
s.gmjjhyflbsmList = s.gmjjhyflbsmList.length == 0 ?await this.getDicData("国民经济行业分类代码") : s.gmjjhyflbsmList;
s.familyList = s.familyList.length == 0 ?await this.getDicData("家庭成员") : s.familyList;
s.syttlx = s.syttlx.length == 0 ?await this.getDicData("水域滩涂类型") : s.syttlx;
s.yzyfs = s.yzyfs.length == 0 ?await this.getDicData("养殖业方式") : s.yzyfs;
},
async getDicData(name) {
return await getDdicByMC(name).then((res)=> {
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
......@@ -196,6 +196,8 @@
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled"
v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled"
v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
<div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
......@@ -204,6 +206,9 @@
<el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
<el-button type="primary" @click="shdz" v-if="workFlowState">审核</el-button>
</div>
<div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
<el-button type="primary" @click="onSubmitWithoutWorkflow" :disabled="disabled" >提交</el-button>
</div>
</div>
</template>
......@@ -606,6 +611,22 @@
// }
// })
},
onSubmitWithoutWorkflow(){
console.log(this.form)
let data={
glbsm:this.bsm,
status:1,
type:"dz"
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！");
this.getDzDetailByBsm(this.$route.query.bsm)
this.getTreeByBsm(this.$route.query.bsm,'dz','0,1,2')
}
})
},
getZddm(zdbsm){
getQjZdjbxxDetailById(zdbsm).then((res)=>{
if(res.code===200){
......
......@@ -17,11 +17,11 @@
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >坐落</td>
<td colspan="2" align="center" ><i class="requisite">*</i>坐落</td>
<td colspan="4" >
<input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="zl">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="2" align="center" ><i class="requisite">*</i>不动产单元号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="bdcdyh">
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button>
......
......@@ -5,33 +5,22 @@
</template>
<script>
import Lqdcb from "./lqdcb"
import Lqdcb from "./lqdcb";
export default {
name: "",
components: {
Lqdcb
Lqdcb,
},
props: {},
data() {
return {
activeName:'lqdcb'
activeName: "lqdcb",
};
},
methods: {
// getZdData(bsm) {
// getQjLqjbxxDetailById(bsm).then((res) => {
// if (res.success) {
// console.log(res, "宗地信息");
// this.isFldc = res.result.zdtzmbsm === "PSHGSBDCQJDC000000000000DC440010";
// this.isTdcb = res.result.zdtzmbsm === ("PSHGSBDCQJDC000000000000DC440060" || "PSHGSBDCQJDC000000000000DC440070" ||"PSHGSBDCQJDC000000000000DC440080");
// }
// });
// },
},
created() {},
mounted() {
// this.getZdData(this.$route.query.bsm);
},
computed: {
lhbsm() {
......@@ -39,9 +28,7 @@ export default {
},
},
watch: {
lhbsm: function(val) {
},
lhbsm: function(val) {},
},
};
</script>
......
......@@ -22,6 +22,7 @@
:qszt="formData.qszt"
type="lq"
lq="1"
v-if="qlrShow"
></Qlr>
</td>
</tr>
......@@ -34,6 +35,7 @@
:qszt="formData.qszt"
type="lx"
lq="2"
v-if="qlrShow"
></Qlr>
</td>
</tr>
......@@ -85,7 +87,7 @@
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.djh"
v-model="formData.zlnd"
/>
</td>
......@@ -154,7 +156,7 @@
type="text"
:disabled="disabled"
class="formInput"
v-model="formData.mj"
v-model="formData.syqmj "
/>
</td>
<td colspan="2" class="tdright">起源</td>
......@@ -191,11 +193,11 @@
<td colspan="2" class="tdright">林种</td>
<td colspan="10">
<el-radio-group class="fl" v-model="formData.lz">
<el-radio :label="1">防护林</el-radio>
<el-radio :label="2">用材林</el-radio>
<el-radio :label="3">经济林</el-radio>
<el-radio :label="4">薪炭林</el-radio>
<el-radio :label="5">特种用途体</el-radio>
<el-radio label="1">防护林</el-radio>
<el-radio label="2">用材林</el-radio>
<el-radio label="3">经济林</el-radio>
<el-radio label="4">薪炭林</el-radio>
<el-radio label="5">特种用途体</el-radio>
</el-radio-group>
</td>
</tr>
......@@ -220,7 +222,7 @@
@blur="inputBlur($event, false)"
maxlength="3"
onkeyup="value=value.replace(/[^\d]/g,'')"
v-model="formData.syqx"
v-model="formData.ldsyqx"
class="formInput"
/>
</td>
......@@ -274,14 +276,14 @@
</table>
<div class="header-button" :style="{ width: mainBoxWidth + 'px' }">
<el-button type="primary">保存</el-button>
<el-button type="primary" @click="updateQjLq">保存</el-button>
</div>
</div>
</template>
<script>
import Qlr from "@components/formMenu/qlr";
import { getQjLqDetailById } from "@api/lq"
import { getQjLqDetailById,updateQjLq } from "@api/lq"
export default {
name: "",
components: {
......@@ -294,18 +296,20 @@ export default {
formData: {
mjdw: "",
zddm: "",
zlnd:"",
dzwlx:"1",
bdcdyh: "",
zl: "",
xdm: "",
lb: "",
xb: "",
mj: "",
syqmj : "",
qy: "",
zs: "",
zysz: "",
lz: "",
ldsyqssj: "",
syqx: "",
ldsyqx: "",
ldsyjssj: "",
gyqk: "",
shyj: "",
......@@ -324,6 +328,7 @@ export default {
},
],
mainBoxWidth: 0,
qlrShow:false,
};
},
created() {},
......@@ -340,9 +345,25 @@ export default {
getQjLqDetailById(bsm).then((res) => {
if (res.success) {
console.log(res, "林权信息");
this.formData = res.result;
this.formData.dzwlx = "1";
this.qlrShow = true;
}
});
},
//生成宗地代码
generatorCode(){
},
//保存林权信息
updateQjLq(){
updateQjLq(this.formData).then((res) => {
if (res.success) {
console.log(res, "保存成功");
this.$message.success("保存成功")
}
});
}
},
computed: {},
watch: {},
......
<template>
<!-- <el-tabs v-model="activeName"> -->
<!-- <el-tab-pane label="个性化管理" name="zhcx"> -->
<div class="main">
<!-- <p class="tips">查询条件</p> -->
<el-form
:inline="true"
ref="ruleForm"
class="demo-form-inline"
>
<el-form-item label="个性化标题" class="w100" prop="syqlx">
<el-input
placeholder="输入个性化标题"
v-model="queryData.title"
@change="getData"
></el-input>
</el-form-item>
<el-form-item label="个性化代码" class="w100" prop="zdtzm">
<el-input
placeholder="输入个性化代码"
v-model="queryData.code"
@change="getData"
></el-input>
</el-form-item>
<el-form-item class="ml20">
<el-button type="primary" @click="getData" icon="el-icon-search"
>查询</el-button
>
<el-button
type="warning"
style="margin-left:60px"
@click="reset"
icon="el-icon-refresh"
>重置</el-button
>
</el-form-item>
<el-form-item style="margin-left:-20px">
<el-button
type="primary"
@click="gxhVisible = true"
icon="el-icon-plus"
>新增</el-button
>
<el-button
type="success"
style="margin-left:60px"
@click="save"
icon="el-icon-folder"
>保存</el-button
>
</el-form-item>
</el-form>
<!-- <p class="tips">查询列表</p> -->
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
:height="tableHeight"
>
<el-table-column
type="index"
width="80"
align="center"
label="序号"
>
</el-table-column>
<el-table-column prop="title" align="center" label="个性化标题">
</el-table-column>
<el-table-column prop="code" align="center" label="个性化代码">
</el-table-column>
<el-table-column prop="bz" align="center" label="备注">
</el-table-column>
<el-table-column prop="open" align="center" label="是否开启">
<template slot-scope="scope">
<el-switch
v-model="scope.row.open"
active-value="1"
inactive-value="0"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row)"
/>
</template>
</el-table-column>
<!-- <el-table-column width="80px" align="center" label="操作">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" content="删除" placement="top">
<i class="iconfont iconshanchu1" @click="handleClick(scope.row)" style="padding:0 10px"></i>
</el-tooltip>
</template>
</el-table-column> -->
</el-table>
<div class="pagination">
<el-pagination
background
layout="prev, pager, next,total"
:total="total"
:current-page="pageNo"
:page-size="pageSize"
@current-change="handleCurrentChange"
>
</el-pagination>
</div>
<el-dialog
v-dialogDrag
:close-on-click-modal="false"
title="新增个性化配置"
:visible.sync="gxhVisible"
width="30%"
>
<el-form ref="form" class="addForm" :model="form" label-width="100px">
<el-form-item label="个性化标题">
<el-input v-model="form.title"></el-input>
</el-form-item>
<el-form-item label="个性化代码">
<el-input v-model="form.code"></el-input>
</el-form-item>
<el-form-item label="是否开启">
<el-switch v-model="form.open" active-value="1" inactive-value="0" ></el-switch>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.bz"></el-input>
</el-form-item>
</el-form>
<div class="btnGroup">
<el-button type="primary" @click="addGxhData">确定</el-button>
<el-button type="primary" @click="gxhVisible = false"
>取消</el-button>
</div>
</el-dialog>
</div>
</div>
<!-- </el-tab-pane> -->
<!-- </el-tabs> -->
</template>
<script>
import { getGxhList,updateGxh,insertGxh } from "@api/gxhgl";
export default {
name: "",
inject: ["getRightTree", "getTreeByBsm"],
components: {},
props: {},
data() {
return {
activeName: "zhcx",
type: "all",
total: 0,
pageNo: 1,
pageSize: 15,
tableData: [
{
title: "宗地坐落必填",
code: "ZDZLBT",
bz: "宗地坐落必填",
open: true,
},
{
title: "宗地附件材料显示",
code: "ZDFJCLXS",
bz: "宗地附件材料显示",
open: false,
},
],
tableHeight: 0,
queryData: {
title: "",
code: "",
},
gxhVisible: false,
//新增数据
form:{
title: "",
code: "",
open:false,
bz:''
},
//已修改的数据
hasChanged:[],
};
},
created() {},
mounted() {
this.getData(this.queryData);
this.$nextTick(() => {
this.tableHeight =
(document.documentElement.clientHeight || document.body.clientHeight) -
277;
});
},
methods: {
//获取数据
getData() {
this.queryData.pageSize = this.pageSize;
this.queryData.pageNo = this.pageNo;
getGxhList(this.queryData).then((res) => {
this.tableData = res.result.records
this.total = res.result.total
// 查询后重置修改项
this.hasChanged = [];
})
.catch((error) => {});
//调用查询接口 给tableData赋值 TODO
},
//新增个性化配置
addGxhData() {
//调用接口 新增个性化配置数据 传入this.form TODO
insertGxh(this.form).then((res) => {
if(res.code == 200){
this.$message.success("添加成功")
this.gxhVisible = false;
this.getData();
}
})
.catch((error) => {});
},
//重置查询条件
reset() {
this.queryData = {
title: "",
code: "",
pageSize:"15",
pageNo:"1",
}
},
//翻页
handleCurrentChange(val) {
this.pageNo = val;
this.getData();
},
// 是否开启
changeEnabled(data) {
if(this.hasChanged.some( i => i.bsm == data.bsm)){
this.hasChanged.filter(i => i.bsm == data.bsm)
}else{
this.hasChanged.push(data);
}
},
//保存修改后的数据
save(){
if(this.hasChanged.length < 1){
this.$message.warning("暂无数据修改")
}else{
//接口调用 hasChanged为已修改数据项数组 TODO
updateGxh(this.hasChanged).then((res) => {
if(res.code == 200){
this.$message.success("修改成功")
}
this.getData();
})
.catch((error) => {});
}
},
//删除
handleClick(row){
//调用删除个性化数据接口，row是整条记录，需要id或者bsm自取 TODO
}
},
computed: {},
watch: {},
};
</script>
<style scoped lang="less">
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #f4f9ff;
.el-form {
width: 100%;
border: 1px solid #e6e6e6;
background-color: white;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 10px 15px;
/deep/.el-form-item {
margin-bottom: 0;
}
/deep/.el-form-item__label {
width: 100px;
}
/deep/ .el-form-item__content {
width: 300px;
.el-select {
width: 100%;
}
}
}
.addForm{
border: 0;
/deep/.el-form-item {
margin-bottom: 10px;
}
/deep/ .el-form-item__content {
width: auto;
}
}
.tips {
color: #9b9b9b;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin: 0 0 18px 0;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
.hbjDialog {
/deep/ .el-dialog {
margin-top: 10vh !important;
}
}
.btnGroup {
margin: 20px auto 0;
width: 230px;
.el-button+.el-button{
margin-left: 90px;
}
}
.ml20 {
margin-left: 20px;
}
.iconfont{
cursor: pointer;
}
}
</style>
......@@ -3,6 +3,7 @@
<el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
<el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
<el-tab-pane label="号段管理" name="hdgl"><hdgl></hdgl></el-tab-pane>
<el-tab-pane label="个性化管理" name="gxhgl"><gxhgl></gxhgl></el-tab-pane>
</el-tabs>
</template>
......@@ -10,10 +11,11 @@
import log from "./log"
import dictionary from "./dictionary"
import hdgl from "./hdgl";
import gxhgl from "./gxhgl";
export default {
name: "index",
components: {
log,dictionary,hdgl
log,dictionary,hdgl,gxhgl
},
data() {
return {
......
......@@ -6,10 +6,10 @@
<el-row>
<el-col :span="24" style="margin-left: -10px;">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -3,10 +3,10 @@
<el-row v-show="isSearch">
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-form-item label="宗地代码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
placeholder="输入宗地代码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
......
......@@ -157,6 +157,11 @@
this.getTreeByBsm(row.glbsm,"gzw",'0,1,2');
path = "/gzw";
break;
case "lq":
this.$store.state.gzwbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,"lq",'0,1,2');
path = "/lq";
break;
default:
break;
}
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
......@@ -7,6 +7,7 @@
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="uploadProgress"
:on-success="uploadSuccess"
:on-error="uploadError"
:show-file-list="false"
......@@ -143,7 +144,11 @@
uploadError(err, file, fileList) {
console.log("上传文件失败", err)
},
uploadProgress(){
vm.loadingShow('正在上传中')
},
uploadSuccess(res, file, fileList) {
this.$message.success("上传成功")
this.getFileList();
},
handleRemove(file, fileList) {
......
<template>
<div class="main">
土地承包经营权、农用地其他使用权调查表
<table cellspacing="0" cellpadding="0" border="1">
<thead>
<tr rowspan="2">
<td colspan="8">
<!-- <div class="tit">土地承包经营权、农用地其他使用权调查表</div> -->
<div class="dw">
单位 :
<el-radio-group v-model="formData.mjdw">
<el-radio :label="'1'">平方米</el-radio>
<el-radio :label="'2'">公顷</el-radio>
<el-radio :label="'3'">亩</el-radio>
</el-radio-group>
</div>
</td>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2" class="tdright">宗地代码</td>
<td colspan="6">
<input class="formInput" v-model="formData.zddm" disabled/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright">不动产单元号</td>
<td colspan="6">
<input class="formInput" v-model="formData.bdcdyh" disabled/>
</td>
</tr>
<tr >
<td rowspan="4" colspan="2" class="tdright">
发包方
</td>
<td colspan="1" class="tdright">名称</td>
<td colspan="5">
<input class="formInput" v-model="formData.fbfmc"/>
</td>
</tr>
<tr>
<td colspan="1" class="tdright">负责人姓名</td>
<td colspan="2">
<input class="formInput" v-model="formData.fzrxm"/>
</td>
<td colspan="1" class="tdright">联系电话</td>
<td colspan="2">
<input class="formInput" v-model="formData.lxdh"/>
</td>
</tr>
<tr>
<td colspan="1" class="tdright">负责人地址</td>
<td colspan="2">
<input class="formInput" v-model="formData.fzrdz"/>
</td>
<td colspan="1" class="tdright">邮政编码</td>
<td colspan="2">
<input class="formInput" v-model="formData.yzbm"/>
</td>
</tr>
<tr>
<td colspan="1" class="tdright">证件种类</td>
<td colspan="2">
<el-select class="formSelect" v-model="formData.zjzl" ref="zjzlbsm">
<el-option
v-for="item in $store.state.zjzlList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
</td>
<td colspan="1" class="tdright">证件号</td>
<td colspan="2">
<input class="formInput" v-model="formData.zjh"/>
</td>
</tr>
<tr >
<td :rowspan="chengbaoNum" colspan="2" class="tdright">
承包方
</td>
<td colspan="1" class="tdright">承包方(代表)</td>
<td colspan="5">
<input class="formInput" v-model="formData.cbfdb"/>
</td>
</tr>
<tr>
<td colspan="1" class="tdright">有无承包合同</td>
<td colspan="2">
<el-radio-group v-model="formData.ywcbht" class="has-choose">
<el-radio :label="1">有</el-radio>
<el-radio :label="0">无</el-radio>
</el-radio-group>
</td>
<td colspan="1" class="tdright"><i class="requisite" v-if="formData.ywcbht=='1'">*</i>承包合同编号</td>
<td colspan="2">
<input class="formInput" v-model="formData.cbhtbh"/>
</td>
</tr>
<tr>
<td colspan="1" class="tdright">有无经营权证</td>
<td colspan="2">
<el-radio-group v-model="formData.ywjyqz" class="has-choose">
<el-radio :label="1">有</el-radio>
<el-radio :label="0">无</el-radio>
</el-radio-group>
</td>
<td colspan="1" class="tdright">经营权证编号</td>
<td colspan="2">
<input class="formInput" v-model="formData.jyqzbh"/>
</td>
</tr>
<tr >
<td colspan="1" class="tdright">取得(承包)方式</td>
<td colspan="5">
<el-radio-group v-model="formData.qdzbfs" class="has-choose">
<el-radio :label="'1'">家庭承包</el-radio>
<el-radio :label="'2'">招标</el-radio>
<el-radio :label="'3'">公开协商</el-radio>
<el-radio :label="'4'">拍卖</el-radio>
<el-radio :label="'5'">转让</el-radio>
<el-radio :label="'6'">互换</el-radio>
<el-radio :label="'7'">其他</el-radio>
</el-radio-group>
</td>
</tr>
<tr >
<td colspan="2"></td>
<td colspan="3" class="tdcenter">家庭成员总数</td>
<td colspan="1">共 <input type="number" class="total-number" v-model="formData.jtcyzs"/>人</td>
</tr>
<tr >
<td colspan="2">
<div class="add-to" @click="addFamily">+</div>
<div class="name-num">成员姓名</div>
</td>
<td colspan="3" style="width:550px">
<div class="householder">与户主关系</div><div class="id-no">身份证号码</div>
</td>
<td colspan="1">成员备注</td>
</tr>
<tr v-for="(item,index) in formData.jtcyList" :key="index+'1'">
<td colspan="2">
<div class="add-to" @click="delFamily(index)">-</div><div class="name-num"><input class="name-input" v-model="item.cyxm"/></div>
</td>
<td colspan="3">
<div class="householder">
<el-select class="formSelect" filterable v-model="item.yhzgx" ref="zjzlbsm">
<el-option
v-for="item in $store.state.familyList"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
</div><div class="id-no"><input class="name-input" v-model="item.zjhm"/></div>
</td>
<td colspan="1"><input class="name-input" style="margin-top:0;" v-model="item.cybz"/></td>
</tr>
<tr >
<td colspan="2" class="tdright">
土地用途
</td>
<td colspan="6">
<el-radio-group v-model="formData.tdyt" class="has-choose">
<el-radio :label="'1'">种植业</el-radio>
<el-radio :label="'2'">林业</el-radio>
<el-radio :label="'3'">畜牧业</el-radio>
<el-radio :label="'4'">渔业</el-radio>
<el-radio :label="'5'">其他</el-radio>
</el-radio-group>
</td>
</tr>
<tr >
<td colspan="2" class="tdright">
地力等级
</td>
<td colspan="2">
<input class="formInput" v-model="formData.dldj"/>
</td>
<td colspan="1" class="tdright">
是否是基本农田
</td>
<td colspan="3">
<el-radio-group v-model="formData.isjbnt" class="has-choose">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</td>
</tr>
<tr >
<td colspan="2" class="tdright">
水域滩涂类型
</td>
<td colspan="2">
<el-select class="formSelect" v-model="formData.syttlx" ref="syttlx">
<el-option
v-for="item in $store.state.syttlx"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
</td>
<td colspan="1" class="tdright">
养殖业方式
</td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.yzyfs" ref="yzyfs">
<el-option
v-for="item in $store.state.yzyfs"
:key="item.dm"
:label="item.mc"
:value="item.dm"
>
</el-option>
</el-select>
</td>
</tr>
<tr >
<td colspan="2" class="tdright">
适宜载畜量
</td>
<td colspan="2">
<input type="number" v-model="formData.syzcl" class="formInput"/>
</td>
<td colspan="1" class="tdright">
承包（使用权）面积{{formData.mjdw=='1'?'（㎡）':''}}{{formData.mjdw=='2'?'（公顷）':''}}{{formData.mjdw=='3'?'（亩）':''}}
</td>
<td colspan="3">
<input class="formInput" v-model="formData.cbmj"/>
</td>
</tr>
<tr >
<td colspan="1" class="tdright">
承包（使用）起始时间
</td>
<td colspan="2">
<el-date-picker
v-model="formData.cbsyqssj"
type="date"
value-format='yyyy-MM-dd'
placeholder="选择日期">
</el-date-picker>
</td>
<td colspan="1" class="tdright">
期限（年）
</td>
<td colspan="1">
<input type="number" v-model="formData.cbqx" class="formInput"/>
</td>
<td colspan="1" class="tdright">
承包（使用）结束时间
</td>
<td colspan="2">
<el-date-picker
v-model="formData.cbsyjssj"
type="date"
value-format='yyyy-MM-dd'
placeholder="选择日期">
</el-date-picker>
</td>
</tr>
<tr >
<td rowspan="4" colspan="2" class="tdright">
草原质量
</td>
<td colspan="1" class="tdright">草层高度(cm)</td>
<td colspan="5">
<input type="number" v-model="formData.cygd" class="formInput"/>
</td>
</tr>
<tr>
<td colspan="1" class="tdright">草地覆盖度(%)</td>
<td colspan="5">
<input type="number" v-model="formData.cyfgd" class="formInput"/>
</td>
</tr>
<tr>
<td colspan="1" class="tdright">建群</td>
<td colspan="5">
<input class="formInput" v-model="formData.jq"/>
</td>
</tr>
<tr>
<td colspan="1" class="tdright">优势种</td>
<td colspan="5">
<input class="formInput" v-model="formData.ysz"/>
</td>
</tr>
<tr >
<td rowspan="2" colspan="2" class="tdright">
调查记事
</td>
<td colspan="6">
<input class="formInput" v-model="formData.dcjs"/>
</td>
</tr>
<tr >
<td colspan="6">
<div class="jishi-time">
<span>调查员：</span>
<input class="investigator" v-model="formData.dcy" type="text"/>
<span>日期：</span>
<div class="time-pick">
<el-date-picker
v-model="formData.dcrq"
type="date"
value-format='yyyy-MM-dd'
placeholder="选择日期">
</el-date-picker>
</div>
</div>
</td>
</tr>
<tr >
<td rowspan="2" colspan="2" class="tdright">
审核意见
</td>
<td colspan="6">
<input class="formInput" v-model="formData.shyj"/>
</td>
</tr>
<tr >
<td colspan="6">
<div class="jishi-time">
<span>审核员：</span>
<input class="investigator" v-model="formData.shr" type="text"/>
<span>日期：</span>
<div class="time-pick">
<el-date-picker
v-model="formData.shrq"
type="date"
value-format='yyyy-MM-dd'
placeholder="选择日期">
</el-date-picker>
</div>
</div>
</td>
</tr>
<tr>
<td colspan="8" style="text-align: center">
<el-button type="primary" @click="save">保存</el-button>
</td>
</tr>
</tbody>
</table>
</div>
</template>
<script>
import {getQjTdcbjyqNydqtsyqdcDetailByZdbsm,saveOrUpdateQjTdcbjyqNydqtsyqdc} from '@api/tdcb'
export default {
name:"",
components:{},
props:{},
data(){
name: "",
components: {},
props: {
zddm:{
type:String
},
bdcdyh:{
type:String
}
},
data() {
return {
chengbaoNum:'7',
formData:{
jtcyList: [ //家庭成员集合
{
cybz: '',//成员备注 ,
cyxm: '',//成员姓名 ,
yhzgx: '',//与户主关系 ,
zjhm: ''//证件号码
}
],
bsm: '', //土地承包经营权、农用地其他使用权调查标识码：32位GUID
cbfdb: '', // 承包方代表
cbhtbh: '',// 承包合同编号
cbmj: 0,//承包（使用权）面积
cbqx:0,//承包期限
cbsyjssj: '',//承包（使用）结束时间
cbsyqssj: '',//承包（使用）起始时间
cyfgd: '',//草地覆盖度
cygd: '',//草原高度
dcjs: '',//调查记事
dcrq: '',//调查日期
dcy: '',//调查人
dldj: '',//地力等级
fbfmc: '',//发包方名称
fzrdz: '',//负责人地址
fzrxm: '',// 负责人姓名 ,
isdel: 0,//是否删除：[0] 未删除（缺省值）；[1] 删除 ,
isjbnt: 0,//是否是基本农田 ,
jq: '',//建群 ,
jtcyzs: 0,//家庭成员总数 ,
jyqzbh: '',//经营权证编号 ,
lxdh: '',//联系电话 ,
mjdw: '',//面积单位 0:平方米 1:公顷 2:亩 ,
qdzbfs: '',//取得承包方式：家庭承包|招标|公开协商|拍卖|转让|互换|其他 ,
shr: '',//审核人 ,
shrq: '',//审核日期 ,
shyj: '',//审核意见 ,
syttlx: '',//水域滩涂类型 ,
syzcl: '',//适宜载畜量 ,
tdyt: '',//土地用途：种植业|林业|畜牧业|渔业|其他 ,
ysz: '',//优势种 ,
ywcbht: 0,//有无承包合同，0：无；1：有 ,
ywjyqz: 0,//有无经营权证，0：无；1：有 ,
yzbm: '',//邮政编码 ,
yzyfs: '',//养殖业方式
zdbsm: '',//宗地标识码，
zjh: '',//证件号 ,
zjzl: ''//证件种类
}
};
},
created() {},
mounted() {
this.formData.zdbsm=this.$route.query.bsm;
this.getQjTdcbjyqNydqtsyqdcDetailByZdbsm(this.formData.zdbsm);
// this.getQjTdcbjyqNydqtsyqdcDetailByZdbsm('85a47e4ce38fcc300101aa42d3ca667b');
},
methods: {
getQjTdcbjyqNydqtsyqdcDetailByZdbsm(zdbsm){
getQjTdcbjyqNydqtsyqdcDetailByZdbsm(zdbsm).then(res=>{
if(res.success){
console.log('获取明细',res)
this.formData= res.result || this.formData;
if(this.formData.jtcyList){
this.chengbaoNum=this.formData.jtcyList.length+6+''
}else{
this.chengbaoNum='6'
}
}
})
},
addFamily(){
let itemObj={cybz:'',cyxm:'',yhzgx:'',zjhm:''};
if(this.formData.jtcyList){
this.formData.jtcyList.push(itemObj);
this.chengbaoNum=this.chengbaoNum-0+1+'';
}else{
this.formData.jtcyList=[itemObj]
this.chengbaoNum=this.chengbaoNum-0+1+'';
}
},
delFamily(index){
if(this.formData.jtcyList.length==1){
return
}
this.formData.jtcyList.splice(index, 1);
this.chengbaoNum=this.chengbaoNum-1+'';
},
save(){
if(this.formData.ywcbht==1 && !this.formData.cbhtbh){
this.$message.warning("承包合同编号不能为空");
return
}
saveOrUpdateQjTdcbjyqNydqtsyqdc(this.formData).then(res=>{
if (res.success) {
console.log(res,"保存成功")
this.$message.success("保存成功")
}
})
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
};
</script>
<style scoped lang="less">
table {
margin-top: 20px;
background-color: #fff;
font-size: 14px;
width: 100%;
cursor: pointer;
.el-radio-group {
margin-left: 10px;
}
.el-radio {
margin-right: 20px !important;
}
th {
height: 36px;
line-height: 36px;
font-size: 16px;
}
td {
text-align: center;
height: 36px;
border-color: #e6e6e6;
}
/deep/.el-input__inner {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
}
.formSelect{
width: 100%;
}
.tdcenter{
text-align: center;
}
.total-number{
width: 60px;
background:none;
outline:none;
border:1px solid #e6e6e6;
box-sizing: border-box;
display: inline-block;
height: 20px;
margin-right: 3px;
}
.total-number:focus{
border: 1px solid #A0C5F6;
}
.add-to{
position: relative;
width: 37px;
height: 38px;
text-align: center;
line-height: 37px;
display: inline-block;
border-right:1px solid #e6e6e6;
}
.name-num{
display: inline-block;
width: calc(100% - 38px);
text-align: center;
line-height: 37px;
}
.name-input{
width: calc(100% - 6px);
height: 32px;
outline:none;
border:1px solid #e6e6e6;
box-sizing: border-box;
margin-top: -2px;
}
.name-input:focus{
border: 1px solid #A0C5F6;
}
.householder{
display: inline-block;
width: 40%;
text-align: center;
border-right:1px solid #e6e6e6;
box-sizing: border-box;
line-height: 38px;
}
.id-no{
display: inline-block;
width: 60%;
text-align: center;
line-height: 37px;
}
}
.tit{
width: 100%;
font-size: 18px;
text-align: center;
line-height: 28px;
padding-top: 12px;
}
.dw{
width: 100%;
padding-right: 10px;
text-align: right;
box-sizing: border-box;
line-height: 28px;
}
.has-choose{
float: left;
}
.jishi-time{
height: 100%;
float: right;
margin-right: 10px;
line-height: 36px;
span{
line-height: 36px;
}
.investigator{
width: 120px;
background:none;
outline:none;
border:1px solid #e6e6e6;
box-sizing: border-box;
display: inline-block;
height: 26px;
margin-right: 10px;
line-height: 26px;
margin-top: -2px;
}
.investigator:focus{
border: 1px solid #A0C5F6;
}
.time-pick{
display: inline-block;
height: 36px;
/deep/.el-input__inner{
margin-top:-2px;
}
}
}
</style>
\ No newline at end of file
......
......@@ -366,6 +366,8 @@
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun"
v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
<el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun"
v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</div>
......@@ -375,6 +377,9 @@
<el-button type="primary" @click="submitZDxx" :disabled="disabled" v-if="!workFlowState">提交</el-button>
<el-button type="primary" @click="shzd" v-if="workFlowState">审核</el-button>
</div>
<div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
<el-button type="primary" @click="submitZDxxWithoutWorkflow" :disabled="disabled">提交</el-button>
</div>
</div>
</template>
......@@ -900,6 +905,22 @@
// }
// })
},
//提交宗地基本信息
submitZDxxWithoutWorkflow() {
let data = {
glbsm: this.$store.state.zdbsm,
status: 1,
type: "zd"
}
submit(data).then((res) => {
if (res.code === 200) {
this.$message.success("提交成功！")
this.getZdjbxxData(this.curZdbsm);
this.$store.state.oldZdbsm = '';
this.getRightTree(this.curZdbsm,'0,1,2')
}
})
},
getQlrxxData() {
// console.log(this.$refs.qlrxxModule.getQlgyfsData()); //权利共有方式数据
// console.log(this.$refs.qlrxxModule.getQlrxxData()); //权利人表格数据
......
<template>
<div class="main">暂无登记薄（功能接口开发中）</div>
<div class="main">暂无登记薄</div>
</template>
<script>
......
......@@ -330,6 +330,7 @@
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="uploadProgress"
:on-success="uploadSuccess"
:on-error="uploadError"
:show-file-list="false"
......@@ -564,7 +565,11 @@ export default {
Message.error("上传文件失败")
console.log("上传文件失败", err)
},
uploadProgress(){
vm.loadingShow('正在上传中')
},
uploadSuccess(res, file, fileList) {
vm.loadingHide();
Message.success("上传成功")
this.uploadVisible = false;
},
......@@ -817,6 +822,7 @@ export default {
item.style.border = '';
item.className = '';
});
this.bsms=bsms;
//清除选中户
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
......
......@@ -275,6 +275,8 @@
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun"
v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun"
v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">保存</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
</div>
......@@ -285,6 +287,9 @@
<el-button type="primary" @click="onSubmit" :disabled="disabled" v-if="!workFlowState">提交</el-button>
<el-button type="primary" @click="shzrz" v-if="workFlowState">审核</el-button>
</div>
<div class="sh-btn" v-if="!$store.state.isWorkFlow && !workitemInstanceFlag">
<el-button type="primary" @click="onSubmitWithoutWorkflow" :disabled="disabled" >提交</el-button>
</div>
</div>
</template>
......@@ -659,6 +664,23 @@
// }
// })
},
onSubmitWithoutWorkflow(){
let data={
glbsm:this.bsm,
status:1,
type:"zrz"
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！");
this.getZrzDetailByBsm(this.$route.query.bsm);
this.$store.state.oldZdbsm = '';
this.getTreeByBsm(this.$route.query.bsm,'zrz','0,1,2')
}else{
this.$message.error(res.message);
}
})
},
shzrz(){
let data = {
bdcdyh:this.form.bdcdyh,
......
......@@ -5,7 +5,6 @@ let Timestamp = new Date().getTime();
function resolve(dir) {
return path.join(__dirname, dir)
}
const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
module.exports = {
publicPath: './',
......@@ -20,7 +19,6 @@ module.exports = {
.set('@libs', resolve('src/libs'))
.set('@router', resolve('src/router'))
.set('@components', resolve('src/components'))
.set('@assets', resolve('src/assets'))
},
pluginOptions: {
'style-resources-loader': {
......@@ -33,17 +31,8 @@ module.exports = {
filename: `js/[name].${Timestamp}.js`,
chunkFilename: `js/[name].${Timestamp}.js`
},
plugins: [
// 去除console和debugger
// new UglifyJsPlugin({
// uglifyOptions: {
// compress: {
// drop_console: true,
// drop_debugger: true,
// },
// },
// parallel: true,
// }),
devtool: 'source-map'
// plugins: [
// new FileManagerPlugin({ //初始化 filemanager-webpack-plugin 插件实例
// onEnd: {
// mkdir: ['./zip','./dist'], //初始化生产zip和dist文件夹
......@@ -52,20 +41,16 @@ module.exports = {
// ]
// }
// })
]
// ]
},
devServer: {
host: "192.168.2.61",
host: "0.0.0.0",
port: 8008,
port: 8006,
https: false,
hotOnly: false,
proxy: {
"/api": {
// target: 'https://192.168.2.119:8006', //泽平
// target: process.env.VUE_APP_api1, //本地
target: process.env.VUE_APP_api, //赵千
// target: process.env.VUE_APP_api4, //赵千
target: process.env.VUE_APP_api2,
changeOrigin: true,
pathRewrite: {
"^/api": "/",
......