修改目录

src/services/api/systemApi/fieldConfiguration/commonConfig.ts

@@ -2,14 +2,14 @@ import { request } from "../../config";
 
 // 金蝶通用配置列表
 export function getCommonConfig(
-  name?: string,
   pageNo?: number,
-  pageSize?: number
+  pageSize?: number,
+  name?: string
 ) {
   return request({
     url: "/api/kingdee/common/config/list",
     method: "get",
-    params: { name, pageNo, pageSize },
+    params: { pageNo, pageSize, name },
   });
 }
 

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

 <template>
-    <el-drawer v-model="drawerVisible" size="60%" :title="fieldTitle" @close="handleClose">
+    <el-drawer v-model="drawerVisible" size="60%" :title="fieldTitle" :before-close="handleClose">
         <el-form :model="fieidForm" ref="fieidRef" :rules="fieidRules" label-width="120px" style="padding: 0 20px"
             :disabled="disabled">
             <el-row :gutter="24">
@@ -26,6 +26,12 @@
                         </el-select>
                     </el-form-item>
                 </el-col>
+                <el-col :span="8" v-if="fieidForm.flag === '1' || fieidForm.flag === 'MES->ERP'">
+                    <el-form-item label="分录标识" prop="entryName">
+                        <!-- :prop="fieidForm.flag === '1' && fieidForm.flag === 'MES->ERP' ? '' : 'entryName'" -->
+                        <el-input v-model="fieidForm.entryName" placeholder="请输入分录标识" />
+                    </el-form-item>
+                </el-col>
                 <el-col :span="8" v-show="fieidForm.flag === '1' || fieidForm.flag === 'MES->ERP'">
                     <el-form-item label="子行内码">
                         <el-input v-model="fieidForm.entryIdName" placeholder="请输入子行内码" />
@@ -46,11 +52,6 @@
                         <el-input v-model="fieidForm.linkFsIdName" placeholder="请输入子源单行内码" />
                     </el-form-item>
                 </el-col>
-                <el-col :span="8" v-show="fieidForm.flag === '1' || fieidForm.flag === 'MES->ERP'">
-                    <el-form-item label="分录标识">
-                        <el-input v-model="fieidForm.entryName" placeholder="请输入子源单行内码" />
-                    </el-form-item>
-                </el-col>
                 <el-col>
                     <el-form-item label="插件地址">
                         <el-input v-model="fieidForm.plugInUrl" type="textarea" :rows="4" placeholder="请输入插件地址" />
@@ -108,6 +109,7 @@ const fieidRules = ref({
     docType: [{ required: true, message: '', trigger: 'blur' }],
     sFormId: [{ required: true, message: '', trigger: 'blur' }],
     name: [{ required: true, message: '', trigger: 'blur' }],
+    entryName: [{ required: true, message: '', trigger: 'blur' }],
     // flag: [{ required: true, message: '', trigger: 'change' }],
 })
 
@@ -143,10 +145,7 @@ const onConfirm = () => {
     })
 }
 
