表格删除指定key

snowy-admin-web/src/views/yqyc/zero/enterprise-ledger/detail.vue

@@ -286,7 +286,7 @@
 					</a-row>
 				</a-form>
 				<template v-if="!isView">
-					<a-button type="primary" style="margin-right: 8px;" v-if="!(bodyData.id || bodyData.__index)" @click="onBodyAdd">插入</a-button>
+					<a-button type="primary" style="margin-right: 8px;" v-if="!(bodyData.id)" @click="onBodyAdd">插入</a-button>
 					<a-button type="primary" style="margin-right: 8px;" v-else @click="onBodyEdit">保存</a-button>
 					<xn-batch-delete
 						:selectedRowKeys="bodySelectedRowKeys"
@@ -301,6 +301,7 @@
 					:pagination="false"
 					:scroll="{ x: 2000 }"
 					:row-selection="bodyOptions.rowSelection"
+					rowKey="id"
 				>
 					<template #bodyCell="{ column, record, index }">
 						<template v-if="column.dataIndex === 'recordUnit'">
@@ -457,7 +458,7 @@
 					</a-row>
 				</a-form>
 				<template v-if="!isView">
-					<a-button type="primary" style="margin-right: 8px;" v-if="!(productData.id || productData.__index)" @click="onProductAdd">插入</a-button>
+					<a-button type="primary" style="margin-right: 8px;" v-if="!(productData.id)" @click="onProductAdd">插入</a-button>
 					<a-button type="primary" style="margin-right: 8px;" v-else @click="onProductEdit">保存</a-button>
 					<xn-batch-delete
 						:selectedRowKeys="productSelectedRowKeys"
@@ -472,6 +473,7 @@
 					:pagination="false"
 					:scroll="{ x: 2000 }"
 					:row-selection="productOptions.rowSelection"
+					rowKey="id"
 				>
 					<template #bodyCell="{ column, record, index }">
 						<template v-if="column.dataIndex === 'regionCode'">
@@ -514,6 +516,7 @@
 					:columns="fileColumns"
 					:pagination="false"
 					:row-selection="fileOptions.rowSelection"
+					rowKey="id"
 				>
 					<template #bodyCell="{ column, record, index, text }">
 						<template v-if="['attachmentName', 'attachmentFormat', 'attachmentContent'].includes(column.dataIndex)">
