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 95 additions and 25 deletions
...@@ -103,6 +103,15 @@ export function addUserCommonOpinion (params) { ...@@ -103,6 +103,15 @@ export function addUserCommonOpinion (params) {
103 }) 103 })
104 } 104 }
105 105
106 //删除常用意见
107 export function delUserCommonOpinion (params) {
108 return request({
109 url: SERVER.SERVERAPI + '/rest/ywbl/opinion/delUserCommonOpinion',
110 method: 'get',
111 params
112 })
113 }
114
106 // 登簿接口 115 // 登簿接口
107 export function record (data) { 116 export function record (data) {
108 return request({ 117 return request({
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 </tr> 12 </tr>
13 <tr> 13 <tr>
14 <td colspan="2">不动产类型：</td> 14 <td colspan="2">不动产类型：</td>
15 <td colspan="2">{{ zdjbxx.bdclx }}</td> 15 <td colspan="2">{{ bdclxList[zdjbxx.bdclx] }}</td>
16 <td>单位：</td> 16 <td>单位：</td>
17 <td>{{ zdjbxx.mjdw }}</td> 17 <td>{{ zdjbxx.mjdw }}</td>
18 </tr> 18 </tr>
...@@ -160,6 +160,7 @@ export default { ...@@ -160,6 +160,7 @@ export default {
160 zdbhqks: [], 160 zdbhqks: [],
161 propsParam: this.$attrs, 161 propsParam: this.$attrs,
162 showGroup: false, 162 showGroup: false,
163 bdclxList: ['','宗地','宗海','自然幢','多幢','构筑物','林权','户']
163 }; 164 };
164 }, 165 },
165 created() { 166 created() {
......
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
25 <el-row> 25 <el-row>
26 <el-col :span="8"> 26 <el-col :span="8">
27 <el-form-item label="身份证号码" prop="zjh"> 27 <el-form-item label="身份证号码" prop="zjh">
28 <el-input v-model="ruleForm.sfzhm" maxlength="15"></el-input> 28 <el-input v-model="ruleForm.sfzhm" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
29 </el-form-item> 29 </el-form-item>
30 </el-col> 30 </el-col>
31 <el-col :span="8"> 31 <el-col :span="8">
32 <el-form-item label="联系电话" prop="dh"> 32 <el-form-item label="联系电话" prop="dh">
33 <el-input v-model="ruleForm.dh" maxlength="11"></el-input> 33 <el-input v-model="ruleForm.dh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <el-col :span="8"> 36 <el-col :span="8">
......
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
28 <el-row> 28 <el-row>
29 <el-col :span="8"> 29 <el-col :span="8">
30 <el-form-item label="证件号" prop="zjh"> 30 <el-form-item label="证件号" prop="zjh">
31 <el-input v-model="ruleForm.zjh" maxlength="15"></el-input> 31 <el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
32 </el-form-item> 32 </el-form-item>
33 </el-col> 33 </el-col>
34 <el-col :span="8"> 34 <el-col :span="8">
35 <el-form-item label="联系电话" prop="dh"> 35 <el-form-item label="联系电话" prop="dh">
36 <el-input v-model="ruleForm.dh" maxlength="11"></el-input> 36 <el-input v-model="ruleForm.dh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
37 </el-form-item> 37 </el-form-item>
38 </el-col> 38 </el-col>
39 <el-col :span="8"> 39 <el-col :span="8">
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
109 109
110 <el-row> 110 <el-row>
111 <el-col :span="8"> 111 <el-col :span="8">
112 <el-form-item label="联系电话" :rules="$rules.common.phone"> 112 <el-form-item label="联系电话">
113 <el-input v-model="ruleForm.lxdh" maxlength="11"></el-input> 113 <el-input v-model="ruleForm.lxdh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
114 </el-form-item> 114 </el-form-item>
115 </el-col> 115 </el-col>
116 <el-col :span="8"> 116 <el-col :span="8">
......
...@@ -7,19 +7,31 @@ ...@@ -7,19 +7,31 @@
7 :data="tableData.data"> 7 :data="tableData.data">
8 </lb-table> 8 </lb-table>
9 <el-dialog title="新增意见" :visible.sync="addDialog" width="50%" :modal="false" top="30vh"> 9 <el-dialog title="新增意见" :visible.sync="addDialog" width="50%" :modal="false" top="30vh">
10 <div class="invalid-reson">常用意见：</div> 10 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
11 <el-form-item prop="commonOpinion">
12 <div class="invalid-reson">常用意见：</div>
13 <el-input v-model="form.commonOpinion" placeholder="请输入常用意见" type="textarea" :rows="4"></el-input>
14 </el-form-item>
15 <el-form-item>
16 <div class="dialog-footer">
17 <el-button @click="closeaddDiglog()">取 消</el-button>
18 <el-button type="primary" @click="addOpinion()">确 定</el-button>
19 </div>
20 </el-form-item>
21 </el-form>
22 <!-- <div class="invalid-reson">常用意见：</div>
11 <el-input v-model="commonOpinion" placeholder="请输入常用意见" type="textarea" :rows="4"></el-input> 23 <el-input v-model="commonOpinion" placeholder="请输入常用意见" type="textarea" :rows="4"></el-input>
12 <div class="dialog-footer"> 24 <div class="dialog-footer">
13 <el-button @click="closeaddDiglog()">取 消</el-button> 25 <el-button @click="closeaddDiglog()">取 消</el-button>
14 <el-button type="primary" @click="addOpinion()">确 定</el-button> 26 <el-button type="primary" @click="addOpinion()">确 定</el-button>
15 </div> 27 </div> -->
16 </el-dialog> 28 </el-dialog>
17 </div> 29 </div>
18 </dialogBox> 30 </dialogBox>
19 </template> 31 </template>
20 <script> 32 <script>
21 import table from "@/utils/mixin/table"; 33 import table from "@/utils/mixin/table";
22 import { getUserCommonOpinion,addUserCommonOpinion } from "@/api/fqsq.js" 34 import { getUserCommonOpinion,addUserCommonOpinion,delUserCommonOpinion } from "@/api/fqsq.js"
23 export default { 35 export default {
24 components: {}, 36 components: {},
25 mixins: [table], 37 mixins: [table],
...@@ -45,6 +57,7 @@ export default { ...@@ -45,6 +57,7 @@ export default {
45 return ( 57 return (
46 <div> 58 <div>
47 <el-button type="text" onClick={() => { this.useCommonOpinion(scope.row) }}>使用</el-button> 59 <el-button type="text" onClick={() => { this.useCommonOpinion(scope.row) }}>使用</el-button>
60 <el-button type="text" onClick={() => { this.deleteOpinion(scope.row) }}>删除</el-button>
48 </div> 61 </div>
49 ) 62 )
50 } 63 }
...@@ -54,15 +67,22 @@ export default { ...@@ -54,15 +67,22 @@ export default {
54 total: 0, 67 total: 0,
55 data: [], 68 data: [],
56 }, 69 },
70 form: {
71 commonOpinion: '',
72 },
73 rules: {
74 commonOpinion: [
75 { required: true, message: '请输入常用意见', trigger: 'blur' },
76 ],
77 },
57 addDialog: false, 78 addDialog: false,
58 commonOpinion: ''
59 } 79 }
60 }, 80 },
61 mounted() { 81 mounted() {
62 this.queryList() 82 this.queryClick ()
63 }, 83 },
64 methods: { 84 methods: {
65 queryList(){ 85 queryClick (){
66 getUserCommonOpinion(this.pageData).then(res => { 86 getUserCommonOpinion(this.pageData).then(res => {
67 let { total, records } = res.result 87 let { total, records } = res.result
68 this.tableData.total = total; 88 this.tableData.total = total;
...@@ -71,14 +91,21 @@ export default { ...@@ -71,14 +91,21 @@ export default {
71 }, 91 },
72 //新增常用意见 92 //新增常用意见
73 addOpinion(){ 93 addOpinion(){
74 addUserCommonOpinion({commonOpinion: this.commonOpinion}).then(res => { 94 this.$refs.form.validate(valid => {
95 if (valid) {
96 addUserCommonOpinion({commonOpinion: this.form.commonOpinion}).then(res => {
75 if(res.code == 200){ 97 if(res.code == 200){
76 this.closeaddDiglog(); 98 this.closeaddDiglog();
77 this.queryList() 99 this.queryList()
78 }else{ 100 }else{
79 this.$message.error(res.message) 101 this.$message.error(res.message)
80 } 102 }
81 }) 103 })
104 } else {
105 // console.log('error submit!!');
106 return false;
107 }
108 });
82 }, 109 },
83 //打开新增弹窗 110 //打开新增弹窗
84 openDialog() { 111 openDialog() {
...@@ -87,17 +114,40 @@ export default { ...@@ -87,17 +114,40 @@ export default {
87 //关闭新增弹窗 114 //关闭新增弹窗
88 closeaddDiglog() { 115 closeaddDiglog() {
89 this.addDialog = false; 116 this.addDialog = false;
90 this.commonOpinion = ""; 117 this.form.commonOpinion = "";
91 }, 118 },
92 //使用常用意见 119 //使用常用意见
93 useCommonOpinion(item){ 120 useCommonOpinion(item){
94 this.$parent.useOpinion(item.opinion); 121 this.$parent.useOpinion(item.opinion);
95 this.$emit("input", false); 122 this.$emit("input", false);
96 }, 123 },
124 //删除常用意见
125 deleteOpinion(item){
126 this.$confirm("确定要删除吗, 是否继续?", "提示", {
127 confirmButtonText: "确定",
128 cancelButtonText: "取消",
129 type: "warning",
130 }).then(() => {
131 delUserCommonOpinion({bsmOpinion: item.bsmOpinion}).then(res => {
132 if(res.code == 200){
133 this.$message.success("删除成功")
134 this.queryClick()
135 }else{
136 this.$message.error(res.message)
137 }
138 })
139 })
140 .catch(() => {
141 this.$message({
142 type: "info",
143 message: "已取消删除",
144 });
145 });
146 },
97 //关闭列表弹窗 147 //关闭列表弹窗
98 closeDialog () { 148 closeDialog () {
99 this.$emit("input", false); 149 this.$emit("input", false);
100 this.commonOpinion = ""; 150 this.form.commonOpinion = "";
101 } 151 }
102 } 152 }
103 } 153 }
......
...@@ -88,11 +88,13 @@ export default { ...@@ -88,11 +88,13 @@ export default {
88 }, 88 },
89 //审批意见数据初始化 89 //审批意见数据初始化
90 list () { 90 list () {
91 this.$startLoading()
91 var formdata = new FormData(); 92 var formdata = new FormData();
92 formdata.append("bsmBusiness", this.propsParam.bsmBusiness); 93 formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
93 formdata.append("bestepid", this.$route.query.bestepid); 94 formdata.append("bestepid", this.$route.query.bestepid);
94 formdata.append("ableOperation",this.ableOperation) 95 formdata.append("ableOperation",this.ableOperation)
95 getSpyjList(formdata).then((res) => { 96 getSpyjList(formdata).then((res) => {
97 this.$endLoading()
96 if (res.code === 200 && res.result) { 98 if (res.code === 200 && res.result) {
97 this.tableData = res.result 99 this.tableData = res.result
98 this.ruleForm = res.result[res.result.length - 1] 100 this.ruleForm = res.result[res.result.length - 1]
......
1 <template> 1 <template>
2 <div class="from-clues" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" 2 <div class="from-clues" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
3 element-loading-background="rgba(0, 0, 0, 0.8)"> 3 element-loading-background="rgba(0, 0, 0, 0.8)" style="height:720px">
4 <!-- 表单部分 --> 4 <!-- 表单部分 -->
5 <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length > 1"> 5 <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length > 1">
6 <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bsmBdcqz" 6 <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bsmBdcqz"
7 v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane> 7 v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane>
8 </el-tabs> 8 </el-tabs>
9 <div class="no-data">暂无数据</div> 9 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div>
10 <img :src="previewImage" class="imgClass"> 10 <img :src="previewImage" class="imgClass">
11 </div> 11 </div>
12 </template> 12 </template>
...@@ -76,6 +76,8 @@ export default { ...@@ -76,6 +76,8 @@ export default {
76 this.bdcqz = res.result[0] 76 this.bdcqz = res.result[0]
77 this.headTabBdcqz = res.result 77 this.headTabBdcqz = res.result
78 this.getBdcqzPreview(); 78 this.getBdcqzPreview();
79 }else{
80 this.loading = false
79 } 81 }
80 } 82 }
81 83
......
...@@ -275,8 +275,8 @@ export default { ...@@ -275,8 +275,8 @@ export default {
275 let that = this 275 let that = this
276 const h = this.$createElement; 276 const h = this.$createElement;
277 this.$msgbox({ 277 this.$msgbox({
278 title: "您确定转出吗？2", 278 title: "您确定转出吗？",
279 message: "此环节为流程结束环节，转出后流程将结束", 279 message: "此环节为流程最后环节，转出后流程将结束",
280 showCancelButton: true, 280 showCancelButton: true,
281 beforeClose: (action, instance, done) => { 281 beforeClose: (action, instance, done) => {
282 console.log(action, 'actionaction'); 282 console.log(action, 'actionaction');
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <el-col :span="8"> 84 <el-col :span="8">
85 <el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格："> 85 <el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格：">
86 <div style="display:flex"> 86 <div style="display:flex">
87 <el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%"></el-input> 87 <el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
88 <el-select v-model="ruleForm.jsydsyq.jedw"> 88 <el-select v-model="ruleForm.jsydsyq.jedw">
89 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 89 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
90 </el-option> 90 </el-option>
......
...@@ -85,7 +85,13 @@ ...@@ -85,7 +85,13 @@
85 <el-row :gutter="10"> 85 <el-row :gutter="10">
86 <el-col :span="8"> 86 <el-col :span="8">
87 <el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格："> 87 <el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格：">
88 <el-input disabled v-model="ruleForm.jsydsyq.qdjg"></el-input> 88 <div style="display:flex">
89 <el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')" disabled></el-input>
90 <el-select v-model="ruleForm.jsydsyq.jedw" disabled>
91 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
92 </el-option>
93 </el-select>
94 </div>
89 </el-form-item> 95 </el-form-item>
90 </el-col> 96 </el-col>
91 97
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 <el-row :gutter="10"> 145 <el-row :gutter="10">
146 <el-col :span="8"> 146 <el-col :span="8">
147 <el-form-item :class="flag ? 'marginBot0' : ''" label="适宜载畜量："> 147 <el-form-item :class="flag ? 'marginBot0' : ''" label="适宜载畜量：">
148 <el-input v-model="ruleForm.nydsyq.syzcl"></el-input> 148 <el-input v-model="ruleForm.nydsyq.syzcl" oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
149 </el-form-item> 149 </el-form-item>
150 </el-col> 150 </el-col>
151 <el-col :span="8"> 151 <el-col :span="8">
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 <el-row :gutter="10"> 145 <el-row :gutter="10">
146 <el-col :span="8"> 146 <el-col :span="8">
147 <el-form-item :class="flag ? 'marginBot0' : ''" label="适宜载畜量："> 147 <el-form-item :class="flag ? 'marginBot0' : ''" label="适宜载畜量：">
148 <el-input v-model="ruleForm.nydsyq.syzcl"></el-input> 148 <el-input v-model="ruleForm.nydsyq.syzcl" oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
149 </el-form-item> 149 </el-form-item>
150 </el-col> 150 </el-col>
151 <el-col :span="8"> 151 <el-col :span="8">
......