Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/components/Audit/InfoModal/index.vue

@@ -104,12 +104,18 @@
           <a-input v-model:value="props.infoData.zhongdianquyu_area" :disabled="!props.control"/>
         </div>
       </div>
-      <div class="item">
+      <div class="item" v-if="props.type == '违法用地'">
         <div class="label">图斑来源：</div>
         <div class="item-value">
-          <a-input v-model:value="props.infoData.tubanlaiyuan" :disabled="!props.control"/>
+          <a-select 
+            style="width: 100%"
+            v-model:value="props.infoData.tubanlaiyuan"
+            :options="tubanlaiyuanOptions"
+            placeholder="请选择图斑来源"
+            :disabled="!props.control"/>
         </div>
       </div>
+      <div class="item" v-else></div>
     </div>
     <div class="row">
       <div class="item">
@@ -275,6 +281,7 @@ const props = defineProps(['infoData','control','type','modalLoading'])
 const emits = defineEmits(['handleOk','closeModal','closeCase','reSubmit','changeLoading'])
 
 const typenameOptions = ref([])
+const tubanlaiyuanOptions = ref([])
 const countyOptions = ref([])
 const streetOptions = ref([])
 const communityOptions = ref([])
@@ -305,6 +312,14 @@ onMounted(() => {
       }
     })
   })
+  getLoad({code: 'wfydtbly'}).then(res => {
+    tubanlaiyuanOptions.value = res.map(item => {
+      return {
+        label: item.itemName,
+        value: item.itemValue
+      }
+    })
+  })
   getChildrenTree({ parentId: 371300 }).then(res => {
     countyOptions.value = res.map(item => {
       return {

src/views/demo/illegalmining/mainaudit/InfoModal/index.vue

@@ -64,9 +64,9 @@
         </div>
       </div>
       <div class="item">
-        <div class="label">图斑来源：</div>
-        <div class="item-value">
-          <a-input v-model:value="props.infoData.tubanlaiyuan" :disabled="!props.control"/>
+        <div class="label">详细地址：</div>
+        <div class="item-value"  style="flex:2">
+          <a-input v-model:value="props.infoData.address" :disabled="!props.control"/>
         </div>
       </div>
     </div>
@@ -229,12 +229,7 @@
           <a-input v-model:value="props.infoData.resubmitremark" disabled/>
         </div>
       </div>
-      <div class="item">
-        <div class="label">详细地址：</div>
-        <div class="item-value"  style="flex:2">
-          <a-input v-model:value="props.infoData.address" :disabled="!props.control"/>
-        </div>
-      </div>
+      <div class="item"></div>
       <div class="item"></div>
     </div>
     <div class="row">