Merge remote-tracking branch 'origin/master'

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

@@ -93,8 +93,8 @@
 					</a-row>
 				</a-form>
 			</a-collapse-panel>
-			<a-collapse-panel key="2" header="表体信息">
-				<a-button type="primary" @click="onBodyReset" v-if="!isView">重置</a-button>
+			<a-collapse-panel key="2" header="料件信息">
+				<a-button type="primary" @click="onBodyReset" v-if="!isView" style="margin-bottom: 20px;">重置</a-button>
 				<a-form ref="bodyFormRef" :model="bodyData" :rules="bodyRules" style="margin-bottom: 20px;">
 					<a-row :gutter="16">
 						<a-col :span="8">
@@ -114,7 +114,7 @@
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="备案数量：" name="recordQuantity">
-								<a-input v-model:value="bodyData.recordQuantity" :disabled="isView" placeholder="请输入备案数量" allow-clear />
+								<a-input-number v-model:value="bodyData.recordQuantity" :disabled="isView" placeholder="请输入备案数量" :precision="0" :min="0" style="width: 100%;" @change="onChangeRecordQuantity"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -144,127 +144,122 @@
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="备案单价：" name="recordPrice">
-								<a-input v-model:value="bodyData.recordPrice" :disabled="isView" placeholder="请输入备案单价" allow-clear />
+								<a-input-number v-model:value="bodyData.recordPrice" :disabled="isView" placeholder="请输入备案单价" style="width: 100%" @change="onChangeRecordPrice"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="备案总价：" name="recordTotalPrice">
-								<a-input v-model:value="bodyData.recordTotalPrice" :disabled="isView" placeholder="请输入备案总价" allow-clear />
+								<a-input v-model:value="bodyData.recordTotalPrice" :disabled="true" placeholder="备案数量 * 备案单价" allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="币制：" name="currency">
-								<a-input v-model:value="bodyData.currency" :disabled="isView" placeholder="请输入币制" allow-clear />
+								<a-select v-model:value="bodyData.currency" :disabled="isView" placeholder="请选择币制" :options="currencyOptions" show-search allow-clear option-filter-prop="label" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="法定数量：" name="legalQuantity">
-								<a-input v-model:value="bodyData.legalQuantity" :disabled="isView" placeholder="请输入法定数量" allow-clear />
+								<a-input-number v-model:value="bodyData.legalQuantity" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入法定数量" @change="onChangeLegalQuantity"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="第二法定数量：" name="secondLegalQuantity">
-								<a-input v-model:value="bodyData.secondLegalQuantity" :disabled="isView" placeholder="请输入第二法定数量" allow-clear />
+								<a-input-number v-model:value="bodyData.secondLegalQuantity" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入第二法定数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="重量比例因子：" name="weightRatioFactor">
-								<a-input v-model:value="bodyData.weightRatioFactor" :disabled="isView" placeholder="请输入重量比例因子" allow-clear />
+								<a-input v-model:value="bodyData.weightRatioFactor" :disabled="true" placeholder="备案数量 / 法定数量" @change="onChangeWeightRatioFactor"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="第一比例因子：" name="firstRatioFactor">
-								<a-input v-model:value="bodyData.firstRatioFactor" :disabled="isView" placeholder="请输入第一比例因子" allow-clear />
+								<a-input v-model:value="bodyData.firstRatioFactor" :disabled="true" placeholder="请输入第一比例因子" allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="第二比例因子：" name="secondRatioFactor">
-								<a-input v-model:value="bodyData.secondRatioFactor" :disabled="isView" placeholder="请输入第二比例因子" allow-clear />
+								<a-input v-model:value="bodyData.secondRatioFactor" :disabled="true" placeholder="请输入第二比例因子" allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="毛重（KG）：" name="grossWeight">
-								<a-input v-model:value="bodyData.grossWeight" :disabled="isView" placeholder="请输入毛重（KG）" allow-clear />
+								<a-input-number v-model:value="bodyData.grossWeight" :disabled="isView" :min="0" style="width: 100%;" placeholder="请输入毛重（KG）" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="净重（KG）：" name="netWeight">
-								<a-input v-model:value="bodyData.netWeight" :disabled="isView" placeholder="请输入净重（KG）" allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="8">
-							<a-form-item label="备案数量：" name="recordAmount">
-								<a-input v-model:value="bodyData.recordAmount" :disabled="isView" placeholder="请输入备案数量" allow-clear />
+								<a-input v-model:value="bodyData.netWeight" :disabled="isView" :min="0" style="width: 100%;" placeholder="请输入净重（KG）" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="剩余备案数量：" name="remainingRecordAmount">
-								<a-input v-model:value="bodyData.remainingRecordAmount" :disabled="isView" placeholder="请输入剩余备案数量" allow-clear />
+								<a-input v-model:value="bodyData.remainingRecordAmount" :disabled="true" placeholder="请输入剩余备案数量" allow-clear />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="进账累计数量：" name="inAccountCumulativeAmount">
-								<a-input v-model:value="bodyData.inAccountCumulativeAmount" :disabled="isView" placeholder="请输入进账累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.inAccountCumulativeAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入进账累计数量" @change="onChangeInAccountCumulativeAmount"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="出账累计数量：" name="outAccountCumulativeAmount">
-								<a-input v-model:value="bodyData.outAccountCumulativeAmount" :disabled="isView" placeholder="请输入出账累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.outAccountCumulativeAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入出账累计数量" @change="onChangeOutAccountCumulativeAmount"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="库存累计数量：" name="inventoryCumulativeAmount">
-								<a-input v-model:value="bodyData.inventoryCumulativeAmount" :disabled="isView" placeholder="请输入库存累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.inventoryCumulativeAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入库存累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="一线进区累计数量：" name="firstInAmount">
-								<a-input v-model:value="bodyData.firstInAmount" :disabled="isView" placeholder="请输入一线进区累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.firstInAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入一线进区累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="一线出区累计数量：" name="firstOutAmount">
-								<a-input v-model:value="bodyData.firstOutAmount" :disabled="isView" placeholder="请输入一线出区累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.firstOutAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入一线出区累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="二线进区累计数量：" name="secondInAmount">
-								<a-input v-model:value="bodyData.secondInAmount" :disabled="isView" placeholder="请输入二线进区累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.secondInAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入二线进区累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="二线出区累计数量：" name="secondOutAmount">
-								<a-input v-model:value="bodyData.secondOutAmount" :disabled="isView" placeholder="请输入二线出区累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.secondOutAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入二线出区累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="区内转入累计数量：" name="intraZoneTransferInAmount">
-								<a-input v-model:value="bodyData.intraZoneTransferInAmount" :disabled="isView" placeholder="请输入区内转入累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.intraZoneTransferInAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入区内转入累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="区内转出累计数量：" name="intraZoneTransferOutAmount">
-								<a-input v-model:value="bodyData.intraZoneTransferOutAmount" :disabled="isView" placeholder="请输入区内转出累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.intraZoneTransferOutAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入区内转出累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="区外转入累计数量：" name="extraZoneTransferInAmount">
-								<a-input v-model:value="bodyData.extraZoneTransferInAmount" :disabled="isView" placeholder="请输入区外转入累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.extraZoneTransferInAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入区外转入累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="转至区外累计数量：" name="transferToExtraZoneAmount">
-								<a-input v-model:value="bodyData.transferToExtraZoneAmount" :disabled="isView" placeholder="请输入转至区外累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.transferToExtraZoneAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入转至区外累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="补税累计数量：" name="compensationTaxAmount">
-								<a-input v-model:value="bodyData.compensationTaxAmount" :disabled="isView" placeholder="请输入补税累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.compensationTaxAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入补税累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
 							<a-form-item label="核销累计数量：" name="writeOffAmount">