@@ -1073,7 +1076,7 @@ const onBodyAdd = () => {
 	bodyFormRef.value
 	.validate()
 	.then(() => {
-		bodyList.value.push(Object.assign({__index: new Date().getTime()}, bodyData.value))
+		bodyList.value.push(Object.assign({id: new Date().getTime()}, bodyData.value))
 		onBodyReset()
 		message.success('插入料件信息成功！')
 	})
@@ -1084,12 +1087,7 @@ const onBodyEdit = () => {
 	bodyFormRef.value
 	.validate()
 	.then(() => {
-		let k = ''
-		if (bodyData.value.id) {
-			k = 'id'
-		} else if (bodyData.value.__index) {
-			k = '__index'
-		}
+		let k = 'id'
 		if (k) {
 			bodyList.value.forEach(v => {
 				if (v[k] === bodyData.value[k]) {
@@ -1120,7 +1118,7 @@ const deleteBatchBody = () => {
 	bodyList.value = bodyList.value.filter(v => {
 		let flag = true
 		bodySelectedRowKeys.value.forEach(s => {
-			if ((v.id && (v.id === s.id)) || (v.__index && (v.__index === s.__index))) {
+			if ((v.id && (v.id === s.id))) {
 				flag = false
 			}
 		})
@@ -1138,7 +1136,7 @@ const onProductAdd = () => {
 	productFormRef.value
 	.validate()
 	.then(() => {
-		productList.value.push(Object.assign({__index: new Date().getTime()}, productData.value))
+		productList.value.push(Object.assign({id: new Date().getTime()}, productData.value))
 		onProductReset()
 		message.success('插入产品信息成功！')
 	})
@@ -1149,12 +1147,7 @@ const onProductEdit = () => {
 	productFormRef.value
 	.validate()
 	.then(() => {
-		let k = ''
-		if (productData.value.id) {
-			k = 'id'
-		} else if (productData.value.__index) {
-			k = '__index'
-		}
+		let k = 'id'
 		if (k) {
 			productList.value.forEach(v => {
 				if (v[k] === productData.value[k]) {
@@ -1185,7 +1178,7 @@ const deleteBatchProduct = () => {
 	productList.value = productList.value.filter(v => {
 		let flag = true
 		productSelectedRowKeys.value.forEach(s => {
-			if ((v.id && (v.id === s.id)) || (v.__index && (v.__index === s.__index))) {
+			if ((v.id && (v.id === s.id))) {
 				flag = false
 			}
 		})
@@ -1208,7 +1201,7 @@ const fileChange = (file) => {
 	if (file) {
 		const f = ref_upload.value.uploadFileList()[0]
 		fileList.value.push({
-			__index: new Date().getTime(),
+			id: new Date().getTime(),
 			attachmentUrl: f.url,
 			attachmentName: f.name,
 			attachmentFormat: getFileExtension(f.name),
@@ -1239,7 +1232,7 @@ const deleteBatchFile = () => {
 	fileList.value = fileList.value.filter(v => {
 		let flag = true
 		fileSelectedRowKeys.value.forEach(s => {
-			if ((v.id && (v.id === s.id)) || (v.__index && (v.__index === s.__index))) {
+			if ((v.id && (v.id === s.id))) {
 				flag = false
 			}
 		})

snowy-admin-web/src/views/yqyc/zero/two/out-nuclear-annotation/detail.vue

@@ -355,7 +355,7 @@
 					</a-row>
 				</a-form>
 				<template v-if="!isView">
-					<a-button type="primary" style="margin-right: 8px;" v-if="!(bodyData.id || bodyData.__index)"
+					<a-button type="primary" style="margin-right: 8px;" v-if="!(bodyData.id)"
 							  @click="onBodyAdd">插入
 					</a-button>
 					<a-button type="primary" style="margin-right: 8px;" v-else @click="onBodyEdit">保存</a-button>
@@ -372,6 +372,7 @@
 					:pagination="false"
 					:scroll="{ x: 2000 }"
 					:row-selection="bodyOptions.rowSelection"
+					rowKey="id"
 				>
 					<template #bodyCell="{ column, record, index }">
 						<template v-if="column.dataIndex === 'declareUnit'">
@@ -435,6 +436,7 @@
 					:columns="fileColumns"
 					:pagination="false"
 					:row-selection="fileOptions.rowSelection"
+					rowKey="id"
 				>
 					<template #bodyCell="{ column, record, index, text }">
 						<template
@@ -866,7 +868,7 @@ const onBodyAdd = () => {
 	bodyFormRef.value
 	.validate()
 	.then(() => {
-		bodyList.value.push(Object.assign({__index: new Date().getTime()}, bodyData.value))
+		bodyList.value.push(Object.assign({id: new Date().getTime()}, bodyData.value))
 		onBodyReset()
 		message.success('插入表体信息成功！')
 	})
@@ -877,12 +879,7 @@ const onBodyEdit = () => {
 	bodyFormRef.value
 	.validate()
 	.then(() => {
-		let k = ''
-		if (bodyData.value.id) {
-			k = 'id'
-		} else if (bodyData.value.__index) {
-			k = '__index'
-		}
+		let k = 'id'
 		if (k) {
 			bodyList.value.forEach(v => {
 				if (v[k] === bodyData.value[k]) {
@@ -913,7 +910,7 @@ const deleteBatchBody = () => {
 	bodyList.value = bodyList.value.filter(v => {
 		let flag = true
 		bodySelectedRowKeys.value.forEach(s => {
-			if ((v.id && (v.id === s.id)) || (v.__index && (v.__index === s.__index))) {
+			if ((v.id && (v.id === s.id))) {
 				flag = false
 			}
 		})
@@ -971,7 +968,7 @@ const fileChange = (file) => {
 	if (file) {
 		const f = ref_upload.value.uploadFileList()[0]
 		fileList.value.push({
-			__index: new Date().getTime(),
+			id: new Date().getTime(),
 			attachmentUrl: f.url,
 			attachmentName: f.name,
 			attachmentFormat: getFileExtension(f.name),
@@ -1002,7 +999,7 @@ const deleteBatchFile = () => {
 	fileList.value = fileList.value.filter(v => {
 		let flag = true
 		fileSelectedRowKeys.value.forEach(s => {
-			if ((v.id && (v.id === s.id)) || (v.__index && (v.__index === s.__index))) {
+			if ((v.id && (v.id === s.id))) {
 				flag = false
 			}
 		})

snowy-admin-web/src/views/yqyc/zero/two/out-nuclear-release/detail.vue

@@ -217,14 +217,6 @@
 						</a-col>
 					</a-row>
 				</a-form>
-<!--				<template v-if="!isView">-->
-<!--					<a-button type="primary" style="margin-right: 8px;" v-if="!(bodyData.id || bodyData.__index)" @click="onBodyAdd">插入</a-button>-->
-<!--					<a-button type="primary" style="margin-right: 8px;" v-else @click="onBodyEdit">保存</a-button>-->
-<!--					<xn-batch-delete-->
-<!--						:selectedRowKeys="bodySelectedRowKeys"-->
-<!--						@batchDelete="deleteBatchBody"-->
-<!--					/>-->
-<!--				</template>-->
 				<a-table
 					style="margin-top: 10px"
 					bordered
@@ -233,6 +225,7 @@
 					:pagination="false"
 					:scroll="{ x: 2000 }"
 					:row-selection="bodyOptions.rowSelection"
+					rowKey="id"
 				>
 					<template #bodyCell="{ column, record, index }">
 						<template v-if="column.dataIndex === 'declareUnit'">
@@ -273,7 +266,7 @@
 					</a-row>
 				</a-form>
 				<template v-if="!isView">
-					<a-button type="primary" style="margin-right: 8px;" v-if="!(relationData.id || relationData.__index)" @click="onRelationAdd">插入</a-button>
+					<a-button type="primary" style="margin-right: 8px;" v-if="!(relationData.id)" @click="onRelationAdd">插入</a-button>
 					<a-button type="primary" style="margin-right: 8px;" v-else @click="onRelationEdit">保存</a-button>
 					<xn-batch-delete
 						:selectedRowKeys="relationSelectedRowKeys"
@@ -288,6 +281,7 @@
 					:pagination="false"
 					:scroll="{ x: 2000 }"
 					:row-selection="relationOptions.rowSelection"
+					rowKey="id"
 				>
 					<template #bodyCell="{ column, record, index }">
 						<template v-if="column.dataIndex === 'dzType'">
@@ -330,6 +324,7 @@
 					:columns="fileColumns"
 					:pagination="false"
 					:row-selection="fileOptions.rowSelection"
+					rowKey="id"
 				>
 					<template #bodyCell="{ column, record, index, text }">
 						<template v-if="['attachmentName', 'attachmentFormat', 'attachmentContent'].includes(column.dataIndex)">
@@ -666,7 +661,7 @@
 		bodyFormRef.value
 		.validate()
 		.then(() => {
-			bodyList.value.push(Object.assign({__index: new Date().getTime()}, bodyData.value))
+			bodyList.value.push(Object.assign({id: new Date().getTime()}, bodyData.value))
 			onBodyReset()
 			message.success('插入表体信息成功！')
 		})
@@ -677,12 +672,7 @@
 		bodyFormRef.value
 		.validate()
 		.then(() => {
-			let k = ''
-			if (bodyData.value.id) {
-				k = 'id'
-			} else if (bodyData.value.__index) {
-				k = '__index'
-			}
+			let k = 'id'
 			if (k) {
 				bodyList.value.forEach(v => {
 					if (v[k] === bodyData.value[k]) {
@@ -713,7 +703,7 @@
 		bodyList.value = bodyList.value.filter(v => {
 			let flag = true
 			bodySelectedRowKeys.value.forEach(s => {
-				if ((v.id && (v.id === s.id)) || (v.__index && (v.__index === s.__index))) {
+				if ((v.id && (v.id === s.id))) {
 					flag = false
 				}
 			})
@@ -728,7 +718,7 @@
 		relationFormRef.value
 		.validate()
 		.then(() => {
-			relationList.value.push(Object.assign({__index: new Date().getTime()}, relationData.value))
+			relationList.value.push(Object.assign({id: new Date().getTime()}, relationData.value))
 			onRelationReset()
 			message.success('插入表体信息成功！')
 		})
@@ -739,12 +729,7 @@
 		relationFormRef.value
 		.validate()
 		.then(() => {
-			let k = ''
-			if (relationData.value.id) {
-				k = 'id'
-			} else if (relationData.value.__index) {
-				k = '__index'
-			}
+			let k = 'id'
 			if (k) {
 				relationList.value.forEach(v => {
 					if (v[k] === relationData.value[k]) {
@@ -775,7 +760,7 @@
 		relationList.value = relationList.value.filter(v => {
 			let flag = true
 			relationSelectedRowKeys.value.forEach(s => {
-				if ((v.id && (v.id === s.id)) || (v.__index && (v.__index === s.__index))) {
+				if ((v.id && (v.id === s.id))) {
 					flag = false
 				}
 			})
@@ -798,7 +783,7 @@
 		if (file) {
 			const f = ref_upload.value.uploadFileList()[0]
 			fileList.value.push({
-				__index: new Date().getTime(),
+				id: new Date().getTime(),
 				attachmentUrl: f.url,
 				attachmentName: f.name,
 				attachmentFormat: getFileExtension(f.name),
@@ -829,7 +814,7 @@
 		fileList.value = fileList.value.filter(v => {
 			let flag = true
 			fileSelectedRowKeys.value.forEach(s => {
-				if ((v.id && (v.id === s.id)) || (v.__index && (v.__index === s.__index))) {
+				if ((v.id && (v.id === s.id))) {
 					flag = false
 				}
 			})