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

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

@@ -58,7 +58,8 @@ const fromData = ref({
     isEntryField: false,
     thirdPartyField: '',
     thirdPartyFieldName: '',
-    sortOrder: ''
+    sortOrder: '',
+    defaultValue: ''
 } as any)
 
 // 校验规则
@@ -66,14 +67,15 @@ const fromRules = ref({
     kingDeeField: [{ required: true, message: '', trigger: 'blur' }],
     kingDeeFieldName: [{ required: true, message: '', trigger: 'blur' }],
     fieldType: [{ required: true, message: '', trigger: 'change' }],
-    thirdPartyField: [{ required: true, message: '', trigger: 'blur' }],
-    thirdPartyFieldName: [{ required: true, message: '', trigger: 'blur' }],
+    // thirdPartyField: [{ required: true, message: '', trigger: 'blur' }],
+    // thirdPartyFieldName: [{ required: true, message: '', trigger: 'blur' }],
     sortOrder: [{ required: true, message: '', trigger: 'blur' }]
 })
 
 // 确认操作
 const onConfirm = () => {
     fromRef.value?.validate((valid: boolean, fields: any) => {
+        console.info("fromData", fromData)
         if (valid) {
             if (title.value === '新增') {
                 createMap(fromData.value).then((res: any) => {
@@ -114,7 +116,8 @@ const handleClose = () => {
         isEntryField: false,
         thirdPartyField: '',
         thirdPartyFieldName: '',
-        sortOrder: ''
+        sortOrder: '',
+        defaultValue:'',
     }
     dialogVisible.value = false
 }

src/views/manage/components/fieldConfiguration/newField.vue

@@ -9,6 +9,11 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
+                    <el-form-item label="同步顺序" prop="paiXu">
+                        <el-input v-model="fieidForm.paiXu" placeholder="请输入同步顺序" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
                     <el-form-item label="单据唯一标识" prop="sFormId">
                         <el-input v-model="fieidForm.sFormId" placeholder="请输入金碟标识" />
                     </el-form-item>
@@ -131,6 +136,7 @@ const fieldTitle = ref('新增字段')
 const fieidForm = ref({
     sFormId: '',
     docType: '',
+    paiXu:"",
     name: '',
     direction: '',
     operation: '1',
@@ -150,6 +156,7 @@ const fieidForm = ref({
 const kingdeeFiledDetailData = ref<any>([])
 const fieidRules = ref({
     docType: [{ required: true, message: '', trigger: 'blur' }],
+    paiXu: [{ required: true, message: '', trigger: 'blur' }],
     sFormId: [{ required: true, message: '', trigger: 'blur' }],
     name: [{ required: true, message: '', trigger: 'blur' }],
     entryName: [{ required: true, message: '', trigger: 'blur' }],
@@ -196,6 +203,7 @@ const clear = () => {
     fieidForm.value = {
         sFormId: '',
         docType: '',
+        paiXu:'',
         name: '',
         direction: '',
         operation: '1',

src/views/manage/configMap.vue

@@ -6,7 +6,7 @@
                 :width="item.width" align="center" />
             <el-table-column label="是否是分录字段" prop="isEntryField" align="center" width="130">
                 <template #default="scope">
-                    <el-tag v-if="scope.row.isEntryField + '' == 'true'" type="success">是</el-tag>
+                    <el-tag v-if="scope.row.isEntryField + '' === 'true'" type="success">是</el-tag>
                     <el-tag v-else type="info">否</el-tag>
                 </template>
             </el-table-column>
@@ -51,11 +51,13 @@ const addMap = () => {
 }
 
 const editMap = (data: any) => {
+    console.info("data", data.isEntryField)
     newMapRef.value.dialogVisible = true
     newMapRef.value.title = '编辑'
-    if (data.isEntryField === 'true' || data.isEntryField) data.isEntryField = true
+    if (data.isEntryField === 'true' || data.isEntryField === true) data.isEntryField = true
     else data.isEntryField = false
     newMapRef.value.fromData = data
+    console.info("data", data)
 }
 
 let sizeChange = (val: number) => {
@@ -95,6 +97,7 @@ const delMap = (id: number) => {
 
 const init = () => {
     getMapList(listQuery.value).then((res: any) => {
+        console.info("res.data.records", res.data.records)
         if (res.code === 200) {
             mapData.value = res.data.records
             total.value = res.data.total

src/views/manage/fieldConfiguration.vue

@@ -3,6 +3,7 @@
         <el-button type="primary" style="margin-bottom: 20px;" @click="showFieid">新增字段</el-button>
         <el-table :data="fieidData" border v-loading="loading" stripe>
             <el-table-column label="docType" prop="docType" align="center" />
+            <el-table-column label="同步顺序" prop="paiXu" align="center" />
             <el-table-column label="单据唯一标识" prop="sFormId" align="center" />
             <el-table-column label="单据名称" prop="name" align="center">
                 <template #default="scope">

src/views/manage/tableData/configMapTable.ts

@@ -4,6 +4,7 @@ export const fromList = [
     { lable: '金蝶字段名称', prop: 'kingDeeFieldName' },
     { lable: '第三方字段', prop: 'thirdPartyField' },
     { lable: '第三方字段名称', prop: 'thirdPartyFieldName' },
+    { lable: '默认值', prop: 'defaultValue' },
 ]
 
 export const tableList = [
@@ -13,5 +14,6 @@ export const tableList = [
     { lable: '字段类型', prop: 'fieldType', width: '155' },
     { lable: '检索字段', prop: 'retrievalField', width: '155' },
     { lable: '第三方字段', prop: 'thirdPartyField', width: '165' },
-    { lable: '第三方字段名称', prop: 'thirdPartyFieldName', width: '155' }
+    { lable: '第三方字段名称', prop: 'thirdPartyFieldName', width: '155' },
+    { lable: '默认值', prop: 'defaultValue', width: '155' },
 ]

src/vueFormCreate/components/ComponentGroup.vue

@@ -10,7 +10,6 @@
   >
     <template #item="{ element }">
       <li
-        v-if="fields.includes(element.type)"
         class="form-edit-widget-label"
         :class="{ 'no-put': element.tpye === 'divider' }"
       >
@@ -39,10 +38,6 @@ export default defineComponent({
       type: String,
       required: true
     },
-    fields: {
-      type: Array as PropType<Array<string>>,
-      required: true
-    },
     list: {
       required: true
     }

src/vueFormCreate/core/element/ElDesignForm.vue

@@ -5,9 +5,9 @@
         <el-container>
           <el-aside width="250px">
             <div class="components">
-              <ComponentGroup title="基础字段" :fields="basicFields" :list="element.basicComponents" />
-              <ComponentGroup title="高级字段" :fields="advanceFields" :list="element.advanceComponents" />
-              <ComponentGroup title="布局字段" :fields="layoutFields" :list="element.layoutComponents" />
+              <ComponentGroup title="基础字段" :list="element.basicComponents" />
+              <ComponentGroup title="高级字段" :list="element.advanceComponents" />
+              <ComponentGroup title="布局字段" :list="element.layoutComponents" />
             </div>
           </el-aside>
           <el-main class="center-container">
@@ -144,32 +144,6 @@ export default defineComponent({
     clearable: {
       type: Boolean,
       default: true
-    },
-    basicFields: {
-      type: Array as PropType<Array<string>>,
-      default: () => [
-        'input',
-        'password',
-        'textarea',
-        'number',
-        'radio',
-        'checkbox',
-        'time',
-        'date',
-        'rate',
-        'select',
-        'switch',
-        'slider',
-        'text'
-      ]
-    },
-    advanceFields: {
-      type: Array as PropType<Array<string>>,
-      default: () => ['img-upload', 'richtext-editor', 'cascader']
-    },
-    layoutFields: {
-      type: Array as PropType<Array<string>>,
-      default: () => ['grid']
     }
   },
   setup(props: any, context: any) {

vite.config.ts

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