|
@@ -322,8 +322,11 @@ const basicInfoData = ref({
|
|
|
samplingDate:'',
|
|
|
},
|
|
|
})
|
|
|
-const oldRecordNumber = ref('')
|
|
|
-const oldReportNumber = ref('')
|
|
|
+const oldRecordNumber = ref('')//旧记录编号
|
|
|
+const oldReportNumber = ref('')//旧报告编号
|
|
|
+const recordAutoNumber = ref('')//r记录表自增流水号
|
|
|
+const reportAutoNumber = ref('')//报告单自增流水号
|
|
|
+
|
|
|
const infoLoad = ref(false)
|
|
|
const getInfoData = async () => {
|
|
|
infoLoad.value = true
|
|
@@ -340,6 +343,11 @@ infoLoad.value = false
|
|
|
if (!error && code === 200) {
|
|
|
console.log(data, '基础信息数据')
|
|
|
basicInfoData.value = getObjValue(data)
|
|
|
+ oldRecordNumber.value = data?.recordNo
|
|
|
+ oldReportNumber.value = data?.reportNo
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
const { trialSampleInfoList, trailDeviceUseInfoDTOS } = basicInfoData.value
|
|
|
if (!trialSampleInfoList) {
|
|
|
basicInfoData.value.trialSampleInfoList = {
|
|
@@ -360,10 +368,10 @@ infoLoad.value = false
|
|
|
basicInfoData.value = {}
|
|
|
}
|
|
|
}
|
|
|
-const value = ref('')
|
|
|
|
|
|
|
|
|
-const checkOptions = ref([])
|
|
|
+
|
|
|
+
|
|
|
const tableColumn = [
|
|
|
{ key: 'deviceName', name: '设备名称' },
|
|
|
{ key: 'deviceModel', name: '设备型号' },
|
|
@@ -380,10 +388,7 @@ const tableColumn = [
|
|
|
{ key: 'remarks', name: '备注' },
|
|
|
{ key: 'action', name: '操作' },
|
|
|
]
|
|
|
-const tableData = ref([
|
|
|
-
|
|
|
-
|
|
|
-])
|
|
|
+
|
|
|
//关联取样
|
|
|
const linksSampleModal = ref(false)
|
|
|
|
|
@@ -540,6 +545,9 @@ const handleSave = async () => {
|
|
|
.join(',') : []
|
|
|
|
|
|
basicInfoData.value.standardInfoIds = standardInfoIds
|
|
|
+ basicInfoData.value.oldRecordNumber = oldRecordNumber.value
|
|
|
+ basicInfoData.value.oldReportNumber = oldReportNumber.value
|
|
|
+
|
|
|
emit('change', basicInfoData.value)
|
|
|
// handleSaveLoad.value = true
|
|
|
// const { error, code, data, msg } = await dataApi.saveExcelBussData({
|