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(() => { ...@@ -30,7 +30,9 @@ const tableDataLoading = computed(() => {
30 }); 30 });
31 const data = computed(() => props?.tableInfo?.data) 31 const data = computed(() => props?.tableInfo?.data)
32 const tableInfo = computed(() => props?.tableInfo || {}) 32 const tableInfo = computed(() => props?.tableInfo || {})
33
33 const columnInfo = ref({ ...props?.columnInfo?.value }) 34 const columnInfo = ref({ ...props?.columnInfo?.value })
35
34 const isEdit = computed(() => props?.tableInfo?.isEdit) 36 const isEdit = computed(() => props?.tableInfo?.isEdit)
35 const flag = computed(() => props?.tableInfo?.flag) 37 const flag = computed(() => props?.tableInfo?.flag)
36 const page = computed(() => props?.page) 38 const page = computed(() => props?.page)
......
...@@ -248,6 +248,23 @@ const createOneData = () => { ...@@ -248,6 +248,23 @@ const createOneData = () => {
248 if (companyOption.value.length > 0) { 248 if (companyOption.value.length > 0) {
249 findTab(true) 249 findTab(true)
250 columnInfoReset() 250 columnInfoReset()
251 tableRef.value.columnInfo = {
252 companyGuid: "",
253 companyName: "",
254 daCode: "",
255 daName: "",
256 damGuid: "",
257 effectiveDate: "",
258 guid: "",
259 intableMoney: "",
260 intableTime: "",
261 issuingEntityGuid: "",
262 issuingEntityName: "",
263 registerGuid: "",
264 registerTime: "",
265 updateTime: "",
266 updateUserName: "",
267 }
251 assetsOption.value = [] 268 assetsOption.value = []
252 const currentDate = dayjs().format('YYYY-MM-DD'); 269 const currentDate = dayjs().format('YYYY-MM-DD');
253 tableInfo.value.flag = "create" 270 tableInfo.value.flag = "create"
...@@ -267,7 +284,6 @@ const createOneData = () => { ...@@ -267,7 +284,6 @@ const createOneData = () => {
267 damGuid: "" 284 damGuid: ""
268 }; 285 };
269 tableInfo.value.data = [newData, ...tableInfo.value.data]; 286 tableInfo.value.data = [newData, ...tableInfo.value.data];
270 console.log('新建了嘛', tableInfo.value.data, columnInfo.value)
271 //tableInfo.value.data = arr 287 //tableInfo.value.data = arr
272 tableInfo.value.currentId = BASE_ID 288 tableInfo.value.currentId = BASE_ID
273 tableInfo.value.isEdit = true 289 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!