添加字段

src/store/index.ts

@@ -4,6 +4,7 @@ import menu, { MenuState } from '@/store/modules/menu'
 import tabs, { TabsState } from '@/store/modules/tabs'
 import user, { UserState } from '@/store/modules/user'
 import table, { TableState } from "@/store/modules/table";
+import search, { SearchState } from "@/store/modules/search";
 import socket, { SocketState } from '@/store/modules/socket';
 import { StarbosStore } from './tools';
 
@@ -13,7 +14,8 @@ export type RootState = {
     menu: MenuState,
     user: UserState,
     table: TableState,
-    socket: SocketState
+    socket: SocketState,
+    search: SearchState
 }
 //导入所有的模块
 export const modules = {
@@ -21,7 +23,8 @@ export const modules = {
     menu: menu,
     user: user,
     table: table,
-    socket: socket
+    socket: socket,
+    search: search
 }
 
 export const key: InjectionKey<Store<RootState>> = Symbol()

src/store/modules/search.ts

+// import { createStore } from "vuex";
+
+// export default createStore({
+//   state: {
+//     kingdeeSearch: {},
+//   },
+//   mutations: {
+//     SET_KINGEE: (state: any, val: any) => {
+//       state.kingdeeSearch = val;
+//       console.log(val);
+//     },
+//   },
+//   actions: {},
+//   modules: {},
+// });
+// export const search = {
+//   state: {
+//     kingdeeSearch: {},
+//   },
+//   mutations: {
+//     SET_KINGEE: (state: any, val: any) => {
+//       state.kingdeeSearch = val;
+//       console.log(val);
+//     },
+//     // SET_INOVICE: (state: any, val: any) => {
+//     //   state.invoiceSearch = val;
+//     // },
+//   },
+// };
+
+//定义state类型
+export type SearchState = {
+  kingdeeSearch: Object;
+};
+
+//定义state
+export const state: SearchState = {
+  kingdeeSearch: {},
+};
+//定义mutations
+export const mutations = {
+  setkingdeeSearch(state: SearchState, data: Object) {
+    state.kingdeeSearch = data;
+    console.log(state.kingdeeSearch);
+  },
+};
+// //定义actions
+// export const actions = {};
+// //定义getters
+// export const getters = {
+//   getData(state: SearchState) {
+//     return state.kingdeeSearch;
+//   },
+// };
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  // actions,
+  // getters,
+};

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

@@ -27,10 +27,16 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="金蝶主键字段">
+                    <el-form-item label="金蝶主键字段" v-if="fieidForm.flag === '-1' || fieidForm.flag === 'ERP->MES'"
+                        prop="primaryKeyField">
                         <el-input v-model="fieidForm.primaryKeyField" placeholder="请输入金蝶主键字段" />
                     </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                    <el-form-item label="MES分录标识" v-if="fieidForm.flag === '-1' || fieidForm.flag === 'ERP->MES'">
+                        <el-input v-model="fieidForm.mesEntryName" placeholder="请输入MES分录标识" />
+                    </el-form-item>
+                </el-col>
                 <el-col></el-col>
                 <el-col :span="8" v-if="fieidForm.flag === '1' || fieidForm.flag === 'MES->ERP'">
                     <el-form-item label="分录标识" prop="entryName">
@@ -123,6 +129,7 @@ const fieidForm = ref({
     plugInUrl: '',
     customSql: '',
     primaryKeyField: '',
+    mesEntryName: '',
     kingdeeFiledDetail: <any>{}
 })
 const kingdeeFiledDetailData = ref<any>([])
@@ -131,7 +138,7 @@ const fieidRules = ref({
     sFormId: [{ required: true, message: '', trigger: 'blur' }],
     name: [{ required: true, message: '', trigger: 'blur' }],
     entryName: [{ required: true, message: '', trigger: 'blur' }],
-    // fatherEntryName: [{ required: true, message: '', trigger: 'blur' }],
+    primaryKeyField: [{ required: true, message: '', trigger: 'blur' }],
     // flag: [{ required: true, message: '', trigger: 'change' }],
 })
 
@@ -188,6 +195,7 @@ const clear = () => {
         plugInUrl: '',
         customSql: '',
         primaryKeyField: '',
+        mesEntryName: '',
         kingdeeFiledDetail: <any>{}
     }
     updateCount.value = 0

src/views/manage/kingdeeLog.vue