-								<a-input v-model:value="bodyData.writeOffAmount" :disabled="isView" placeholder="请输入核销累计数量" allow-clear />
+								<a-input-number v-model:value="bodyData.writeOffAmount" :disabled="isView" :precision="0" :min="0" style="width: 100%;" placeholder="请输入核销累计数量" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -292,6 +287,24 @@
 					:row-selection="bodyOptions.rowSelection"
 				>
 					<template #bodyCell="{ column, record, index }">
+						<template v-if="column.dataIndex === 'recordUnit'">
+							{{ $TOOL.dictTypeData('measurement unit', record.recordUnit) }}
+						</template>
+						<template v-if="column.dataIndex === 'declareUnit'">
+							{{ $TOOL.dictTypeData('measurement unit', record.declareUnit) }}
+						</template>
+						<template v-if="column.dataIndex === 'legalUnit'">
+							{{ $TOOL.dictTypeData('measurement unit', record.legalUnit) }}
+						</template>
+						<template v-if="column.dataIndex === 'legalSecondUnit'">
+							{{ $TOOL.dictTypeData('measurement unit', record.legalSecondUnit) }}
+						</template>
+						<template v-if="column.dataIndex === 'originCountry'">
+							{{ $TOOL.dictTypeData('address', record.originCountry) }}
+						</template>
+						<template v-if="column.dataIndex === 'currency'">
+							{{ $TOOL.dictTypeData('hbdm', record.currency) }}
+						</template>
 						<template v-if="column.dataIndex === 'action'">
 							<template v-if="isView">
 								<a-button type="link" primary size="small" @click="onBodyReset(), bodyData = cloneDeep(record)">查看</a-button>
