613661b1 by yuanbo

Merge remote-tracking branch 'origin/dev' into dev

2 parents 9a8ca87c e02657ac
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-11 09:48:21 4 * @LastEditTime: 2023-07-14 11:02:12
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -88,48 +88,90 @@ ...@@ -88,48 +88,90 @@
88 <el-row :gutter="10"> 88 <el-row :gutter="10">
89 <el-col :span="8"> 89 <el-col :span="8">
90 <el-form-item label="农用地面积:"> 90 <el-form-item label="农用地面积:">
91 <el-input v-model="ruleForm.tdsyq.nydmj" :disabled="!ableOperation" 91 <div class="flex">
92 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 92 <el-input v-model="ruleForm.tdsyq.nydmj" :disabled="!ableOperation"
93 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
94 <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
95 <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
96 </el-option>
97 </el-select>
98 </div>
93 </el-form-item> 99 </el-form-item>
94 </el-col> 100 </el-col>
95 <el-col :span="8"> 101 <el-col :span="8">
96 <el-form-item label="耕地面积:"> 102 <el-form-item label="耕地面积:">
97 <el-input v-model="ruleForm.tdsyq.gdmj" :disabled="!ableOperation" 103 <div class="flex">
98 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 104 <el-input v-model="ruleForm.tdsyq.gdmj" :disabled="!ableOperation"
105 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
106 <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
107 <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
108 </el-option>
109 </el-select>
110 </div>
99 </el-form-item> 111 </el-form-item>
100 </el-col> 112 </el-col>
101 <el-col :span="8"> 113 <el-col :span="8">
102 <el-form-item label="林地面积:"> 114 <el-form-item label="林地面积:">
103 <el-input v-model="ruleForm.tdsyq.ldmj" :disabled="!ableOperation" 115 <div class="flex">
104 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 116 <el-input v-model="ruleForm.tdsyq.ldmj" :disabled="!ableOperation"
117 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
118 <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
119 <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
120 </el-option>
121 </el-select>
122 </div>
105 </el-form-item> 123 </el-form-item>
106 </el-col> 124 </el-col>
107 </el-row> 125 </el-row>
108 <el-row :gutter="10"> 126 <el-row :gutter="10">
109 <el-col :span="8"> 127 <el-col :span="8">
110 <el-form-item label="草地面积:"> 128 <el-form-item label="草地面积:">
111 <el-input v-model="ruleForm.tdsyq.cdmj" :disabled="!ableOperation" 129 <div class="flex">
112 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 130 <el-input v-model="ruleForm.tdsyq.cdmj" :disabled="!ableOperation"
131 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
132 <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
133 <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
134 </el-option>
135 </el-select>
136 </div>
113 </el-form-item> 137 </el-form-item>
114 </el-col> 138 </el-col>
115 <el-col :span="8"> 139 <el-col :span="8">
116 <el-form-item label="其他农用地面积:"> 140 <el-form-item label="其他农用地面积:">
117 <el-input v-model="ruleForm.tdsyq.qtnydmj" :disabled="!ableOperation" 141 <div class="flex">
118 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 142 <el-input v-model="ruleForm.tdsyq.qtnydmj" :disabled="!ableOperation"
143 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
144 <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
145 <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
146 </el-option>
147 </el-select>
148 </div>
119 </el-form-item> 149 </el-form-item>
120 </el-col> 150 </el-col>
121 <el-col :span="8"> 151 <el-col :span="8">
122 <el-form-item label="建筑使用面积:"> 152 <el-form-item label="建筑使用面积:">
123 <el-input v-model="ruleForm.tdsyq.jsydmj" :disabled="!ableOperation" 153 <div class="flex">
124 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 154 <el-input v-model="ruleForm.tdsyq.jsydmj" :disabled="!ableOperation"
155 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
156 <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
157 <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
158 </el-option>
159 </el-select>
160 </div>
125 </el-form-item> 161 </el-form-item>
126 </el-col> 162 </el-col>
127 </el-row> 163 </el-row>
128 <el-row :gutter="10"> 164 <el-row :gutter="10">
129 <el-col :span="8"> 165 <el-col :span="8">
130 <el-form-item label="未利用地面积:"> 166 <el-form-item label="未利用地面积:">
131 <el-input v-model="ruleForm.tdsyq.wlydmj" :disabled="!ableOperation" 167 <div class="flex">
132 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> 168 <el-input v-model="ruleForm.tdsyq.wlydmj" :disabled="!ableOperation"
169 oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
170 <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
171 <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
172 </el-option>
173 </el-select>
174 </div>
133 </el-form-item> 175 </el-form-item>
134 </el-col> 176 </el-col>
135 <el-col :span="8"> 177 <el-col :span="8">
...@@ -243,6 +285,7 @@ ...@@ -243,6 +285,7 @@
243 }, 285 },
244 data () { 286 data () {
245 return { 287 return {
288 mjdw: '1',
246 value2: { 289 value2: {
247 id: "520000198407304275", 290 id: "520000198407304275",
248 user: "史平" 291 user: "史平"
......