23ac8528 by lxs

Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

2 parents af33c867 ac70cec4
......@@ -30,7 +30,9 @@ const tableDataLoading = computed(() => {
});
const data = computed(() => props?.tableInfo?.data)
const tableInfo = computed(() => props?.tableInfo || {})
const columnInfo = ref({ ...props?.columnInfo?.value })
const isEdit = computed(() => props?.tableInfo?.isEdit)
const flag = computed(() => props?.tableInfo?.flag)
const page = computed(() => props?.page)
......
......@@ -248,6 +248,23 @@ const createOneData = () => {
if (companyOption.value.length > 0) {
findTab(true)
columnInfoReset()
tableRef.value.columnInfo = {
companyGuid: "",
companyName: "",
daCode: "",
daName: "",
damGuid: "",
effectiveDate: "",
guid: "",
intableMoney: "",
intableTime: "",
issuingEntityGuid: "",
issuingEntityName: "",
registerGuid: "",
registerTime: "",
updateTime: "",
updateUserName: "",
}
assetsOption.value = []
const currentDate = dayjs().format('YYYY-MM-DD');
tableInfo.value.flag = "create"
......@@ -267,7 +284,6 @@ const createOneData = () => {
damGuid: ""
};
tableInfo.value.data = [newData, ...tableInfo.value.data];
console.log('新建了嘛', tableInfo.value.data, columnInfo.value)
//tableInfo.value.data = arr
tableInfo.value.currentId = BASE_ID
tableInfo.value.isEdit = true
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!