@@ -306,8 +319,8 @@
 			</a-collapse-panel>
 			<a-collapse-panel key="3" header="附件信息">
 				<template v-if="!isView">
-					<div>
-						友情提示<br/>
+					<div class="file-tips">
+						<InfoCircleFilled style="margin-right: 4px;"/>友情提示<br/>
 						1、附件大小要求不超过4M，如果文件过大，建议拆分多个上传；<br/>
 						2、附件格式要求：PDF文件；<br/>
 						3、同一附件类型可以上传多个附件；<br/>
@@ -315,10 +328,12 @@
 						5、要求上传复印件的可上传原件的扫描件。
 					</div>
 					<xn-upload ref="ref_upload" v-model:value="fileData.fileUrl" @onChange="fileChange" accept=".pdf" v-if="showFileUpload"/>
-					<xn-batch-delete
-						:selectedRowKeys="fileSelectedRowKeys"
-						@batchDelete="deleteBatchFile"
-					/>
+					<div style="margin-top: 10px;">
+						<xn-batch-delete
+							:selectedRowKeys="fileSelectedRowKeys"
+							@batchDelete="deleteBatchFile"
+						/>
+					</div>
 				</template>
 				<a-table
 					style="margin-top: 10px"
@@ -386,6 +401,7 @@ const bodyList = ref([])
 const userInfo = tool.data.get('USER_INFO')
 const legalUnitOptions = ref([])
 const originCountryOptions = ref([])
