281aeab7 by renchao@pashanhoo.com

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

2 parents a7a76a57 f08b666a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 15:47:12 3 * @Date: 2023-02-28 15:47:12
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:39:12 5 * @LastEditTime: 2023-09-14 15:04:20
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -108,13 +108,15 @@ export default { ...@@ -108,13 +108,15 @@ export default {
108 // 边框颜色 108 // 边框颜色
109 borderColor:'rgb(230, 230, 230)', 109 borderColor:'rgb(230, 230, 230)',
110 // 申请单元列表数据 110 // 申请单元列表数据
111 unitIdList:[] 111 unitIdList:[],
112 // 组件标识
113 compFlag:Math.random()
112 }; 114 };
113 }, 115 },
114 mounted() { 116 mounted() {
115 // 根据申请单元列表数据处理选中户 117 // 根据申请单元列表数据处理选中户
116 console.log("window.unitData",window.unitData); 118 console.log("window.unitData",window.unitData);
117 if(window.unitData.length){ 119 if(window.unitData && window.unitData.length){
118 window.unitData.forEach(e => { 120 window.unitData.forEach(e => {
119 this.unitIdList.push(e.bdcdyid) 121 this.unitIdList.push(e.bdcdyid)
120 }) 122 })
...@@ -256,24 +258,27 @@ export default { ...@@ -256,24 +258,27 @@ export default {
256 immediate: true, 258 immediate: true,
257 deep: true, 259 deep: true,
258 }, 260 },
259 hbsmList(val){ 261 hbsmList(val){
260 let list = [] 262 let list = []
261 val.length && val.forEach((i)=>{ 263 val.length && val.forEach((i)=>{
262 this.ch.forEach((c) => { 264 this.ch.forEach((c) => {
263 c.hs.forEach((h) => { 265 c.hs.forEach((h) => {
264 if (i == h.bsm) { 266 if (i == h.bsm) {
265 list.push( 267 list.push(
266 { 268 {
267 bdcdyh:h.bdcdyh, 269 bdcdyh:h.bdcdyh,
268 bsm:h.bsm, 270 bsm:h.bsm,
269 dyhbsm:h.dyhbsm 271 dyhbsm:h.dyhbsm,
270 } 272 bdcdyid:h.dyhbsm,
271 ) 273 bdcdylx:'7',
272 } 274 flag:this.compFlag
275 }
276 )
277 }
278 });
273 }); 279 });
274 });
275 }) 280 })
276 this.getBsmList(list) 281 this.getBsmList(list,this.compFlag)
277 }, 282 },
278 changeChoosedObj: { 283 changeChoosedObj: {
279 handler(val) { 284 handler(val) {
......
...@@ -37,7 +37,11 @@ import chCpn from "./ch.vue"; ...@@ -37,7 +37,11 @@ import chCpn from "./ch.vue";
37 import zdyCpn from "./zdys.vue"; 37 import zdyCpn from "./zdys.vue";
38 import ljzsCpn from "./ljzs.vue"; 38 import ljzsCpn from "./ljzs.vue";
39 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js"; 39 import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
40 import jump from "../../ywbl/ywsq/components/mixin/jump";
41 import store from '@/store/index.js'
42 import { ywPopupCacel } from "@/utils/popup.js";
40 export default { 43 export default {
44 mixins: [jump],
41 provide() { 45 provide() {
42 return { 46 return {
43 openMenu: this.openMenu, 47 openMenu: this.openMenu,
...@@ -74,6 +78,7 @@ export default { ...@@ -74,6 +78,7 @@ export default {
74 type: Object, 78 type: Object,
75 default: () => { } 79 default: () => { }
76 }, 80 },
81 isJump: { type: Boolean, default: false },
77 }, 82 },
78 data() { 83 data() {
79 return { 84 return {
...@@ -111,8 +116,12 @@ export default { ...@@ -111,8 +116,12 @@ export default {
111 * @param {Array} bsmList 116 * @param {Array} bsmList
112 * @author: renchao 117 * @author: renchao
113 */ 118 */
114 getBsmList(bsmList){ 119 getBsmList(bsmList,compFlag){
115 this.bsmList = bsmList; 120 // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
121 this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
122 // 合并本次数据
123 this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
124 // })
116 }, 125 },
117 /** 126 /**
118 * @description: 保存当前楼盘表 127 * @description: 保存当前楼盘表
...@@ -229,11 +238,7 @@ export default { ...@@ -229,11 +238,7 @@ export default {
229 this.$message.error("请至少选择一条数据"); 238 this.$message.error("请至少选择一条数据");
230 return; 239 return;
231 } 240 }
232 this.loading = true 241 this.loading = true;
233 this.bsmList.forEach(item=>{
234 item['bdcdyid'] = item.dyhbsm;
235 item['bdcdylx'] = '7';
236 })
237 startBusinessFlow({ 242 startBusinessFlow({
238 bsmSqyw: this.sqywInfo.bsmSqyw, 243 bsmSqyw: this.sqywInfo.bsmSqyw,
239 bdcdysz: this.bsmList, 244 bdcdysz: this.bsmList,
...@@ -250,7 +255,7 @@ export default { ...@@ -250,7 +255,7 @@ export default {
250 } else { 255 } else {
251 store.dispatch('user/refreshPage', true); 256 store.dispatch('user/refreshPage', true);
252 } 257 }
253 this.$popupCacel() 258 this.close()
254 } else { 259 } else {
255 if (res.result && res.result.length > 0) { 260 if (res.result && res.result.length > 0) {
256 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) 261 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
...@@ -262,6 +267,14 @@ export default { ...@@ -262,6 +267,14 @@ export default {
262 this.loading = false 267 this.loading = false
263 }) 268 })
264 }, 269 },
270 /**
271 * @description: close
272 * @param {*} val
273 * @author: renchao
274 */
275 close(){
276 ywPopupCacel()
277 },
265 }, 278 },
266 computed:{ 279 computed:{
267 lpbContentHeight(){ 280 lpbContentHeight(){
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 17:25:45 3 * @Date: 2023-02-28 17:25:45
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:59:46 5 * @LastEditTime: 2023-09-14 14:35:19
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -21,12 +21,14 @@ ...@@ -21,12 +21,14 @@
21 > 21 >
22 <!-- 逻辑幢名称 --> 22 <!-- 逻辑幢名称 -->
23 <p class="lpb-xmmc ljz-xmmc"> 23 <p class="lpb-xmmc ljz-xmmc">
24 <span>{{ljz.ljzmc}}</span> 24 <el-checkbox @change="zdySelectAll($event,ljz.bsm)">{{
25 ljz.ljzmc
26 }}</el-checkbox>
25 </p> 27 </p>
26 <!-- 独立层户 --> 28 <!-- 独立层户 -->
27 <ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" /> 29 <ch-cpn v-if="ljz.cs.length" :ref="ljz.bsm" :ch="ljz.cs" />
28 <!-- 幢单元 --> 30 <!-- 幢单元 -->
29 <zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/> 31 <zdy-cpn v-if="ljz.zdys.length" :ref="'zdy' + ljz.bsm" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
30 </div> 32 </div>
31 </div> 33 </div>
32 </div> 34 </div>
...@@ -38,11 +40,15 @@ ...@@ -38,11 +40,15 @@
38 v-else 40 v-else
39 > 41 >
40 <!-- 逻辑幢名称 --> 42 <!-- 逻辑幢名称 -->
41 <p class="lpb-xmmc ljz-xmmc">{{ ljzarr[0].ljzmc }}</p> 43 <p class="lpb-xmmc ljz-xmmc">
44 <el-checkbox @change="zdySelectAll($event,ljzarr[0].bsm)">{{
45 ljzarr[0].ljzmc
46 }}</el-checkbox>
47 </p>
42 <!-- 独立层户 --> 48 <!-- 独立层户 -->
43 <ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" /> 49 <ch-cpn v-if="ljzarr[0].cs.length" :ref="ljzarr[0].bsm" :ch="ljzarr[0].cs" />
44 <!-- 幢单元 --> 50 <!-- 幢单元 -->
45 <zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/> 51 <zdy-cpn v-if="ljzarr[0].zdys.length" :ref="'zdy' + ljzarr[0].bsm" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
46 </div> 52 </div>
47 </div> 53 </div>
48 </div> 54 </div>
...@@ -90,7 +96,20 @@ export default { ...@@ -90,7 +96,20 @@ export default {
90 return tempArr.filter(Boolean) 96 return tempArr.filter(Boolean)
91 }, 97 },
92 }, 98 },
93 methods: {}, 99 methods: {
100 /**
101 * @description: 逻辑幢全选
102 * @param {*} val
103 * @param {*} r
104 * @return {*}
105 */
106 zdySelectAll(val,r) {
107 // 逻辑幢下的独立层户全选
108 this.$refs[r] && this.$refs[r][0].zdySelectAll(val)
109 // 逻辑幢下的幢单元全选
110 this.$refs['zdy' + r] && this.$refs['zdy' + r][0].selectAll(val)
111 }
112 },
94 }; 113 };
95 </script> 114 </script>
96 115
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 16:29:04 3 * @Date: 2023-02-28 16:29:04
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-07-21 14:55:30 5 * @LastEditTime: 2023-09-14 14:36:51
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
13 <div v-for="zdy in realZdys" :key="zdy.bsm"> 13 <div v-for="zdy in realZdys" :key="zdy.bsm">
14 <!-- 幢单元名称 --> 14 <!-- 幢单元名称 -->
15 <p class="lpb-xmmc"> 15 <p class="lpb-xmmc">
16 <el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{ 16 <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
17 zdy.zdymc 17 zdy.zdymc
18 }}</el-checkbox> 18 }}</el-checkbox>
19 <span v-else>aaa{{zdy.zdymc}}</span>
20 </p> 19 </p>
21 <!-- 每个幢单元下的层户 --> 20 <!-- 每个幢单元下的层户 -->
22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> 21 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
...@@ -58,6 +57,16 @@ export default { ...@@ -58,6 +57,16 @@ export default {
58 zdySelectAll(val,r) { 57 zdySelectAll(val,r) {
59 this.$refs[r][0].zdySelectAll(val) 58 this.$refs[r][0].zdySelectAll(val)
60 }, 59 },
60 /**
61 * @description: 逻辑幢全选点击后逻辑幢下的幢单元全选
62 * @param {*} val
63 * @return {*}
64 */
65 selectAll(val){
66 this.realZdys.forEach(i=>{
67 this.zdySelectAll(val,i.bsm)
68 })
69 }
61 }, 70 },
62 computed: { 71 computed: {
63 realZdys() { 72 realZdys() {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="boxcfdj" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxcfdj" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
12 style="page-break-after: always" 12 style="page-break-after: always"
13 > 13 >
14 <div class="title">{{ title }}</div> 14 <div class="title">{{ title }}</div>
15 <div class="num">{{ datass.length }}页,第{{ indexx + 1 }}</div>
15 <table class="xxTable"> 16 <table class="xxTable">
16 <tr v-for="item in columns" :key="item.name"> 17 <tr v-for="item in columns" :key="item.name">
17 <td> 18 <td>
...@@ -50,18 +51,14 @@ export default { ...@@ -50,18 +51,14 @@ export default {
50 }; 51 };
51 }, 52 },
52 props: { 53 props: {
53 propsParam: {
54 type: Object,
55 default: () => {},
56 },
57 tableData: { 54 tableData: {
58 type: Array, 55 type: Array,
59 default: () => [], 56 default: () => [],
60 }, 57 },
61 render:{ 58 render: {
62 type: Boolean, 59 type: Boolean,
63 default: false, 60 default: false,
64 } 61 },
65 }, 62 },
66 created() {}, 63 created() {},
67 watch: { 64 watch: {
...@@ -70,11 +67,11 @@ export default { ...@@ -70,11 +67,11 @@ export default {
70 this.tableData = newValue; 67 this.tableData = newValue;
71 }, 68 },
72 }, 69 },
73 render: { 70 render: {
74 handler(newValue, oldValue) { 71 handler(newValue, oldValue) {
75 if(newValue){ 72 if (newValue) {
76 this.loadData(); 73 this.loadData();
77 } 74 }
78 }, 75 },
79 }, 76 },
80 immediate: true, 77 immediate: true,
...@@ -87,13 +84,13 @@ export default { ...@@ -87,13 +84,13 @@ export default {
87 */ 84 */
88 loadData() { 85 loadData() {
89 getFieldListByQlxx({ 86 getFieldListByQlxx({
90 qllx: this.propsParam.qllx, 87 qllx: this.tableData[0].qllx,
91 }).then((res) => { 88 }).then((res) => {
92 if (res.code === 200) { 89 if (res.code === 200) {
93 this.columns = res.result; 90 this.columns = res.result;
94 } 91 }
95 }); 92 });
96 if (this.tableData.length&&this.datass.length==0) { 93 if (this.tableData.length && this.datass.length == 0) {
97 for (let i = 0; i < this.tableData.length; i += 4) { 94 for (let i = 0; i < this.tableData.length; i += 4) {
98 this.datass.push(this.tableData.slice(i, i + 4)); 95 this.datass.push(this.tableData.slice(i, i + 4));
99 } 96 }
...@@ -113,8 +110,13 @@ export default { ...@@ -113,8 +110,13 @@ export default {
113 <style lang="scss" scoped> 110 <style lang="scss" scoped>
114 .tbalede { 111 .tbalede {
115 width: 100%; 112 width: 100%;
116 // height: 1123px;
117 margin: auto; 113 margin: auto;
114 position: relative;
115 .num {
116 position: absolute;
117 right: 10px;
118 top: 0px;
119 }
118 .title { 120 .title {
119 width: 100%; 121 width: 100%;
120 font-weight: 700; 122 font-weight: 700;
...@@ -140,16 +142,15 @@ export default { ...@@ -140,16 +142,15 @@ export default {
140 padding: 5px; 142 padding: 5px;
141 } 143 }
142 td { 144 td {
143 width: 20px!important; 145 width: 20px !important;
144 word-break: break-all; 146 word-break: break-all;
145 // /* 方法一:使用 word-break */ 147 // /* 方法一:使用 word-break */
146 // word-break: break-all; 148 // word-break: break-all;
147 // // /* 方法二:使用 white-space */ 149 // // /* 方法二:使用 white-space */
148 // // white-space: pre-wrap; 150 // // white-space: pre-wrap;
149 // // /* 方法三:使用 overflow-wrap */ 151 // // /* 方法三:使用 overflow-wrap */
150 // // overflow-wrap: break-word; 152 // // overflow-wrap: break-word;
151 } 153 }
152
153 } 154 }
154 } 155 }
155 </style> 156 </style>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="boxdiyaq" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxdiyaq" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="boxdiyiq" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxdiyiq" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxfdcq" 10 id="boxfdcq"
11 :propsParam="propsParam" :tableData="tableData" :render="render"/> 11 :tableData="tableData" :render="render"/>
12 </div> 12 </div>
13 <div class="tableBox"> 13 <div class="tableBox">
14 <div class="title"> 14 <div class="title">
......
...@@ -5,10 +5,9 @@ ...@@ -5,10 +5,9 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxfdcq" 10 id="boxfdcq"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxjsydsyq" 10 id="boxjsydsyq"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxldsyq" 10 id="boxldsyq"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxnydsyq" 10 id="boxnydsyq"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
18 <div v-show="false"> 18 <div v-show="false">
19 <printTemplate 19 <printTemplate
20 id="boxsllmsyq" 20 id="boxsllmsyq"
21 :propsParam="propsParam"
22 :tableData="tableData" 21 :tableData="tableData"
23 :render="render" 22 :render="render"
24 /> 23 />
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="boxtdsyq" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxtdsyq" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate id="boxygdj" :propsParam="propsParam" :tableData="tableData" :render="render"/> 9 <printTemplate id="boxygdj" :tableData="tableData" :render="render"/>
10 </div> 10 </div>
11 <div class="tableBox"> 11 <div class="tableBox">
12 <div class="title"> 12 <div class="title">
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 <div v-show="false"> 8 <div v-show="false">
9 <printTemplate 9 <printTemplate
10 id="boxyydj" 10 id="boxyydj"
11 :propsParam="propsParam"
12 :tableData="tableData" 11 :tableData="tableData"
13 :render="render" 12 :render="render"
14 /> 13 />
......
...@@ -103,18 +103,46 @@ ...@@ -103,18 +103,46 @@
103 </el-col> 103 </el-col>
104 </el-row> 104 </el-row>
105 <el-row :gutter="10" v-if="ruleForm.fdcq1"> 105 <el-row :gutter="10" v-if="ruleForm.fdcq1">
106 <el-col :span="8"> 106 <el-col :span="8">
107 <el-form-item label="独用土地面积:"> 107 <el-form-item label="独用土地面积:">
108 <el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.dytdmj"></el-input> 108 <div class="flex">
109 <el-input
110 maxlength="12"
111 v-model="ruleForm.fdcq1.dytdmj"
112 :disabled="!viewEdit"
113 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
114 <el-select disabled v-model="mjdw" style="width: 68px">
115 <el-option
116 v-for="item in dictData['A7']"
117 :key="item.dcode"
118 :label="item.dname"
119 :value="item.dcode">
120 </el-option>
121 </el-select>
122 </div>
109 </el-form-item> 123 </el-form-item>
110 </el-col> 124 </el-col>
111 <el-col :span="8"> 125 <el-col :span="8">
112 <el-form-item label="分摊土地面积:"> 126 <el-form-item label="分摊土地面积:">
113 <el-input :disabled="!viewEdit" maxlength="12" v-model="ruleForm.fdcq1.fttdmj"></el-input> 127 <div class="flex">
128 <el-input
129 maxlength="12"
130 v-model="ruleForm.fdcq1.fttdmj"
131 :disabled="!viewEdit"
132 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
133 <el-select disabled v-model="mjdw" style="width: 68px">
134 <el-option
135 v-for="item in dictData['A7']"
136 :key="item.dcode"
137 :label="item.dname"
138 :value="item.dcode">
139 </el-option>
140 </el-select>
141 </div>
114 </el-form-item> 142 </el-form-item>
115 </el-col> 143 </el-col>
116
117 <el-col :span="8"> 144 <el-col :span="8">
145
118 <el-form-item label="房地产交易价格:"> 146 <el-form-item label="房地产交易价格:">
119 <div class="flex"> 147 <div class="flex">
120 <el-input 148 <el-input
...@@ -298,6 +326,7 @@ ...@@ -298,6 +326,7 @@
298 disabled: true, 326 disabled: true,
299 tdytOption: [], 327 tdytOption: [],
300 czrOptions: [], 328 czrOptions: [],
329 mjdw: "1",
301 czr: "", 330 czr: "",
302 ruleForm: { 331 ruleForm: {
303 flow: { 332 flow: {
......