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

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-11 09:48:21
+ * @LastEditTime: 2023-07-14 11:02:12
 -->
 <template>
   <!-- 受理信息 -->
@@ -88,48 +88,90 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="农用地面积：">
-              <el-input v-model="ruleForm.tdsyq.nydmj" :disabled="!ableOperation"
-                oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+              <div class="flex">
+                <el-input v-model="ruleForm.tdsyq.nydmj" :disabled="!ableOperation"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
+                  <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="耕地面积：">
-              <el-input v-model="ruleForm.tdsyq.gdmj" :disabled="!ableOperation"
-                oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+              <div class="flex">
+                <el-input v-model="ruleForm.tdsyq.gdmj" :disabled="!ableOperation"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
+                  <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="林地面积：">
-              <el-input v-model="ruleForm.tdsyq.ldmj" :disabled="!ableOperation"
-                oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+              <div class="flex">
+                <el-input v-model="ruleForm.tdsyq.ldmj" :disabled="!ableOperation"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
+                  <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="草地面积：">
-              <el-input v-model="ruleForm.tdsyq.cdmj" :disabled="!ableOperation"
-                oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+              <div class="flex">
+                <el-input v-model="ruleForm.tdsyq.cdmj" :disabled="!ableOperation"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
+                  <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="其他农用地面积：">
-              <el-input v-model="ruleForm.tdsyq.qtnydmj" :disabled="!ableOperation"
-                oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+              <div class="flex">
+                <el-input v-model="ruleForm.tdsyq.qtnydmj" :disabled="!ableOperation"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
+                  <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="建筑使用面积：">
-              <el-input v-model="ruleForm.tdsyq.jsydmj" :disabled="!ableOperation"
-                oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+              <div class="flex">
+                <el-input v-model="ruleForm.tdsyq.jsydmj" :disabled="!ableOperation"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
+                  <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="未利用地面积：">
-              <el-input v-model="ruleForm.tdsyq.wlydmj" :disabled="!ableOperation"
-                oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+              <div class="flex">
+                <el-input v-model="ruleForm.tdsyq.wlydmj" :disabled="!ableOperation"
+                  oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
+                <el-select v-model="mjdw" :disabled="!ableOperation" style="width:20%">
+                  <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                  </el-option>
+                </el-select>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -243,6 +285,7 @@
     },
     data () {
       return {
+        mjdw: '1',
         value2: {
           id: "520000198407304275",
           user: "史平"