Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
188c6259 by 任超
Options

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

2 parents 9ada342a ded5ea2f
Inline Side-by-side
Showing 12 changed files with 93 additions and 23 deletions
......@@ -103,6 +103,15 @@ export function addUserCommonOpinion (params) {
})
}
//删除常用意见
export function delUserCommonOpinion (params) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/opinion/delUserCommonOpinion',
method: 'get',
params
})
}
// 登簿接口
export function record (data) {
return request({
......
......@@ -12,7 +12,7 @@
</tr>
<tr>
<td colspan="2">不动产类型：</td>
<td colspan="2">{{ zdjbxx.bdclx }}</td>
<td colspan="2">{{ bdclxList[zdjbxx.bdclx] }}</td>
<td>单位：</td>
<td>{{ zdjbxx.mjdw }}</td>
</tr>
......@@ -160,6 +160,7 @@ export default {
zdbhqks: [],
propsParam: this.$attrs,
showGroup: false,
bdclxList: ['','宗地','宗海','自然幢','多幢','构筑物','林权','户']
};
},
created() {
......
......@@ -25,12 +25,12 @@
<el-row>
<el-col :span="8">
<el-form-item label="身份证号码" prop="zjh">
<el-input v-model="ruleForm.sfzhm" maxlength="15"></el-input>
<el-input v-model="ruleForm.sfzhm" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话" prop="dh">
<el-input v-model="ruleForm.dh" maxlength="11"></el-input>
<el-input v-model="ruleForm.dh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -28,12 +28,12 @@
<el-row>
<el-col :span="8">
<el-form-item label="证件号" prop="zjh">
<el-input v-model="ruleForm.zjh" maxlength="15"></el-input>
<el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话" prop="dh">
<el-input v-model="ruleForm.dh" maxlength="11"></el-input>
<el-input v-model="ruleForm.dh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -109,8 +109,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="联系电话" :rules="$rules.common.phone">
<el-input v-model="ruleForm.lxdh" maxlength="11"></el-input>
<el-form-item label="联系电话">
<el-input v-model="ruleForm.lxdh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -7,19 +7,31 @@
:data="tableData.data">
</lb-table>
<el-dialog title="新增意见" :visible.sync="addDialog" width="50%" :modal="false" top="30vh">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item prop="commonOpinion">
<div class="invalid-reson">常用意见：</div>
<el-input v-model="commonOpinion" placeholder="请输入常用意见" type="textarea" :rows="4"></el-input>
<el-input v-model="form.commonOpinion" placeholder="请输入常用意见" type="textarea" :rows="4"></el-input>
</el-form-item>
<el-form-item>
<div class="dialog-footer">
<el-button @click="closeaddDiglog()">取 消</el-button>
<el-button type="primary" @click="addOpinion()">确 定</el-button>
</div>
</el-form-item>
</el-form>
<!-- <div class="invalid-reson">常用意见：</div>
<el-input v-model="commonOpinion" placeholder="请输入常用意见" type="textarea" :rows="4"></el-input>
<div class="dialog-footer">
<el-button @click="closeaddDiglog()">取 消</el-button>
<el-button type="primary" @click="addOpinion()">确 定</el-button>
</div> -->
</el-dialog>
</div>
</dialogBox>
</template>
<script>
import table from "@/utils/mixin/table";
import { getUserCommonOpinion,addUserCommonOpinion } from "@/api/fqsq.js"
import { getUserCommonOpinion,addUserCommonOpinion,delUserCommonOpinion } from "@/api/fqsq.js"
export default {
components: {},
mixins: [table],
......@@ -45,6 +57,7 @@ export default {
return (
<div>
<el-button type="text" onClick={() => { this.useCommonOpinion(scope.row) }}>使用</el-button>
<el-button type="text" onClick={() => { this.deleteOpinion(scope.row) }}>删除</el-button>
</div>
)
}
......@@ -54,15 +67,22 @@ export default {
total: 0,
data: [],
},
form: {
commonOpinion: '',
},
rules: {
commonOpinion: [
{ required: true, message: '请输入常用意见', trigger: 'blur' },
],
},
addDialog: false,
commonOpinion: ''
}
},
mounted() {
this.queryList()
this.queryClick ()
},
methods: {
queryList(){
queryClick (){
getUserCommonOpinion(this.pageData).then(res => {
let { total, records } = res.result
this.tableData.total = total;
......@@ -71,7 +91,9 @@ export default {
},
//新增常用意见
addOpinion(){
addUserCommonOpinion({commonOpinion: this.commonOpinion}).then(res => {
this.$refs.form.validate(valid => {
if (valid) {
addUserCommonOpinion({commonOpinion: this.form.commonOpinion}).then(res => {
if(res.code == 200){
this.closeaddDiglog();
this.queryList()
......@@ -79,6 +101,11 @@ export default {
this.$message.error(res.message)
}
})
} else {
// console.log('error submit!!');
return false;
}
});
},
//打开新增弹窗
openDialog() {
......@@ -87,17 +114,40 @@ export default {
//关闭新增弹窗
closeaddDiglog() {
this.addDialog = false;
this.commonOpinion = "";
this.form.commonOpinion = "";
},
//使用常用意见
useCommonOpinion(item){
this.$parent.useOpinion(item.opinion);
this.$emit("input", false);
},
//删除常用意见
deleteOpinion(item){
this.$confirm("确定要删除吗, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
delUserCommonOpinion({bsmOpinion: item.bsmOpinion}).then(res => {
if(res.code == 200){
this.$message.success("删除成功")
this.queryClick()
}else{
this.$message.error(res.message)
}
})
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
//关闭列表弹窗
closeDialog () {
this.$emit("input", false);
this.commonOpinion = "";
this.form.commonOpinion = "";
}
}
}
......
......@@ -88,11 +88,13 @@ export default {
},
//审批意见数据初始化
list () {
this.$startLoading()
var formdata = new FormData();
formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
formdata.append("bestepid", this.$route.query.bestepid);
formdata.append("ableOperation",this.ableOperation)
getSpyjList(formdata).then((res) => {
this.$endLoading()
if (res.code === 200 && res.result) {
this.tableData = res.result
this.ruleForm = res.result[res.result.length - 1]
......
<template>
<div class="from-clues" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.8)">
element-loading-background="rgba(0, 0, 0, 0.8)" style="height:720px">
<!-- 表单部分 -->
<el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length > 1">
<el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bsmBdcqz"
v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane>
</el-tabs>
<div class="no-data">暂无数据</div>
<div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div>
<img :src="previewImage" class="imgClass">
</div>
</template>
......@@ -76,6 +76,8 @@ export default {
this.bdcqz = res.result[0]
this.headTabBdcqz = res.result
this.getBdcqzPreview();
}else{
this.loading = false
}
}
......
......@@ -275,8 +275,8 @@ export default {
let that = this
const h = this.$createElement;
this.$msgbox({
title: "您确定转出吗？2",
message: "此环节为流程结束环节，转出后流程将结束",
title: "您确定转出吗？",
message: "此环节为流程最后环节，转出后流程将结束",
showCancelButton: true,
beforeClose: (action, instance, done) => {
console.log(action, 'actionaction');
......
......@@ -84,7 +84,7 @@
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格：">
<div style="display:flex">
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%"></el-input>
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw">
<el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......
......@@ -85,7 +85,13 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格：">
<el-input disabled v-model="ruleForm.jsydsyq.qdjg"></el-input>
<div style="display:flex">
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')" disabled></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw" disabled>
<el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
......
......@@ -145,7 +145,7 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="适宜载畜量：">
<el-input v-model="ruleForm.nydsyq.syzcl"></el-input>
<el-input v-model="ruleForm.nydsyq.syzcl" oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -145,7 +145,7 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="适宜载畜量：">
<el-input v-model="ruleForm.nydsyq.syzcl"></el-input>
<el-input v-model="ruleForm.nydsyq.syzcl" oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......