Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
2ac6716c by xiaomiao
Options

--no commit message

1 parent d03189ce
Inline Side-by-side
Showing 3 changed files with 194 additions and 86 deletions
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 ref="ruleForm" 13 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
15 :inline="flag" 15 :inline="flag"
16 label-width="120px" 16 label-width="127px"
17 > 17 >
18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
19 <div class="slxx_title title-block"> 19 <div class="slxx_title title-block">
...@@ -93,32 +93,24 @@ ...@@ -93,32 +93,24 @@
93 </el-form-item> 93 </el-form-item>
94 </el-col> 94 </el-col>
95 <el-col :span="8"> 95 <el-col :span="8">
96 <el-form-item label="土地用途："> 96 <!-- 下拉框 -->
97 <el-input v-model="ruleForm.qlxx.ywh"></el-input> 97 <el-form-item label="土地性质：">
98 </el-form-item> 98 <el-select v-model="ruleForm.fdcq2.jedw">
99 </el-col> 99 <el-option v-for="item in dictData['A45']" :key="item.dcode" :label="item.dname" :value="item.dcode">
100 <el-col :span="8"> 100 </el-option>
101 <el-form-item label="土地使用起始时间："> 101 </el-select>
102 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
103 </el-form-item>
104 </el-col>
105 <el-col :span="8">
106 <el-form-item label="土地使用结束时间：">
107 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
108 </el-form-item>
109 </el-col>
110 <el-col :span="8">
111 <el-form-item label="土地使用期限：">
112 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
113 </el-form-item> 102 </el-form-item>
114 </el-col> 103 </el-col>
115 <el-col :span="8"> 104 <el-col :span="8">
105
116 <el-form-item label="房地产交易价格："> 106 <el-form-item label="房地产交易价格：">
117 <el-input v-model="ruleForm.fdcq2.qjjg"></el-input> 107 <div style="display:flex">
118 <el-select v-model="ruleForm.fdcq2.jedw"> 108 <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
109 <el-select v-model="ruleForm.fdcq2.jedw">
119 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 110 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
120 </el-option> 111 </el-option>
121 </el-select> 112 </el-select>
113 </div>
122 </el-form-item> 114 </el-form-item>
123 </el-col> 115 </el-col>
124 <el-col :span="8"> 116 <el-col :span="8">
...@@ -231,10 +223,9 @@ ...@@ -231,10 +223,9 @@
231 <div class="triangle"></div> 223 <div class="triangle"></div>
232 </div> 224 </div>
233 <tdytTable 225 <tdytTable
234 :tableData="ruleForm.tdxxList" 226 :tableData="ruleForm.tdytqxList"
235 @upDateQlrxxList="upDateQlrxxList" 227 @upDateQlrxxList="upDateTdytxxList"
236 :viewtype="$route.query.viewtype" 228 :viewtype="$route.query.viewtype"
237 :gyfs="ruleForm.qlxx.gyfs"
238 /> 229 />
239 <div class="slxx_title title-block"> 230 <div class="slxx_title title-block">
240 权利人信息 231 权利人信息
...@@ -348,6 +339,12 @@ export default { ...@@ -348,6 +339,12 @@ export default {
348 } 339 }
349 }); 340 });
350 }, 341 },
342 // 更新土地用途信息
343 upDateTdytxxList(val) {
344 console.log("VAL",val);
345 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
346 this.key++;
347 },
351 // 更新权利人信息 348 // 更新权利人信息
352 upDateQlrxxList(val) { 349 upDateQlrxxList(val) {
353 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val)); 350 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
...@@ -360,6 +357,7 @@ export default { ...@@ -360,6 +357,7 @@ export default {
360 this.key++; 357 this.key++;
361 }, 358 },
362 onSubmit() { 359 onSubmit() {
360 console.log("this.ruleForm大信息",this.ruleForm);
363 if (this.ruleForm.qlrList.length == 0) { 361 if (this.ruleForm.qlrList.length == 0) {
364 this.$message({ 362 this.$message({
365 showClose: true, 363 showClose: true,
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:39:47
5 -->
6 <template>
7 <dialogBox title="土地用途信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
8 @closeDialog="closeDialog" :isButton="showButton">
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="138px">
10 <el-row>
11 <el-col :span="12">
12 <el-form-item label="土地用途" prop="tdyt">
13 <el-input v-model="ruleForm.tdyt"></el-input>
14 </el-form-item>
15 </el-col>
16 <el-col :span="12">
17 <el-form-item label="土地使用权限" prop="syqx">
18 <el-input v-model="ruleForm.syqx"></el-input>
19 </el-form-item>
20 </el-col>
21 </el-row>
22 <el-row>
23 <el-col :span="12">
24 <el-form-item label="土地使用结束时间" prop="jssj">
25 <el-date-picker
26 v-model="ruleForm.jssj"
27 type="daterange"
28 range-separator="至"
29 start-placeholder="开始日期"
30 end-placeholder="结束日期"
31 value-format="yyyy-MM-dd">>
32 </el-date-picker>
33 </el-form-item>
34 </el-col>
35 <el-col :span="12">
36 <el-form-item label="土地使用起止时间" prop="qzsj">
37 <el-date-picker
38 v-model="ruleForm.qzsj"
39 type="daterange"
40 range-separator="至"
41 start-placeholder="开始日期"
42 end-placeholder="结束日期"
43 value-format="yyyy-MM-dd">>
44 </el-date-picker>
45 </el-form-item>
46 </el-col>
47 </el-row>
48 </el-form>
49 </dialogBox>
50 </template>z x addTdyt
51 <script>
52 import { mapGetters } from "vuex";
53 export default {
54 props: {
55 value: { type: Boolean, default: false },
56 details: { type: Object, default: {} },
57 showButton: { type: Boolean, default: false }
58 },
59 data () {
60 return {
61 myValue: this.value,
62 ruleForm: {
63 tdyt:"",
64 syqx:"",
65 jssj:"",
66 qzsj:""
67 },
68 rules: {
69 tdyt: [{ required: true, message: "土地用途", trigger: "blur" }],
70 syqx: [{ required: true, message: "土地使用权限", trigger: "blur" }],
71 jssj: [{ required: true, message: "土地使用结束时间", trigger: "blur" }],
72 qzsj: [{ required: true, message: "土地使用起止时间", trigger: "blur" }],
73 },
74 };
75 },
76 watch: {
77 value (val) {
78 console.log("val",val);
79 this.myValue = _.cloneDeep(val);
80 },
81 details: {
82 handler: function (val, oldVal) {
83 console.log("val2",val);
84 this.ruleForm = val;
85 },
86 deep: true,
87 },
88 },
89 methods: {
90 closeDialog () {
91 this.$emit("input", false);
92 this.$refs["ruleForm"].resetFields();
93 },
94 submitForm () {
95 console.log("this.ruleForm",this.ruleForm);
96 this.$refs.ruleForm.validate((valid) => {
97 if (valid) {
98 this.$emit("input", false);
99 this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
100 } else {
101 return false;
102 }
103 });
104 },
105 },
106 };
107 </script>
108 <style scoped lang="scss">
109 @import "~@/styles/dialogBoxheader.scss";
110 .submit-button {
111 text-align: center;
112 height: 52px;
113 padding-top: 10px;
114 background-color: #fff;
115 }
116 </style>
...@@ -5,19 +5,19 @@ ...@@ -5,19 +5,19 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
8 <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150" 8 <lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
9 :data="tableDataList"> 9 :data="tableDataList">
10 </lb-table> 10 </lb-table>
11 <addQlr v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" /> 11 <addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
12 </div> 12 </div>
13 </template> 13 </template>
14 <script> 14 <script>
15 import { mapGetters } from 'vuex' 15 import { mapGetters } from 'vuex'
16 import { getIdCardInfo } from '@/utils/operation.js' 16 import { getIdCardInfo } from '@/utils/operation.js'
17 import addQlr from './dialog/addQlr.vue' 17 import addTdyt from './dialog/addTdyt.vue'
18 export default { 18 export default {
19 components: { 19 components: {
20 addQlr 20 addTdyt
21 }, 21 },
22 computed: { 22 computed: {
23 ...mapGetters(["dictData"]), 23 ...mapGetters(["dictData"]),
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
29 return [] 29 return []
30 } 30 }
31 }, 31 },
32 gyfs: {
33 type: String,
34 default: '1'
35 }
36 }, 32 },
37 data () { 33 data () {
38 return { 34 return {
...@@ -63,41 +59,64 @@ ...@@ -63,41 +59,64 @@
63 ) 59 )
64 } 60 }
65 }, 61 },
66 { 62 {
67 label: '土地用途', 63 label: '土地用途',
68 align: 'center', 64 align: 'center',
69 render: (h, scope) => { 65 render: (h, scope) => {
70 return <el-input v-model={scope.row.zjzl} ></el-input> 66 return (
71 } 67 <el-select value={scope.row.yt}
72 }, 68 onChange={(val) => { scope.row.yt = val }} clearable>
69 {
70 this.dictData['tdyt'].map(option => {
71 return (
72 <el-option label={option.dname} value={option.dcode}></el-option>
73 )
74 })
75 }
76 </el-select>
77 )
78 }
79 },
73 { 80 {
74 prop: "sqrmc", 81 prop: "sqrmc",
75 label: "土地使用起始时间", 82 label: "土地使用起始时间",
76 render: (h, scope) => { 83 render: (h, scope) => {
77 return <el-input v-model={scope.row.zjzl} ></el-input> 84 return (
85 <el-date-picker
86 v-model={scope.row.qssj}
87 type="date"
88 placeholder="选择日期"
89 ></el-date-picker>
90 );
78 } 91 }
79 }, 92 },
80 { 93 {
81 prop: "zjzl", 94 prop: "zjzl",
82 label: "土地使用结束时间", 95 label: "土地使用结束时间",
83 render: (h, scope) => { 96 render: (h, scope) => {
84 return <el-input v-model={scope.row.zjzl} ></el-input> 97 return (
98 <el-date-picker
99 v-model={scope.row.jssj}
100 type="date"
101 placeholder="选择日期"
102 ></el-date-picker>
103 );
85 } 104 }
86 }, 105 },
87 { 106 {
88 prop: "zjh", 107 prop: "zjh",
89 label: "土地使用期限", 108 label: "土地使用期限",
90 render: (h, scope) => { 109 render: (h, scope) => {
91 return <el-input v-model={scope.row.zjzl} ></el-input> 110 return <el-input v-model={scope.row.syqx} ></el-input>
92 } 111 }
93 } 112 }
94 ], 113 ],
95 column: []
96 } 114 }
97 }, 115 },
98 watch: { 116 watch: {
99 tableData: { 117 tableData: {
100 handler: function (val, oldVal) { 118 handler: function (val, oldVal) {
119 console.log("什么事件111",val);
101 let that = this 120 let that = this
102 this.$nextTick(() => { 121 this.$nextTick(() => {
103 if (val.length == 0 || !val) { 122 if (val.length == 0 || !val) {
...@@ -115,29 +134,28 @@ ...@@ -115,29 +134,28 @@
115 immediate: true, 134 immediate: true,
116 deep: true 135 deep: true
117 }, 136 },
118 gyfs: { 137 // gyfs: {
119 handler (newVal, oldValue) { 138 // handler (newVal, oldValue) {
120 let dataList = _.cloneDeep(this.InformationTable) 139 // console.log("什么事件222",newVal);
121 if (newVal == 0) { 140 // let dataList = _.cloneDeep(this.InformationTable)
122 // this.column = _.cloneDeep(dataList).slice(1, dataList.length) 141 // let dataList = _.cloneDeep(this.InformationTable)
123 this.column = _.cloneDeep(dataList) 142 // if (newVal == 0) {
143 // // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
144 // this.column = _.cloneDeep(dataList)
124 145
125 } else if ((newVal == '1' || newVal == '3')) { 146 // } else if ((newVal == '1' || newVal == '3')) {
126 this.column = dataList 147 // this.column = dataList
127 } else { 148 // } else {
128 this.column = _.cloneDeep(dataList) 149 // this.column = _.cloneDeep(dataList)
129 this.column.splice( 150 // }
130 2, 0, { 151 // },
131 prop: "fs", 152 // immediate: true
132 label: "份数" 153 // }
133 })
134 }
135 },
136 immediate: true
137 }
138 }, 154 },
139 methods: { 155 methods: {
156 // 新增提交事件
140 handleupdateDetail (value) { 157 handleupdateDetail (value) {
158 console.log("什么事件33",this.tableData);
141 if (this.isaddupdate) { 159 if (this.isaddupdate) {
142 if (!_.isEqual(value, this.tableData)) { 160 if (!_.isEqual(value, this.tableData)) {
143 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value); 161 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
...@@ -154,7 +172,7 @@ ...@@ -154,7 +172,7 @@
154 // 新增 172 // 新增
155 addClick () { 173 addClick () {
156 if (this.gyfs == '0' && this.tableDataList.length > 0) { 174 if (this.gyfs == '0' && this.tableDataList.length > 0) {
157 this.$message.warning("当前共有方式为单独所有，无法添加多个权利人") 175 this.$message.warning("1")
158 } else { 176 } else {
159 this.dialog = true 177 this.dialog = true
160 this.isaddupdate = true 178 this.isaddupdate = true
...@@ -172,36 +190,12 @@ ...@@ -172,36 +190,12 @@
172 }).catch(() => { 190 }).catch(() => {
173 }); 191 });
174 }, 192 },
175
176 // 身份证读取
177 readClick (row) {
178 getIdCardInfo().then(res => {
179 if (res.data.code == 0) {
180 let data = res.data.IDCardInfo
181 row.sqrmc = data.name
182 row.zjzl = '1'
183 row.zjh = data.cardID
184 row.xb = data.sexCode
185 row.txdz = data.address
186 row.fzjg = data.issueOrgan
187 this.$message({
188 message: '读取成功！',
189 type: 'success'
190 })
191 } else {
192 this.$message({
193 message: res.data.message,
194 type: 'warning'
195 })
196 }
197 })
198 },
199 // 修改 193 // 修改
200 editClick (index, row) { 194 editClick (index, row) {
201 // popupDialog("申请人信息", "workflow/components/addQlr", { 195 // popupDialog("申请人信息", "workflow/components/addQlr", {
202 // showButton: this.$route.query.viewtype ? false : true, 196 // showButton: this.$route.query.viewtype ? false : true,
203 // dataIndex :index, 197 // dataIndex :index,
204 // details :row, 198 // details :row,/[^\d]/g
205 // isaddupdate :false 199 // isaddupdate :false
206 // }); 200 // });
207 this.dataIndex = index 201 this.dataIndex = index
......