@@ -129,9 +129,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, nextTick } from "vue";
+import { ref, nextTick, watch } from "vue";
 import moment from "moment";
 import { ElMessage, ElTable } from "element-plus";
+import { store } from '@/store';
 import { getkingdeeLog } from "@/services/api/systemApi/log/logApi";
 import { usekingdeeLogTableList } from "../system/tableConfigData/useXyunLog";
 
@@ -141,12 +142,12 @@ interface List {
   createTime: string;
 }
 const dateTime = ref();
-const filterForm = ref({
+const filterForm = ref<any>({
   dateFrom: "",
   dateTo: "",
   name: "",
-  costTimeFrom: <any>undefined,
-  costTimeTo: <any>undefined,
+  costTimeFrom: undefined,
+  costTimeTo: undefined,
   queueId: "",
 });
 const detailForm = ref<any>({
@@ -198,8 +199,6 @@ const dateChange = (value: any) => {
     filterForm.value.dateFrom = "";
     filterForm.value.dateTo = "";
   }
-
-  // console.log(value);
 };
 // 选择多选框的数据
 const handleSelectionChange = (val: List[]) => {
@@ -220,7 +219,13 @@ const cancelVisible1 = () => {
 };
 // 筛选按钮
 const handleScreen = () => {
-  if (+filterForm.value.costTimeFrom <= +filterForm.value.costTimeTo) {
+  if (+filterForm.value.costTimeFrom < +filterForm.value.costTimeTo ||
+    filterForm.value.costTimeFrom === undefined ||
+    filterForm.value.costTimeFrom === undefined) {
+
+    store.commit('search/setkingdeeSearch', filterForm.value)
+
+    // localStorage.setItem("kingdeeFilter", JSON.stringify(filterForm.value));
     page(
       currentPage.value,
       pageSize.value,
@@ -242,37 +247,7 @@ const handleScreen = () => {
   }
 
 };
-// 筛选
-const page = (
-  pageNo?: number,
-  pageSize?: number,
-  dateFrom?: string,
-  dateTo?: string,
-  name?: string,
-  flag?: any,
-  costTimeFrom?: number,
-  costTimeTo?: number,
-  queueId?: string
-) => {
-  getkingdeeLog(
-    pageNo,
-    pageSize,
-    dateFrom,
-    dateTo,
-    name,
-    flag,
-    costTimeFrom,
-    costTimeTo,
-    queueId
-  ).then((res: any) => {
-    if (res.code === 200) {
-      tableList.value = res.data.records;
-      total.value = res.data.total;
-    }
-    // filterForm.value.dateFrom = ''
-    // filterForm.value.dateTo = ''
-  });
-};
+
 // 每页新条数
 const handleSizeChange = (val: number) => {
   pageSize.value = val;
@@ -323,13 +298,50 @@ const handleNumberChangeTo = () => {
   }
 };
 
+
 const onFocus = () => document.getElementById('input-class')!.style.boxShadow = '0 0 0 1px #409EFF inset'
 
 const onBlur = () => document.getElementById('input-class')!.style.boxShadow = '0 0 0 1px #dcdfe6 inset'
 
+const initfilter = () => {
+  setTimeout(() => {
+    filterForm.value = store.state.search.kingdeeSearch
+    console.log(filterForm.value)
+  }, 50);
+}
+initfilter()
+// 筛选
+const page = (
+  pageNo?: number,
+  pageSize?: number,
+  dateFrom?: string,
+  dateTo?: string,
+  name?: string,
+  flag?: any,
+  costTimeFrom?: number,
+  costTimeTo?: number,
+  queueId?: string
+) => {
+  getkingdeeLog(
+    pageNo,
+    pageSize,
+    dateFrom,
+    dateTo,
+    name,
+    flag,
+    costTimeFrom,
+    costTimeTo,
+    queueId
+  ).then((res: any) => {
+    if (res.code === 200) {
+      tableList.value = res.data.records;
+      total.value = res.data.total;
+    }
+  });
+};
 </script>
 <style scoped>
-::v-deep(.paperview-input-text) {
+.paperview-input-text {
   border: 0;
   color: #fafcff;
   background-color: #303133;

src/views/system/tableConfigData/useXyunLog.ts

@@ -18,6 +18,7 @@ export const usekingdeeLogTableList = () => {
     tableList.value = res.data.records;
     total.value = res.data.total;
     loading.value = false;
+    localStorage.setItem("filter", JSON.stringify());
   });
   return {
     tableList,