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

src/components/FormViewer/cardGourp.vue

@@ -84,6 +84,21 @@
     showActionButtonGroup: false,
     baseColProps: { lg: 24, md: 24 },
   });
+  watch(() => subTableDataStore.getToSetGroupData, () => {
+    if(subTableDataStore.getToSetGroupData){
+      if (Object.keys(subTableDataStore.getGroupData).includes(tableData.field)) {
+        noTitleKey.value = subTableDataStore.getGroupData[tableData.field];
+        if (tableData.ifShow) {
+          onTabChange({ target: { value: noTitleKey.value } }, tableData.field);
+        }
+      } else {
+        noTitleKey.value = tableData.componentProps.options[0].value;
+        if (tableData.ifShow) {
+          onTabChange({ target: { value: noTitleKey.value } }, tableData.field);
+        }
+      }
+    }
+  })
   watch(
     () => props.formData,
     (newVal) => {
@@ -199,7 +214,14 @@
   }
 
   function changeForm() {
-    subTableDataStore.setGroupData(getFieldsValue());
+    let data = getFieldsValue()
+    let result = {}
+    Object.keys(data).forEach(key => {
+      if(key.indexOf('card_group') == -1){
+        result[key] = data[key]
+      }
+    })
+    subTableDataStore.setGroupData(result);
   }
 
   async function verify() {

src/components/FormViewer/index.vue

@@ -369,6 +369,7 @@
     }
     cardGourpFormData.value = obj;
     subTableDataStore.setGroupData(obj);
+    subTableDataStore.setToSetGroupData();
     FieldsValue.value = obj;
     setFieldsValue({
       ...obj,

src/store/modules/subTable.ts

@@ -5,6 +5,7 @@ export const subTableStore = defineStore({
   state: () => ({
     tableDta: [],
     groupData: {},
+    toSetGroupData: false,
   }),
   getters: {
     getTableData(state) {
@@ -13,11 +14,17 @@ export const subTableStore = defineStore({
     getGroupData(state) {
       return state.groupData;
     },
+    getToSetGroupData(state){
+      return state.toSetGroupData;
+    }
   },
   actions: {
     setTableData(data) {
       this.tableDta = data;
     },
+    setToSetGroupData(){
+      this.toSetGroupData = true
+    },
     setSingleData(parentFileId, data) {
       this.tableDta.forEach((item, i) => {
         if (item.parentFileId == parentFileId) {
@@ -38,6 +45,7 @@ export const subTableStore = defineStore({
     },
     clearGoupData() {
       this.groupData = {};
+      this.toSetGroupData = false;
     },
   },
 });

src/views/demo/tiankongdi/auditinfo/MapList/index.vue

@@ -39,7 +39,7 @@
       </div>
       <div class="screen-item" style="margin-right:51px;">
         <!-- <div class="screen-item-label">图斑号</div> -->
-        <a-input v-model:value="params.geomid" class="item-input" placeholder="请输入图斑编号"/>
+        <a-input allowClear v-model:value="params.geomid" class="item-input" placeholder="请输入图斑编号"/>
       </div>
       <div class="screen-item" style="display: flex; justify-content: end;margin-bottom: 0px;">
           <a-button type="primary" class="item-button" :icon="h(SearchOutlined)" @click="query">查询</a-button>

src/views/demo/tiankongdi/curbspotcity/MapList/index.vue

@@ -33,12 +33,11 @@
       </div>
       <div class="screen-item" style="margin-bottom:12px;">
         <div class="screen-item-label">批次</div>
-        <a-select
+        <a-input
-          allowClear
+          class="item-input"
           style="width:117px;"
           v-model:value="props.infoScreenData.batch"
-          :options="batchOptions"
+          @change="(value) => emits('mapListScreenChange',value.target.value,'batch')"
-         @change="(value) => emits('mapListScreenChange',value,'batch')"
         />
       </div>
       <div class="screen-item" style="margin-right:15px;margin-bottom:22px;">
@@ -73,6 +72,7 @@
       </div>
       <div class="screen-item" style="margin-right: 14px;">
         <a-input
+          allowClear
           placeholder="请输入图斑编号"
           class="item-input"
           v-model:value="props.infoScreenData.mapNo"