Merge branch 'master' of http://192.168.0.27:8090/xuxu/integrate-admin

src/views/manage/components/configMap/newMap.vue

@@ -23,6 +23,11 @@
                         <el-input v-model="fromData.retrievalField" placeholder="请输入检索字段" />
                     </el-form-item>
                 </el-col>
+                <el-col v-if="fromData.fieldType === '基础资料'">
+                    <el-form-item label="匹配表单">
+                        <el-input v-model="fromData.mapBill" placeholder="请输入匹配表单" />
+                    </el-form-item>
+                </el-col>
                 <el-col>
                     <el-form-item label="是否是分录字段" prop="isEntryField">
                         <el-switch v-model="fromData.isEntryField" />
@@ -55,6 +60,7 @@ const fromData = ref({
     kingDeeFieldName: '',
     fieldType: '',
     retrievalField: '',
+    mapBill:'',
     isEntryField: false,
     thirdPartyField: '',
     thirdPartyFieldName: '',
@@ -113,6 +119,7 @@ const handleClose = () => {
         kingDeeFieldName: '',
         fieldType: '',
         retrievalField: '',
+        mapBill:'',
         isEntryField: false,
         thirdPartyField: '',
         thirdPartyFieldName: '',

vite.config.ts

@@ -89,7 +89,7 @@ export default ({ command, mode }) => {
         // '/foo': '',
         // 选项写法
         "/integrate": {
-          target: "http://192.168.0.60",
+          target: "http://localhost:8090",
           //  rewrite: (path) => path.replace(/^\/api/, '')
         },
         // 正则表达式写法