+const currencyOptions = ref([])
 
 // 列表选择配置
 const bodyOptions = {
@@ -432,6 +448,7 @@ const onOpen = (record, view = false, type) => {
 	companyTypeOptions.value = tool.dictList('qylx')
 	legalUnitOptions.value = tool.dictList('measurement unit')
 	originCountryOptions.value = tool.dictList('address')
+	currencyOptions.value = tool.dictList('hbdm')
 
 }
 // 关闭抽屉
@@ -467,6 +484,10 @@ const bodyRules = {
 	currency: [required('请输入币制')],
 	legalQuantity: [required('请输入法定数量')],
 	recordAmount: [required('请输入备案数量')],
+	weightRatioFactor: [required('请输入重量比例因子')],
+	remainingRecordAmount: [required('请输入剩余备案数量')],
+	inAccountCumulativeAmount: [required('请输入进账累计数量')],
+	outAccountCumulativeAmount: [required('请输入出账累计数量')],
 }
 const bodyColumns = [
 	{
@@ -567,11 +588,6 @@ const bodyColumns = [
 		width: 120
 	},
 	{
-		title: '备案数量',
-		dataIndex: 'recordAmount',
-		width: 100
-	},
-	{
 		title: '剩余备案数量',
 		dataIndex: 'remainingRecordAmount',
 		width: 120
@@ -851,6 +867,66 @@ const deleteBatchFile = () => {
 		return flag
 	})
 }
+const onChangeRecordQuantity = () => {
+	setTimeout(() => {
+		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.recordPrice)) {
+			bodyData.value.recordTotalPrice = Number(bodyData.value.recordQuantity) * Number(bodyData.value.recordPrice)
+		} else {
+			bodyData.value.recordTotalPrice = ''
+		}
+		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.legalQuantity) && (Number(bodyData.value.legalQuantity) > 0)) {
+			bodyData.value.weightRatioFactor = Number(bodyData.value.recordQuantity) / Number(bodyData.value.legalQuantity)
+		} else {
+			bodyData.value.weightRatioFactor = ''
+		}
+		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.inAccountCumulativeAmount) && proxy.$util.isValue(bodyData.value.outAccountCumulativeAmount)) {
+			bodyData.value.remainingRecordAmount = Number(bodyData.value.inAccountCumulativeAmount) - Number(bodyData.value.outAccountCumulativeAmount) - Number(bodyData.value.recordQuantity)
+		} else {
+			bodyData.value.remainingRecordAmount = ''
+		}
+	}, 100)
+}
+const onChangeRecordPrice = () => {
+	setTimeout(() => {
+		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.recordPrice)) {
+			bodyData.value.recordTotalPrice = Number(bodyData.value.recordQuantity) * Number(bodyData.value.recordPrice)
+		} else {
+			bodyData.value.recordTotalPrice = ''
+		}
+	}, 100)
+}
+const onChangeLegalQuantity = () => {
+	setTimeout(() => {
+		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.legalQuantity) && (Number(bodyData.value.legalQuantity) > 0)) {
+			bodyData.value.weightRatioFactor = Number(bodyData.value.recordQuantity) / Number(bodyData.value.legalQuantity)
+		} else {
+			bodyData.value.weightRatioFactor = ''
+		}
+	}, 100)
+}
+const onChangeWeightRatioFactor = () => {
+	setTimeout(() => {
+		bodyData.value.firstRatioFactor = bodyData.value.weightRatioFactor
+	}, 100)
+}
+const onChangeInAccountCumulativeAmount = () => {
+	setTimeout(() => {
+		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.inAccountCumulativeAmount) && proxy.$util.isValue(bodyData.value.outAccountCumulativeAmount)) {
+			bodyData.value.remainingRecordAmount = Number(bodyData.value.inAccountCumulativeAmount) - Number(bodyData.value.outAccountCumulativeAmount) - Number(bodyData.value.recordQuantity)
+		} else {
+			bodyData.value.remainingRecordAmount = ''
+		}
+	}, 100)
+}
+const onChangeOutAccountCumulativeAmount = () => {
+	setTimeout(() => {
+		if (proxy.$util.isValue(bodyData.value.recordQuantity) && proxy.$util.isValue(bodyData.value.inAccountCumulativeAmount) && proxy.$util.isValue(bodyData.value.outAccountCumulativeAmount)) {
+			bodyData.value.remainingRecordAmount = Number(bodyData.value.inAccountCumulativeAmount) - Number(bodyData.value.outAccountCumulativeAmount) - Number(bodyData.value.recordQuantity)
+		} else {
+			bodyData.value.remainingRecordAmount = ''
+		}
+	}, 100)
+}
 // 抛出函数
 defineExpose({
 	onOpen
@@ -858,4 +934,12 @@ defineExpose({
 </script>
 
 <style lang="less" scoped>
+.file-tips {
+	background-color: rgb(235, 245, 255);
+	border: 1px solid rgb(214, 235, 255);
+	border-radius: 5px;
+	color: rgb(153, 153, 153);
+	padding: 10px 20px;
+	margin-bottom: 10px;
+}
 </style>

snowy-admin-web/src/views/yqyc/zero/enterprise-qualification/index.vue

@@ -87,13 +87,13 @@
             <a @click="onDetail(record, true)" v-if="hasPerm('qyRecordView')">查看</a>
             <a @click="onDetail(record)" v-if="hasPerm('qyRecordEdit') && record.status == 1">编辑</a>
             <a-popconfirm title="确定要删除吗？" @confirm="deleteQyRecord(record)">
-              <a-button type="link" danger size="small" v-if="hasPerm('qyRecordDelete')">删除</a-button>
+              <a-button type="link" danger size="small" v-if="hasPerm('qyRecordDelete') && record.status == 1">删除</a-button>
             </a-popconfirm>
 		    <a @click="resultDetailRef.onOpen(record)" v-if="record.status == 3 || record.status == 4">查看回执</a>
-		  	<template v-if="searchFormState.baType === 'bgsq' && (record.status == 3 || record.status == 4)">
+		  	<template v-if="(record.baType === 'basq' || record.baType === 'bgsq') && record.status == 3">
 				<a @click="onChange(record)">变更</a>
 		  	</template>
-		  	<template v-else-if="searchFormState.baType === 'zxsq' && record.status == 4">
+		  	<template v-else-if="(record.baType === 'basq' || record.baType === 'bgsq') && record.status == 3">
 				<a @click="onKill(record)">注销</a>
 		  	</template>
           </a-space>
@@ -275,7 +275,9 @@ const onChange = (record = null) => {
 		content: createVNode('div', { style: 'color:red;' }, '变更后将重新进行申报'),
 		centered: true,
 		onOk() {
-			onDetail(record)
+			const form = cloneDeep(record)
+			form.baType = 'bgsq'
+			onDetail(form)
 		},
 		onCancel() {
 		},
@@ -292,6 +294,7 @@ const onKill = (record = null) => {
 			let recordData = cloneDeep(record)
 			recordData.applyTime = proxy.$util.YMDHms(new Date())
 			recordData.status = '3'
+			recordData.baType = 'zxsq'
 			qyRecordApi.qyRecordSubmitForm(recordData, recordData.id).then(() => {
 				onSearch()
 			})

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

@@ -92,7 +92,7 @@
           </a-form>
         </a-collapse-panel>
 		  <a-collapse-panel key="2" header="表体信息">
-			  <a-button type="primary" @click="onBodyReset" v-if="!isView">重置</a-button>
+			  <a-button type="primary" @click="onBodyReset" v-if="!isView" style="margin-bottom: 20px;">重置</a-button>
 			  <a-form ref="bodyFormRef" :model="bodyData" :rules="bodyRules" style="margin-bottom: 20px;">
 				  <a-row :gutter="16">
 					  <a-col :span="8">
@@ -357,8 +357,8 @@
 		  </a-collapse-panel>
 		  <a-collapse-panel key="3" header="附件信息">
 			  <template v-if="!isView">
-				  <div>
-					  友情提示<br/>
+				  <div class="file-tips">
+					  <InfoCircleFilled style="margin-right: 4px;"/>友情提示<br/>
 					  1、附件大小要求不超过4M，如果文件过大，建议拆分多个上传；<br/>
 					  2、附件格式要求：PDF文件；<br/>
 					  3、同一附件类型可以上传多个附件；<br/>
@@ -366,10 +366,12 @@
 					  5、要求上传复印件的可上传原件的扫描件。
 				  </div>
 				  <xn-upload ref="ref_upload" v-model:value="fileData.fileUrl" @onChange="fileChange" accept=".pdf" v-if="showFileUpload"/>
-				  <xn-batch-delete
-					  :selectedRowKeys="fileSelectedRowKeys"
-					  @batchDelete="deleteBatchFile"
-				  />
+				  <div style="margin-top: 10px;">
+					  <xn-batch-delete
+						  :selectedRowKeys="fileSelectedRowKeys"
+						  @batchDelete="deleteBatchFile"
+					  />
+				  </div>
 			  </template>
 			  <a-table
 				  style="margin-top: 10px"
@@ -951,4 +953,12 @@
 </script>
 
 <style lang="less" scoped>
+.file-tips {
+	background-color: rgb(235, 245, 255);
+	border: 1px solid rgb(214, 235, 255);
+	border-radius: 5px;
+	color: rgb(153, 153, 153);
+	padding: 10px 20px;
+	margin-bottom: 10px;
+}
 </style>

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

@@ -167,7 +167,7 @@
 				</a-form>
 			</a-collapse-panel>
 			<a-collapse-panel key="2" header="核放单表体" v-if="showHfdbt">
-				<a-button type="primary" @click="onBodyReset" v-if="!isView">重置</a-button>
+				<a-button type="primary" @click="onBodyReset" v-if="!isView" style="margin-bottom: 20px;">重置</a-button>
 				<a-form ref="bodyFormRef" :model="bodyData" :rules="bodyRules" style="margin-bottom: 20px;">
 					<a-row :gutter="16">
 						<a-col :span="8">
@@ -243,7 +243,7 @@
 				</a-table>
 			</a-collapse-panel>
 			<a-collapse-panel key="4" header="关联单证" v-if="showGldz">
-				<a-button type="primary" @click="onRelationReset" v-if="!isView">重置</a-button>
+				<a-button type="primary" @click="onRelationReset" v-if="!isView" style="margin-bottom: 20px;">重置</a-button>
 				<a-form ref="relationFormRef" :model="relationData" :rules="relationRules" style="margin-bottom: 20px;">
 					<a-row :gutter="16">
 						<a-col :span="8">
@@ -295,8 +295,8 @@
 			</a-collapse-panel>
 			<a-collapse-panel key="3" header="附件信息">
 				<template v-if="!isView">
-					<div>
-						友情提示<br/>
+					<div class="file-tips">
+						<InfoCircleFilled style="margin-right: 4px;"/>友情提示<br/>
 						1、附件大小要求不超过4M，如果文件过大，建议拆分多个上传；<br/>
 						2、附件格式要求：PDF文件；<br/>
 						3、同一附件类型可以上传多个附件；<br/>
@@ -304,10 +304,12 @@
 						5、要求上传复印件的可上传原件的扫描件。
 					</div>
 					<xn-upload ref="ref_upload" v-model:value="fileData.fileUrl" @onChange="fileChange" accept=".pdf" v-if="showFileUpload"/>
-					<xn-batch-delete
-						:selectedRowKeys="fileSelectedRowKeys"
-						@batchDelete="deleteBatchFile"
-					/>
+					<div style="margin-top: 10px;">
+						<xn-batch-delete
+							:selectedRowKeys="fileSelectedRowKeys"
+							@batchDelete="deleteBatchFile"
+						/>
+					</div>
 				</template>
 				<a-table
 					style="margin-top: 10px"
@@ -858,4 +860,12 @@
 </script>
 
 <style lang="less" scoped>
+.file-tips {
+	background-color: rgb(235, 245, 255);
+	border: 1px solid rgb(214, 235, 255);
+	border-radius: 5px;
+	color: rgb(153, 153, 153);
+	padding: 10px 20px;
+	margin-bottom: 10px;
+}
 </style>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/param/QySecondlineHzdTzAddParam.java

@@ -99,4 +99,9 @@ public class QySecondlineHzdTzAddParam {
     @ExcelProperty(index = 20,value = "单据状态")
     private String status;
 
+    @Schema(description = "核注单预录入编号")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 18,value = "核注单预录入编号")
+    private String hzdrCode;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/service/impl/QySecondlineHzdTzServiceImpl.java

@@ -50,6 +50,7 @@ import vip.xiaonuo.biz.modular.qysecondlinehzdtz.entity.QySecondlineHzdTz;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.mapper.QySecondlineHzdTzMapper;
 import vip.xiaonuo.biz.modular.qysecondlinehzdtz.service.QySecondlineHzdTzService;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -114,8 +115,14 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         String hzdId = UUID.fastUUID().toString();
         baseInfo.setHzdId(hzdId);
         QySecondlineHzdTz qySecondlineHzdTz = BeanUtil.toBean(baseInfo, QySecondlineHzdTz.class);
-        this.saveRelation(hzdId,qySecondlineHzdTzBaseParam);
         //新增关联
+        this.saveRelation(hzdId,qySecondlineHzdTzBaseParam);
+        qySecondlineHzdTz.setSbsj(new Date());
+        //默认的申报类型
+        if(ObjectUtil.isEmpty(baseInfo.getSblx())){
+            //默认备案
+            qySecondlineHzdTz.setSblx("basq");
+        }
         this.save(qySecondlineHzdTz);
     }