diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index 15769ef..a4af280 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -326,6 +326,15 @@
})
}
+// 编辑
+export function updateHistory(data: any) {
+ return request({
+ url: '/standard/quantity/update',
+ method: 'post',
+ data,
+ })
+}
+
// 获取表单
export function getGradeForm(data: { id: string }) {
return request({
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index 15769ef..a4af280 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -326,6 +326,15 @@
})
}
+// 编辑
+export function updateHistory(data: any) {
+ return request({
+ url: '/standard/quantity/update',
+ method: 'post',
+ data,
+ })
+}
+
// 获取表单
export function getGradeForm(data: { id: string }) {
return request({
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 6cce62f..e285604 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -49,7 +49,8 @@
createUserName: '', // 创建人名称
createTime: '', // 创建时间
standardNo: '', // 标准代码
- standardName: '', // 标准装置名称
+ standardName: '', // 标准装置别名
+ standardAlias: '', // 标准装置名称
storageLocation: '', // 存放地点code
storageLocationName: '', // 存放地点名称
major: '', // 所属专业code
@@ -181,6 +182,18 @@
const confirmSelectBuildStandard = (val: any) => {
form.value.buildStandardName = val[0].applyName // 建标申请名称
form.value.buildStandardId = val[0].id // 建标申请id
+ form.value.standardAlias = val[0].standardName // 标准装置名称
+ form.value.labCode = val[0].labCode // 实验室
+ form.value.labCodeName = val[0].labCodeName // 实验室名称
+ form.value.groupCode = val[0].groupCode // 部门
+ form.value.groupCodeName = val[0].groupCodeName // 部门名称
+ form.value.groupCodeName = val[0].groupCodeName // 部门名称
+ form.value.majorType = val[0].majorType // 专业类别(字典code)
+ form.value.majorTypeName = val[0].majorTypeName // 专业类别(字典value)
+ form.value.buildStandardReportFile = val[0].buildStandardReportFile // 建标报告word版
+ form.value.buildStandardReportPdfFile = val[0].buildStandardReportPdfFile // 建标报告pdf版
+ form.value.examTableFile = val[0].examTableFile // 考核表word版
+ form.value.examTablePdfFile = val[0].examTablePdfFile // 考核表pdf版
}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -499,8 +512,8 @@
form.value.approvalType = `${res.data.standardInfoApproval.approvalType}` // 审批类型
- // 从建标管理的详情页跳转过来
- if (route.query.fromPage === 'standardBuildDetail') {
+ // 从建标管理的详情页跳转过来并且未经保存过
+ if (route.query.fromPage === 'standardBuildDetail' && sessionStorage.getItem('updatedBasicFromBuild') === '0') {
form.value.buildStandardName = route.query.buildStandardName as string // 建标申请名称
form.value.buildStandardId = route.query.buildStandardId as string // 建标申请表id
form.value.buildStandardReportFile = route.query.buildStandardReportFile ? route.query.buildStandardReportFile as string : form.value.buildStandardReportFile // 建标报告word
@@ -519,29 +532,6 @@
loading.close()
})
}
-// ---------------------------------------检查基本信息变化-------------------------------------
-
-/**
- * 检查信息是否有变化
- * @param tempObject 要检查的对象
- */
-const checkBasicInfo = (tempObject: any) => {
- const tempGetInfoForm = window.sessionStorage.getItem('standardGetInfoForm') ? JSON.parse(window.sessionStorage.getItem('standardGetInfoForm')!) : window.sessionStorage.getItem('standardGetInfoForm')
- console.log('================')
- console.log(tempGetInfoForm)
-
- // 检查基本信息有没有变化
- for (const key in tempGetInfoForm) {
- console.log(key, tempGetInfoForm[key])
- console.log(key, tempObject[key])
- console.log(tempGetInfoForm[key] == tempObject[key])
-
- if (tempGetInfoForm[key] != tempObject[key]) {
- return true // 有变化
- }
- }
- return false // 没变化
-}
// ----------------------------------------------- 保存---------------------------------------
const ruleFormRef = ref() // 基本信息表单ref
/**
@@ -638,6 +628,9 @@
emits('addSuccess', form.value.standardNo, infoId.value, form.value.standardName)
window.sessionStorage.setItem('infoParamType', '0') // 全部编辑相当于新建一个草稿，所以去查草稿箱的详情传0
ElMessage.success('已保存')
+ if (route.query.fromPage === 'standardBuildDetail') { // 从建标管理跳过来保存
+ sessionStorage.setItem('updatedBasicFromBuild', '1')
+ }
}).catch(() => {
loading.close()
})
@@ -915,7 +908,7 @@
@@ -939,7 +932,7 @@
v-model.trim="form.labCode"
placeholder="请选择实验室"
filterable
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeLabName"
>
@@ -953,7 +946,7 @@
v-model.trim="form.groupCode"
placeholder="请选择部门"
filterable
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeGroupCode"
>
@@ -988,7 +981,7 @@
v-model="form.majorType"
filterable
:placeholder="pageType === 'detail' ? ' ' : '请选择专业类别'"
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeMajorType"
>
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index 15769ef..a4af280 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -326,6 +326,15 @@
})
}
+// 编辑
+export function updateHistory(data: any) {
+ return request({
+ url: '/standard/quantity/update',
+ method: 'post',
+ data,
+ })
+}
+
// 获取表单
export function getGradeForm(data: { id: string }) {
return request({
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 6cce62f..e285604 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -49,7 +49,8 @@
createUserName: '', // 创建人名称
createTime: '', // 创建时间
standardNo: '', // 标准代码
- standardName: '', // 标准装置名称
+ standardName: '', // 标准装置别名
+ standardAlias: '', // 标准装置名称
storageLocation: '', // 存放地点code
storageLocationName: '', // 存放地点名称
major: '', // 所属专业code
@@ -181,6 +182,18 @@
const confirmSelectBuildStandard = (val: any) => {
form.value.buildStandardName = val[0].applyName // 建标申请名称
form.value.buildStandardId = val[0].id // 建标申请id
+ form.value.standardAlias = val[0].standardName // 标准装置名称
+ form.value.labCode = val[0].labCode // 实验室
+ form.value.labCodeName = val[0].labCodeName // 实验室名称
+ form.value.groupCode = val[0].groupCode // 部门
+ form.value.groupCodeName = val[0].groupCodeName // 部门名称
+ form.value.groupCodeName = val[0].groupCodeName // 部门名称
+ form.value.majorType = val[0].majorType // 专业类别(字典code)
+ form.value.majorTypeName = val[0].majorTypeName // 专业类别(字典value)
+ form.value.buildStandardReportFile = val[0].buildStandardReportFile // 建标报告word版
+ form.value.buildStandardReportPdfFile = val[0].buildStandardReportPdfFile // 建标报告pdf版
+ form.value.examTableFile = val[0].examTableFile // 考核表word版
+ form.value.examTablePdfFile = val[0].examTablePdfFile // 考核表pdf版
}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -499,8 +512,8 @@
form.value.approvalType = `${res.data.standardInfoApproval.approvalType}` // 审批类型
- // 从建标管理的详情页跳转过来
- if (route.query.fromPage === 'standardBuildDetail') {
+ // 从建标管理的详情页跳转过来并且未经保存过
+ if (route.query.fromPage === 'standardBuildDetail' && sessionStorage.getItem('updatedBasicFromBuild') === '0') {
form.value.buildStandardName = route.query.buildStandardName as string // 建标申请名称
form.value.buildStandardId = route.query.buildStandardId as string // 建标申请表id
form.value.buildStandardReportFile = route.query.buildStandardReportFile ? route.query.buildStandardReportFile as string : form.value.buildStandardReportFile // 建标报告word
@@ -519,29 +532,6 @@
loading.close()
})
}
-// ---------------------------------------检查基本信息变化-------------------------------------
-
-/**
- * 检查信息是否有变化
- * @param tempObject 要检查的对象
- */
-const checkBasicInfo = (tempObject: any) => {
- const tempGetInfoForm = window.sessionStorage.getItem('standardGetInfoForm') ? JSON.parse(window.sessionStorage.getItem('standardGetInfoForm')!) : window.sessionStorage.getItem('standardGetInfoForm')
- console.log('================')
- console.log(tempGetInfoForm)
-
- // 检查基本信息有没有变化
- for (const key in tempGetInfoForm) {
- console.log(key, tempGetInfoForm[key])
- console.log(key, tempObject[key])
- console.log(tempGetInfoForm[key] == tempObject[key])
-
- if (tempGetInfoForm[key] != tempObject[key]) {
- return true // 有变化
- }
- }
- return false // 没变化
-}
// ----------------------------------------------- 保存---------------------------------------
const ruleFormRef = ref() // 基本信息表单ref
/**
@@ -638,6 +628,9 @@
emits('addSuccess', form.value.standardNo, infoId.value, form.value.standardName)
window.sessionStorage.setItem('infoParamType', '0') // 全部编辑相当于新建一个草稿，所以去查草稿箱的详情传0
ElMessage.success('已保存')
+ if (route.query.fromPage === 'standardBuildDetail') { // 从建标管理跳过来保存
+ sessionStorage.setItem('updatedBasicFromBuild', '1')
+ }
}).catch(() => {
loading.close()
})
@@ -915,7 +908,7 @@
@@ -939,7 +932,7 @@
v-model.trim="form.labCode"
placeholder="请选择实验室"
filterable
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeLabName"
>
@@ -953,7 +946,7 @@
v-model.trim="form.groupCode"
placeholder="请选择部门"
filterable
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeGroupCode"
>
@@ -988,7 +981,7 @@
v-model="form.majorType"
filterable
:placeholder="pageType === 'detail' ? ' ' : '请选择专业类别'"
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeMajorType"
>
diff --git a/src/views/equipement/standard/book/components/grade.vue b/src/views/equipement/standard/book/components/grade.vue
index 47a43a6..8ab3a5f 100644
--- a/src/views/equipement/standard/book/components/grade.vue
+++ b/src/views/equipement/standard/book/components/grade.vue
@@ -9,7 +9,7 @@
import { UploadFile } from '@/api/file'
import { getPdfStream } from '@/api/system/tool'
import { getBase64, getObjectURL } from '@/utils/download'
-import { addHistory, getGradeForm, getHistoryList } from '@/api/equipment/standard/book'
+import { addHistory, getGradeForm, getHistoryList, updateHistory } from '@/api/equipment/standard/book'
const props = defineProps({
pageType: { // 页面类型 add新建 edit编辑 detail详情
type: String,
@@ -34,6 +34,7 @@
quantityWordFile: '', // 量值溯源与传递等级word(minio文件名) false
standardId: '', // 标准装置id false
updateStatus: '', // 是否修改文件(0:未修改 1:已修改)
+ id: '',
}) as any
const route = useRoute()
const rules = reactive({ // 表单验证规则
@@ -112,24 +113,53 @@
type: 'warning',
},
).then(() => {
- const params = { // 请求参数
- quantityPdfFile: form.value.quantityPdfFile, // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: form.value.quantityWordFile, // 量值溯源与传递等级word(minio文件名)
- standardId: props.standardId, // 标准装置id
- // 暂时先传0, 不考虑建标管理的问题
- updateStatus: '0', // 是否修改文件(0:未修改 1:已修改)
+ // 从建标管理的详情页跳转过来
+ if (route.query.fromPage === 'standardBuildDetail' && form.value.id) {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.quantityPdfFile, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.quantityWordFile, // 量值溯源与传递等级word(minio文件名)
+ standardId: props.standardId, // 标准装置id
+ id: form.value.id,
+ }
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ updateHistory(params).then((res) => {
+ loading.close()
+ if (route.query.fromPage === 'standardBuildDetail') { // 从建标管理跳过来保存
+ sessionStorage.setItem('updatedGradeFromBuild', '1')
+ }
+ ElMessage.success('已保存')
+ }).catch(() => {
+ loading.close()
+ })
}
- const loading = ElLoading.service({
- lock: true,
- text: '加载中...',
- background: 'rgba(255, 255, 255, 0.6)',
- })
- addHistory(params).then((res) => {
- loading.close()
- ElMessage.success('已保存')
- }).catch(() => {
- loading.close()
- })
+ if (!form.value.id) {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.quantityPdfFile, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.quantityWordFile, // 量值溯源与传递等级word(minio文件名)
+ standardId: props.standardId, // 标准装置id
+ // 暂时先传0, 不考虑建标管理的问题
+ updateStatus: '0', // 是否修改文件(0:未修改 1:已修改)
+ }
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ addHistory(params).then((res) => {
+ loading.close()
+ form.value.id = res.data
+ if (route.query.fromPage === 'standardBuildDetail') { // 从建标管理跳过来保存
+ sessionStorage.setItem('updatedGradeFromBuild', '1')
+ }
+ ElMessage.success('已保存')
+ }).catch(() => {
+ loading.close()
+ })
+ }
})
}
})
@@ -138,17 +168,15 @@
const pdfUrl = ref() as any
// 获取表单详情
const fetchGradeForm = () => {
- console.log('1111111111')
-
formLoading.value = true
if (props.standardId) {
- console.log('22222222')
getGradeForm({ id: props.standardId }).then((res) => {
if (res.data) {
form.value.quantityPdfFile = res.data.quantityPdfFile
form.value.quantityWordFile = res.data.quantityWordFile
+ form.value.id = res.data.id
// 从建标管理的详情页跳转过来
- if (route.query.fromPage === 'standardBuildDetail') {
+ if (route.query.fromPage === 'standardBuildDetail' && sessionStorage.getItem('updatedGradeFromBuild') === '0') {
form.value.quantityPdfFile = route.query.quantityPdfFile ? route.query.quantityPdfFile as string : form.value.quantityPdfFile
form.value.quantityWordFile = route.query.quantityWordFile ? route.query.quantityWordFile as string : form.value.quantityWordFile
}
@@ -163,7 +191,7 @@
}
else {
// 从建标管理的详情页跳转过来
- if (route.query.fromPage === 'standardBuildDetail') {
+ if (route.query.fromPage === 'standardBuildDetail' && sessionStorage.getItem('updatedGradeFromBuild') === '0') {
form.value.quantityPdfFile = route.query.quantityPdfFile ? route.query.quantityPdfFile as string : form.value.quantityPdfFile
form.value.quantityWordFile = route.query.quantityWordFile ? route.query.quantityWordFile as string : form.value.quantityWordFile
}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index 15769ef..a4af280 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -326,6 +326,15 @@
})
}
+// 编辑
+export function updateHistory(data: any) {
+ return request({
+ url: '/standard/quantity/update',
+ method: 'post',
+ data,
+ })
+}
+
// 获取表单
export function getGradeForm(data: { id: string }) {
return request({
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 6cce62f..e285604 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -49,7 +49,8 @@
createUserName: '', // 创建人名称
createTime: '', // 创建时间
standardNo: '', // 标准代码
- standardName: '', // 标准装置名称
+ standardName: '', // 标准装置别名
+ standardAlias: '', // 标准装置名称
storageLocation: '', // 存放地点code
storageLocationName: '', // 存放地点名称
major: '', // 所属专业code
@@ -181,6 +182,18 @@
const confirmSelectBuildStandard = (val: any) => {
form.value.buildStandardName = val[0].applyName // 建标申请名称
form.value.buildStandardId = val[0].id // 建标申请id
+ form.value.standardAlias = val[0].standardName // 标准装置名称
+ form.value.labCode = val[0].labCode // 实验室
+ form.value.labCodeName = val[0].labCodeName // 实验室名称
+ form.value.groupCode = val[0].groupCode // 部门
+ form.value.groupCodeName = val[0].groupCodeName // 部门名称
+ form.value.groupCodeName = val[0].groupCodeName // 部门名称
+ form.value.majorType = val[0].majorType // 专业类别(字典code)
+ form.value.majorTypeName = val[0].majorTypeName // 专业类别(字典value)
+ form.value.buildStandardReportFile = val[0].buildStandardReportFile // 建标报告word版
+ form.value.buildStandardReportPdfFile = val[0].buildStandardReportPdfFile // 建标报告pdf版
+ form.value.examTableFile = val[0].examTableFile // 考核表word版
+ form.value.examTablePdfFile = val[0].examTablePdfFile // 考核表pdf版
}
// -------------------------------------------文件上传--------------------------------------
// 文件上传
@@ -499,8 +512,8 @@
form.value.approvalType = `${res.data.standardInfoApproval.approvalType}` // 审批类型
- // 从建标管理的详情页跳转过来
- if (route.query.fromPage === 'standardBuildDetail') {
+ // 从建标管理的详情页跳转过来并且未经保存过
+ if (route.query.fromPage === 'standardBuildDetail' && sessionStorage.getItem('updatedBasicFromBuild') === '0') {
form.value.buildStandardName = route.query.buildStandardName as string // 建标申请名称
form.value.buildStandardId = route.query.buildStandardId as string // 建标申请表id
form.value.buildStandardReportFile = route.query.buildStandardReportFile ? route.query.buildStandardReportFile as string : form.value.buildStandardReportFile // 建标报告word
@@ -519,29 +532,6 @@
loading.close()
})
}
-// ---------------------------------------检查基本信息变化-------------------------------------
-
-/**
- * 检查信息是否有变化
- * @param tempObject 要检查的对象
- */
-const checkBasicInfo = (tempObject: any) => {
- const tempGetInfoForm = window.sessionStorage.getItem('standardGetInfoForm') ? JSON.parse(window.sessionStorage.getItem('standardGetInfoForm')!) : window.sessionStorage.getItem('standardGetInfoForm')
- console.log('================')
- console.log(tempGetInfoForm)
-
- // 检查基本信息有没有变化
- for (const key in tempGetInfoForm) {
- console.log(key, tempGetInfoForm[key])
- console.log(key, tempObject[key])
- console.log(tempGetInfoForm[key] == tempObject[key])
-
- if (tempGetInfoForm[key] != tempObject[key]) {
- return true // 有变化
- }
- }
- return false // 没变化
-}
// ----------------------------------------------- 保存---------------------------------------
const ruleFormRef = ref() // 基本信息表单ref
/**
@@ -638,6 +628,9 @@
emits('addSuccess', form.value.standardNo, infoId.value, form.value.standardName)
window.sessionStorage.setItem('infoParamType', '0') // 全部编辑相当于新建一个草稿，所以去查草稿箱的详情传0
ElMessage.success('已保存')
+ if (route.query.fromPage === 'standardBuildDetail') { // 从建标管理跳过来保存
+ sessionStorage.setItem('updatedBasicFromBuild', '1')
+ }
}).catch(() => {
loading.close()
})
@@ -915,7 +908,7 @@
@@ -939,7 +932,7 @@
v-model.trim="form.labCode"
placeholder="请选择实验室"
filterable
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeLabName"
>
@@ -953,7 +946,7 @@
v-model.trim="form.groupCode"
placeholder="请选择部门"
filterable
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeGroupCode"
>
@@ -988,7 +981,7 @@
v-model="form.majorType"
filterable
:placeholder="pageType === 'detail' ? ' ' : '请选择专业类别'"
- :disabled="pageType === 'detail'"
+ :disabled="pageType === 'detail' || form.buildStandardId !== ''"
class="full-width-input"
@change="changeMajorType"
>
diff --git a/src/views/equipement/standard/book/components/grade.vue b/src/views/equipement/standard/book/components/grade.vue
index 47a43a6..8ab3a5f 100644
--- a/src/views/equipement/standard/book/components/grade.vue
+++ b/src/views/equipement/standard/book/components/grade.vue
@@ -9,7 +9,7 @@
import { UploadFile } from '@/api/file'
import { getPdfStream } from '@/api/system/tool'
import { getBase64, getObjectURL } from '@/utils/download'
-import { addHistory, getGradeForm, getHistoryList } from '@/api/equipment/standard/book'
+import { addHistory, getGradeForm, getHistoryList, updateHistory } from '@/api/equipment/standard/book'
const props = defineProps({
pageType: { // 页面类型 add新建 edit编辑 detail详情
type: String,
@@ -34,6 +34,7 @@
quantityWordFile: '', // 量值溯源与传递等级word(minio文件名) false
standardId: '', // 标准装置id false
updateStatus: '', // 是否修改文件(0:未修改 1:已修改)
+ id: '',
}) as any
const route = useRoute()
const rules = reactive({ // 表单验证规则
@@ -112,24 +113,53 @@
type: 'warning',
},
).then(() => {
- const params = { // 请求参数
- quantityPdfFile: form.value.quantityPdfFile, // 量值溯源与传递等级pdf(minio文件名)
- quantityWordFile: form.value.quantityWordFile, // 量值溯源与传递等级word(minio文件名)
- standardId: props.standardId, // 标准装置id
- // 暂时先传0, 不考虑建标管理的问题
- updateStatus: '0', // 是否修改文件(0:未修改 1:已修改)
+ // 从建标管理的详情页跳转过来
+ if (route.query.fromPage === 'standardBuildDetail' && form.value.id) {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.quantityPdfFile, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.quantityWordFile, // 量值溯源与传递等级word(minio文件名)
+ standardId: props.standardId, // 标准装置id
+ id: form.value.id,
+ }
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ updateHistory(params).then((res) => {
+ loading.close()
+ if (route.query.fromPage === 'standardBuildDetail') { // 从建标管理跳过来保存
+ sessionStorage.setItem('updatedGradeFromBuild', '1')
+ }
+ ElMessage.success('已保存')
+ }).catch(() => {
+ loading.close()
+ })
}
- const loading = ElLoading.service({
- lock: true,
- text: '加载中...',
- background: 'rgba(255, 255, 255, 0.6)',
- })
- addHistory(params).then((res) => {
- loading.close()
- ElMessage.success('已保存')
- }).catch(() => {
- loading.close()
- })
+ if (!form.value.id) {
+ const params = { // 请求参数
+ quantityPdfFile: form.value.quantityPdfFile, // 量值溯源与传递等级pdf(minio文件名)
+ quantityWordFile: form.value.quantityWordFile, // 量值溯源与传递等级word(minio文件名)
+ standardId: props.standardId, // 标准装置id
+ // 暂时先传0, 不考虑建标管理的问题
+ updateStatus: '0', // 是否修改文件(0:未修改 1:已修改)
+ }
+ const loading = ElLoading.service({
+ lock: true,
+ text: '加载中...',
+ background: 'rgba(255, 255, 255, 0.6)',
+ })
+ addHistory(params).then((res) => {
+ loading.close()
+ form.value.id = res.data
+ if (route.query.fromPage === 'standardBuildDetail') { // 从建标管理跳过来保存
+ sessionStorage.setItem('updatedGradeFromBuild', '1')
+ }
+ ElMessage.success('已保存')
+ }).catch(() => {
+ loading.close()
+ })
+ }
})
}
})
@@ -138,17 +168,15 @@
const pdfUrl = ref() as any
// 获取表单详情
const fetchGradeForm = () => {
- console.log('1111111111')
-
formLoading.value = true
if (props.standardId) {
- console.log('22222222')
getGradeForm({ id: props.standardId }).then((res) => {
if (res.data) {
form.value.quantityPdfFile = res.data.quantityPdfFile
form.value.quantityWordFile = res.data.quantityWordFile
+ form.value.id = res.data.id
// 从建标管理的详情页跳转过来
- if (route.query.fromPage === 'standardBuildDetail') {
+ if (route.query.fromPage === 'standardBuildDetail' && sessionStorage.getItem('updatedGradeFromBuild') === '0') {
form.value.quantityPdfFile = route.query.quantityPdfFile ? route.query.quantityPdfFile as string : form.value.quantityPdfFile
form.value.quantityWordFile = route.query.quantityWordFile ? route.query.quantityWordFile as string : form.value.quantityWordFile
}
@@ -163,7 +191,7 @@
}
else {
// 从建标管理的详情页跳转过来
- if (route.query.fromPage === 'standardBuildDetail') {
+ if (route.query.fromPage === 'standardBuildDetail' && sessionStorage.getItem('updatedGradeFromBuild') === '0') {
form.value.quantityPdfFile = route.query.quantityPdfFile ? route.query.quantityPdfFile as string : form.value.quantityPdfFile
form.value.quantityWordFile = route.query.quantityWordFile ? route.query.quantityWordFile as string : form.value.quantityWordFile
}
diff --git a/src/views/equipement/standard/build/edit.vue b/src/views/equipement/standard/build/edit.vue
index df23e3e..2cb28b2 100644
--- a/src/views/equipement/standard/build/edit.vue
+++ b/src/views/equipement/standard/build/edit.vue
@@ -141,6 +141,8 @@
const editStandard = () => {
console.log(standardBuildApproveBasicRef.value.form)
sessionStorage.setItem('showRemindSave', '0')
+ sessionStorage.setItem('updatedGradeFromBuild', '0') // 从建标管理跳转过去量值有没有保存操作完成
+ sessionStorage.setItem('updatedBasicFromBuild', '0') // 从建标管理跳转过去基本信息有没有保存操作完成
const tempForm = standardBuildApproveBasicRef.value.form
$router.push({
path: `/standard/edit/${tempForm.standardId}`,
@@ -150,9 +152,9 @@
standardId: tempForm.standardId,
fromPage: 'standardBuildDetail',
buildStandardName: tempForm.applyName, // 建标申请名称
- buildStandardId: tempForm.id, // 建标申请表id
- quantityPdfFile: tempForm.relationFile, // 量值溯源与传递等级关系图word版
- quantityWordFile: tempForm.relationPdfFile, // 量值溯源与传递等级关系图pdf版
+ buildStandardId: tempForm.id, // 建标申请表id relationPdfFile
+ quantityPdfFile: tempForm.relationPdfFile, // 量值溯源与传递等级关系图word版
+ quantityWordFile: tempForm.relationFile, // 量值溯源与传递等级关系图pdf版
},
})
}