Merge remote-tracking branch 'origin/master'

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

@@ -8,8 +8,8 @@
                     </a-form-item>
                 </a-col>
                 <a-col :span="6">
-                    <a-form-item label="核注单编号" name="hzdId">
-                        <a-input v-model:value="searchFormState.hzdId" placeholder="请输入核注单编号" allow-clear/>
+                    <a-form-item label="核注单编号" name="hgHzdCode">
+                        <a-input v-model:value="searchFormState.hgHzdCode" placeholder="请输入核注单编号" allow-clear/>
                     </a-form-item>
                 </a-col>
                 <a-col :span="6">
@@ -24,7 +24,7 @@
                 </a-col>
                 <a-col :span="6">
                     <a-form-item label="申报时间" name="sbsj">
-                        <a-range-picker v-model:value="searchFormState.sbsj" show-time allow-clear/>
+                        <a-range-picker v-model:value="searchFormState.sbsj" value-format="YYYY-MM-DD HH:mm:ss" show-time allow-clear/>
                     </a-form-item>
                 </a-col>
                 <a-col :span="6">
@@ -133,7 +133,7 @@
 		},
 		{
 			title: '核注单编号',
-			dataIndex: 'hzdId',
+			dataIndex: 'hgHzdCode',
 		},
 		{
 			title: '台账类型',

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

@@ -46,14 +46,15 @@ const formRef = ref()
 const formData = ref({})
 const resultList = ref([])
 import qyImg from '@/views/yqyc/zero/enterprise-qualification/qy.png'
-import qySecondlineHzdTzApi from "@/api/yqyc/qySecondLineHzdTzApi";
+import qySecondlineHfdApi from '@/api/yqyc/qySecondlineHfdApi'
+
 
 // 打开抽屉
 const onOpen = (record, view = false) => {
 	open.value = true
 	if (record) {
 		formData.value = Object.assign({}, record)
-		qySecondlineHzdTzApi.qysecondlinehfdlistGetListByHfdId({id: record.id}).then(res => {
+		qySecondlineHfdApi.qysecondlinehfdlistGetListByHfdId({id: record.id}).then(res => {
 			resultList.value = res
 		})
 	}