-const detailFormValue = (Val: any) => {
-    fieidForm.value.kingdeeFiledDetail = Val
-    console.log(Val);
-}
+const detailFormValue = (Val: any) => fieidForm.value.kingdeeFiledDetail = Val
 const clear = () => {
     kingdeeFiledDetailData.value = []
     fieidForm.value = {
@@ -167,24 +166,75 @@ const clear = () => {
     drawerVisible.value = false
 }
 const handleClose = () => {
-    clear()
-    // if (kingdeeFiledDetailData.value) {
-    //     ElMessageBox.confirm('填写内容尚未提交，确认退出?', '明细',
-    //         { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning', }).then(() => {
-    //             clear()
-    //         })
+    if (fieldTitle.value !== '详情') {
+        ElMessageBox.confirm('是否有尚未提交的内容，确认退出?',
+            { confirmButtonText: '退出', cancelButtonText: '取消', type: 'warning', }).then(() => {
+                clear()
+            }).catch(() => { })
+    } else {
+        clear()
+    }
+    // if (fieldTitle.value === '新增字段') {
+    //     if (JSON.stringify(kingdeeFiledDetailData.value) !== '[]') {
+    //         ElMessageBox.confirm('填写内容尚未提交，确认退出?', '明细',
+    //             { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning', }).then(() => {
+    //                 clear()
+    //             }).catch(() => { })
+    //     } else {
+    //         clear()
+    //     }
     // } else {
-
+    //     console.log(kingdeeFiledDetailData.value);
+    //     console.log(isObjEqual(oldValue.value, kingdeeFiledDetailData.value));
+    //     isObjEqual(oldValue.value, kingdeeFiledDetailData.value)
+    //     if (!valueBoolean.value) {
+    //         ElMessageBox.confirm('填写内容尚未提交，确认退出?', '明细',
+    //             { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning', }).then(() => {
+    //                 clear()
+    //             }).catch(() => { })
+    //     } else {
+    //         clear()
+    //     }
     // }
-
 }
+const oldValue = ref<any>([])
+// const valueBoolean = ref(false)
+const oldObj = () => {
+    oldValue.value = kingdeeFiledDetailData.value
+    oldValue.value.kingdeeField = ''
+}
+// 判断数据是否改变
+// function isObjEqual(obj1: any, obj2: any) {
+//     //  Object.getOwnPropertyNames 返回对象所有的属性或对象中属性的个数
+//     let aProps = Object.getOwnPropertyNames(obj1);
+//     let bProps = Object.getOwnPropertyNames(obj2);
+//     //先判断两个数据length
+//     if (aProps.length == bProps.length) {
+//         //循环拿到数值进行对比
+//         aProps.forEach(e => {
+//             if (obj1[e] !== obj2[e]) {
+//                 console.log('数据改变')
+//                 return valueBoolean.value = false
+//             } else {
+//                 console.log('数据不变')
+//                 return valueBoolean.value = true
+//             }
+//         });
+//     } else {
+//         console.log('111');
+
+//         return valueBoolean.value = false
+
+//     }
+// }
 
 defineExpose({
     drawerVisible,
     fieldTitle,
     fieidForm,
     kingdeeFiledDetailData,
-    disabled
+    disabled,
+    oldObj
 })
 </script>
 

src/views/system/fieldConfiguration.vue → src/views/manage/fieldConfiguration.vue

@@ -22,6 +22,9 @@
                 </template>
             </el-table-column>
         </el-table>
+        <el-pagination :current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 15, 20]"
+            layout="->, total, prev, pager, next, jumper" :total="total" hide-on-single-page
+            @size-change="handleSizeChange" @current-change="handleCurrentChange" style="margin-top: 20px;" />
     </div>
     <new-field ref="newFieldRef" @initCommonConfig="initCommonConfig"></new-field>
 </template>
@@ -35,7 +38,13 @@ import newField from './components/fieldConfiguration/newField.vue';
 const fieidData = ref()
 const loading = ref(true)
 const newFieldRef = ref()
+const currentPage = ref(1)
+const pageSize = ref(10)
+const total = ref()
 
+const handleSizeChange = (value: number) => initCommonConfig(value, pageSize.value)
+
+const handleCurrentChange = (value: number) => initCommonConfig(value, pageSize.value)
 
 const showFieid = () => {
     newFieldRef.value.fieldTitle = '新增字段'
@@ -49,13 +58,12 @@ const handleEdit = (row: any) => {
     else row.flag = 'ERP->MES'
     newFieldRef.value.fieidForm = row
     newFieldRef.value.kingdeeFiledDetailData = row.kingdeeFiledDetail
+    // newFieldRef.value.oldObj()
     newFieldRef.value.drawerVisible = true
 }
 const showDetails = (row: any) => {
     newFieldRef.value.fieldTitle = '详情'
     if (typeof row.kingdeeFiledDetail === 'string') row.kingdeeFiledDetail = JSON.parse(row.kingdeeFiledDetail)
-    // // if (row.flag === '-1') row.flag = 'ERP->MES'
-    // // else row.flag = 'ERP->MES'
     row.flag = '' + row.flag
     newFieldRef.value.fieidForm = row
     newFieldRef.value.kingdeeFiledDetailData = row.kingdeeFiledDetail
@@ -78,16 +86,18 @@ const handleDelete = (id: number) => {
 }
 
 // 通用配置列表数据 
-const initCommonConfig = () => {
-    getCommonConfig().then((res: any) => {
+const initCommonConfig = (pageNo?: number, pageSize?: number, name?: string) => {
+    getCommonConfig(pageNo, pageSize, name).then((res: any) => {
         if (res.code === 200) {
             fieidData.value = res.data.records
+            total.value = res.data.total
             loading.value = false
             console.log(res, '通用配置列表数据');
         }
     })
 }
-initCommonConfig()
+
+initCommonConfig(currentPage.value, pageSize.value)
 </script>
 
 <style scoped>

src/views/system/kingdeeLog.vue → src/views/manage/kingdeeLog.vue

@@ -95,7 +95,7 @@ import { ref, nextTick } from "vue";
 import moment from "moment";
 import { ElTable } from "element-plus";
 import { getkingdeeLog } from "@/services/api/systemApi/log/logApi";
-import { usekingdeeLogTableList } from "./tableConfigData/useXyunLog";
+import { usekingdeeLogTableList } from "../system/tableConfigData/useXyunLog";
 
 interface List {
   flag: Boolean;

src/views/system/thirdPartyLog.vue → src/views/manage/thirdPartyLog.vue

@@ -95,7 +95,7 @@ import { ref, nextTick } from "vue";
 import moment from "moment";
 import { ElTable } from "element-plus";
 import { getThirdPartyLog } from "@/services/api/systemApi/log/logApi";
-import { useThirdPartyTableList } from "./tableConfigData/useXyunLog";
+import { useThirdPartyTableList } from "../system/tableConfigData/useXyunLog";
 
 interface List {
     flag: Boolean;

src/views/system/enableSynchronization.vue

@@ -15,16 +15,16 @@
             label-position="right" label-width="155px" class="demo-ruleForm" style="margin-top: 50px">
             <el-row>
                 <el-col :span="24">
+                    <el-col :span="24">
+                        <el-form-item label="第三方地址：" prop="thirdPartyUrl">
+                            <el-input v-model="sybchronizationForm.thirdPartyUrl" placeholder="请输入第三方地址：" clearable />
+                        </el-form-item>
+                    </el-col>
                     <el-form-item label="金蝶地址：" prop="k3CloudUrl">
                         <el-input v-model="sybchronizationForm.k3CloudUrl" placeholder="请输入金蝶地址：" clearable />
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                    <el-form-item label="第三方地址：" prop="thirdPartyUrl">
-                        <el-input v-model="sybchronizationForm.thirdPartyUrl" placeholder="请输入第三方地址：" clearable />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="24">
                     <el-form-item label="账套ID：" prop="dbid">
                         <el-input v-model="sybchronizationForm.dbid" placeholder="请输入账套ID：" clearable />
                     </el-form-item>
@@ -45,11 +45,12 @@
                             show-password />
                     </el-form-item>
                 </el-col>
-                <!-- <el-col :span="24">
-                    <el-form-item label="间隔时间/时：" prop="pwd">
-                        <el-input v-model="sybchronizationForm.pwd" placeholder="请输入密码：" clearable show-password />
+                <el-col :span="24">
+                    <el-form-item label="间隔时间/分钟：" prop="duration">
+                        <el-input type="number" v-model="sybchronizationForm.duration" placeholder="间隔时间：" clearable
+                            @input="(val: any) => { if (val <= 0 || val >= 60) sybchronizationForm.duration = '' }" />
                     </el-form-item>
-                </el-col> -->
+                </el-col>
                 <el-col :span="24">
                     <el-form-item style="margin-left: 20%">
                         <el-button type="primary" icon="Download" @click="handleSave(ruleFormRef)">保存配置</el-button>
@@ -79,14 +80,18 @@ const sybchronizationForm = ref({
     lang: "",
     uid: "",
     pwd: "",
+    duration: '',
 });
 // 校验规则
 const rules = ref<FormRules>({
     k3CloudUrl: [{ required: true, message: "金蝶地址不为空", trigger: "blur" }],
+    thirdPartyUrl: [{ required: true, message: "第三方地址不为空", trigger: "blur" }],
     dbid: [{ required: true, message: "数据库ID不为空", trigger: "blur" }],
     lang: [{ required: true, message: "语言不为空", trigger: "blur" }],
     uid: [{ required: true, message: "账号不为空", trigger: "blur" }],
     pwd: [{ required: true, message: "密码不为空", trigger: "blur" }],
+    duration: [{ required: true, message: "间隔时间不为空, 且大于0 小于60", trigger: "blur" },]
+    // {type: 'number', min: '0', max: }],
 });
 const ruleFormRef = ref<FormInstance>();